2001-07-15 Miguel de Icaza <miguel@ximian.com>

	* main.c (dis_code): Only display .entrypoint when we are dealing
	with a module that contains an entry point.  This removes a bunch
	of warnings for .dll dumping

svn path=/trunk/mono/; revision=179

diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog
index 97ce5e3fe731edc8e0053e13a3f9ff3b014b29ad..7b4361e6c137097ff800a4f97996bb553b089cac 100644 (file)
--- a/mono/dis/ChangeLog
+++ b/mono/dis/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-15  Miguel de Icaza  <miguel@ximian.com>
+
+       * main.c (dis_code): Only display .entrypoint when we are dealing
+       with a module that contains an entry point.  This removes a bunch
+       of warnings for .dll dumping
+
 Sun Jul 15 17:29:10 CEST 2001 Paolo Molaro <lupus@ximian.com>
 
        * get.h,get.c: added some dis_stringify_object() functions:

diff --git a/mono/dis/main.c b/mono/dis/main.c
index 659e4883e7cd812170ce8454093ad4d722890acf..61b34f67bf82d1d54d36f85593368c23946c6927 100644 (file)
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -337,9 +337,12 @@ dis_code (metadata_t *m, cli_image_info_t *ii, guint32 rva)
                return;
 
        mh = mono_metadata_parse_mh (m, ptr);
-       loc = mono_metadata_locate_token (m, ii->cli_cli_header.ch_entry_point);
-       if (rva == read32(loc))
-               fprintf (output, "\t.entrypoint\n");
+       if (ii->cli_cli_header.ch_entry_point){
+               loc = mono_metadata_locate_token (m, ii->cli_cli_header.ch_entry_point);
+               if (rva == read32 (loc))
+                       fprintf (output, "\t.entrypoint\n");
+       }
+       
        fprintf (output, "\t.maxstack %d\n", mh->max_stack);
        fprintf (output, "\t// Code size=%d (0x%x)\n", mh->code_size, mh->code_size);
        printf ("\t// Values Code Size=%d/0x%x\n\t// LocalTok=%x\n\n",