In .:

[mono.git] / mono / metadata / pedump.c

diff --git a/mono/metadata/pedump.c b/mono/metadata/pedump.c
index b52f5d79dbcc50893b9980dadc5a27b7f3bf29e0..93c5068cf19fcf1ee8657a0a2424ff1ad48ac498 100644 (file)
--- a/mono/metadata/pedump.c
+++ b/mono/metadata/pedump.c
@@ -261,6 +261,14 @@ dsh (const char *label, MonoImage *meta, MonoStreamHeader *sh)
                sh->size, sh->size);
 }
 
+static void
+dump_metadata_header (MonoImage *meta)
+{
+       printf ("\nMetadata header:\n");
+       printf ("           Version: %d.%d\n", meta->md_version_major, meta->md_version_minor);
+       printf ("    Version string: %s\n", meta->version);
+}
+
 static void
 dump_metadata_ptrs (MonoImage *meta)
 {
@@ -276,7 +284,9 @@ static void
 dump_metadata (MonoImage *meta)
 {
        int table;
-       
+
+       dump_metadata_header (meta);
+
        dump_metadata_ptrs (meta);
 
        printf ("Rows:\n");
@@ -319,13 +329,13 @@ dump_dotnet_iinfo (MonoImage *image)
        dump_methoddef (image, iinfo->cli_cli_header.ch_entry_point);
 }
 
-static void
+static int
 dump_verify_info (MonoImage *image, int flags)
 {
        GSList *errors, *tmp;
-       int count = 0;
+       int count = 0, verifiable = 0;
        const char* desc [] = {
-               "Ok", "Error", "Warning", NULL, "CLS"
+               "Ok", "Error", "Warning", NULL, "CLS", NULL, NULL, NULL, "Not Verifiable"
        };
 
        errors = mono_image_verify_tables (image, flags);
@@ -344,7 +354,6 @@ dump_verify_info (MonoImage *image, int flags)
 
                for (i = 0; i < m->rows; ++i) {
                        MonoMethod *method;
-
                        method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i+1), NULL);
                        errors = mono_method_verify (method, flags);
                        if (errors) {
@@ -358,8 +367,14 @@ dump_verify_info (MonoImage *image, int flags)
                        for (tmp = errors; tmp; tmp = tmp->next) {
                                MonoVerifyInfo *info = tmp->data;
                                g_print ("%s: %s\n", desc [info->status], info->message);
-                               if (info->status == MONO_VERIFY_ERROR)
+                               if (info->status == MONO_VERIFY_ERROR) {
                                        count++;
+                                       verifiable = 3;
+                               }
+                               if(info->status == MONO_VERIFY_NOT_VERIFIABLE) {
+                                       if (verifiable < 2)
+                                               verifiable = 2; 
+                               }
                        }
                        mono_free_verify_list (errors);
                }
@@ -367,6 +382,7 @@ dump_verify_info (MonoImage *image, int flags)
 
        if (count)
                g_print ("Error count: %d\n", count);
+       return verifiable;
 }
 
 static void
@@ -382,8 +398,8 @@ main (int argc, char *argv [])
        MonoImage *image;
        char *file = NULL;
        char *flags = NULL;
-       const char *flag_desc [] = {"error", "warn", "cls", "all", "code", NULL};
-       guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, MONO_VERIFY_ALL + 1};
+       const char *flag_desc [] = {"error", "warn", "cls", "all", "code", "fail-on-verifiable", "non-strict", NULL};
+       guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, MONO_VERIFY_ALL + 1, MONO_VERIFY_FAIL_FAST, MONO_VERIFY_NON_STRICT};
        int i;
        
        for (i = 1; i < argc; i++){
@@ -408,10 +424,10 @@ main (int argc, char *argv [])
                usage ();
 
        mono_metadata_init ();
-        mono_raw_buffer_init ();
-        mono_images_init ();
-        mono_assemblies_init ();
-        mono_loader_init ();
+       mono_raw_buffer_init ();
+       mono_images_init ();
+       mono_assemblies_init ();
+       mono_loader_init ();
  
        image = mono_image_open (file, NULL);
        if (!image){
@@ -436,9 +452,15 @@ main (int argc, char *argv [])
                                g_print ("Unknown verify flag %s\n", tok);
                        tok = strtok (NULL, ",");
                }
-               mono_init (file);
+               mono_init_from_assembly (file, file);
                assembly = mono_assembly_open (file, NULL);
-               dump_verify_info (assembly->image, f);
+
+               if (!assembly) {
+                       g_print ("Could not open assembly %s\n", file);
+                       return 4;
+               }
+
+               return dump_verify_info (assembly->image, f);
        } else
                mono_image_close (image);