diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | doc/download | 9 | ||||
| -rw-r--r-- | doc/makefile | 12 | ||||
| -rw-r--r-- | mono/cil/Makefile.am | 2 | ||||
| -rw-r--r-- | mono/interpreter/interp.c | 44 | ||||
| -rw-r--r-- | mono/metadata/Makefile.am | 2 | ||||
| -rw-r--r-- | web/download | 9 | ||||
| -rw-r--r-- | web/makefile | 12 |
9 files changed, 49 insertions, 44 deletions
diff --git a/Makefile.am b/Makefile.am index 7a0d4a47da8..fc581a79c21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = mono +SUBDIRS = mono doc diff --git a/configure.in b/configure.in index bf3144bd440..357572e2315 100644 --- a/configure.in +++ b/configure.in @@ -33,4 +33,5 @@ mono/metadata/Makefile mono/dis/Makefile mono/cil/Makefile mono/interpreter/Makefile +doc/Makefile ]) diff --git a/doc/download b/doc/download index b52813c10b1..0d234b21562 100644 --- a/doc/download +++ b/doc/download @@ -19,7 +19,14 @@ we make the first tarball release. <ul> - <b>June 8th, 2001</b> + <b>July 12th, 2001</b> + <ul> + * <a href="archive/jay.cs.tar.gz">archive/jay.cs.tar.gz</a>: Sources to Jay. + * <a href="archive/mcs-12-Jul-2001.tar.gz">mcs-12-Jul-2001.tar.gz</a>: CVS snapshot. + * <a href="archive/mono-0.3.tar.gz">mono-0.3.tar.gz</a>: Packaged Source Code. + </ul> + + <b>July 8th, 2001</b> <ul> * <a href="archive/jay.cs.tar.gz">archive/jay.cs.tar.gz</a>: Sources. diff --git a/doc/makefile b/doc/makefile deleted file mode 100644 index 0c88568cba3..00000000000 --- a/doc/makefile +++ /dev/null @@ -1,12 +0,0 @@ -SOURCES=rationale roadmap c-sharp tools class-library \ - runtime documentation download faq contributing \ - resources status - -all-docs: $(SOURCES) - cat $(SOURCES) > all-docs - -clean: - rm all-docs - -webit: - (cd web; make && make push) diff --git a/mono/cil/Makefile.am b/mono/cil/Makefile.am index 8e06bfabf8c..4fa1bade5f6 100644 --- a/mono/cil/Makefile.am +++ b/mono/cil/Makefile.am @@ -8,4 +8,4 @@ def_DATA = opcode.def xmldir = $(share)/mono/cil xml_DATA = cil-opcodes.xml -EXTRA_DIST=opcode.def $(xml_DATA) $(def_DATA)
\ No newline at end of file +EXTRA_DIST=opcode.def make-opcodes-def.pl make-opcode-def.xsl $(xml_DATA) $(def_DATA)
\ No newline at end of file diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c index 95c052008f1..b391a5d1544 100644 --- a/mono/interpreter/interp.c +++ b/mono/interpreter/interp.c @@ -1,4 +1,7 @@ /* + * PLEASE NOTE: This is a research prototype. + * + * * interp.c: Interpreter for CIL byte codes * * Author: @@ -43,10 +46,11 @@ typedef gint32 nati_t; static int count = 0; -/* Attempt at using the goto label construct of GNU GCC: +/* + * Attempt at using the goto label construct of GNU GCC: * it turns out this does give some benefit: 5-15% speedup. * Don't look at these macros, it hurts... -*/ + */ #define GOTO_LABEL #ifdef GOTO_LABEL #define SWITCH(a) goto *goto_map[a]; @@ -97,31 +101,34 @@ static int count = 0; #endif /* - * Need to optimize ALU ops when natural int == int32 */ -/* - * Need to design how exceptions are supposed to work... */ -/* + * Need to optimize ALU ops when natural int == int32 + * + * Need to design how exceptions are supposed to work... + * * IDEA: if we maintain a stack of ip, sp to be checked * in the return opcode, we could inline simple methods that don't * use the stack or local variables.... - * */ -/* The {,.S} versions of many opcodes can/should be merged to reduce code + * + * The {,.S} versions of many opcodes can/should be merged to reduce code * duplication. - * */ -void + * + */ +static void ves_exec_method (cli_image_info_t *iinfo, MonoMetaMethodHeader *mh, stackval *args) { /* * with alloca we get the expected huge performance gain - * stackval *stack = g_new0(stackval, mh->max_stack);*/ + * stackval *stack = g_new0(stackval, mh->max_stack); + */ stackval *stack = alloca(sizeof(stackval) * mh->max_stack); - register unsigned char *ip = mh->code; - unsigned char *end = ip+mh->code_size; + register const unsigned char *ip = mh->code; register stackval *sp = stack; /* FIXME: remove this hack */ static int fake_field = 42; + /* need to figure out how many of these, too */ stackval locals [16]; + #ifdef GOTO_LABEL const static void * const goto_map [] = { #define OPDEF(a,b,c,d,e,f,g,h,i,j) \ @@ -132,8 +139,10 @@ ves_exec_method (cli_image_info_t *iinfo, MonoMetaMethodHeader *mh, stackval *ar }; #endif - /* using while (ip < end) may result in a 15% performance drop, - * but it may be useful for debug */ + /* + * using while (ip < end) may result in a 15% performance drop, + * but it may be useful for debug + */ while (1) { /*count++;*/ #ifdef GOTO_LABEL @@ -823,10 +832,11 @@ ves_exec_method (cli_image_info_t *iinfo, MonoMetaMethodHeader *mh, stackval *ar #endif } } + g_assert_not_reached(); } -int +static int ves_exec (cli_image_info_t *iinfo) { gint32 entryp; @@ -843,6 +853,7 @@ ves_exec (cli_image_info_t *iinfo) ves_exec_method (iinfo, mh, &result); mono_metadata_free_mh (mh); fprintf (stderr, "result: %d\n", result.data.i); + return 0; } @@ -863,6 +874,7 @@ main (int argc, char *argv []) retval = ves_exec (iinfo); mono_assembly_close (assembly); printf("count: %d\n", count); + return retval; } diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index 2b3b2b8c839..2966a60a0b0 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -13,12 +13,14 @@ libmetadataincludedir = $(includedir)/mono/metadata libmetadatainclude_HEADERS = \ assembly.h \ + blobsig.h \ cil-coff.h \ eltype.h \ endian.h \ fieldattr.h \ metadata.h \ methodattr.h \ + methodheader.h \ methodsem.h \ paramattr.h \ propertyattr.h \ diff --git a/web/download b/web/download index b52813c10b1..0d234b21562 100644 --- a/web/download +++ b/web/download @@ -19,7 +19,14 @@ we make the first tarball release. <ul> - <b>June 8th, 2001</b> + <b>July 12th, 2001</b> + <ul> + * <a href="archive/jay.cs.tar.gz">archive/jay.cs.tar.gz</a>: Sources to Jay. + * <a href="archive/mcs-12-Jul-2001.tar.gz">mcs-12-Jul-2001.tar.gz</a>: CVS snapshot. + * <a href="archive/mono-0.3.tar.gz">mono-0.3.tar.gz</a>: Packaged Source Code. + </ul> + + <b>July 8th, 2001</b> <ul> * <a href="archive/jay.cs.tar.gz">archive/jay.cs.tar.gz</a>: Sources. diff --git a/web/makefile b/web/makefile deleted file mode 100644 index 0c88568cba3..00000000000 --- a/web/makefile +++ /dev/null @@ -1,12 +0,0 @@ -SOURCES=rationale roadmap c-sharp tools class-library \ - runtime documentation download faq contributing \ - resources status - -all-docs: $(SOURCES) - cat $(SOURCES) > all-docs - -clean: - rm all-docs - -webit: - (cd web; make && make push) |