2010-01-11 Zoltan Varga <vargaz@gmail.com>

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

diff --git a/mono/metadata/pedump.c b/mono/metadata/pedump.c
index d0c847d7574ab5bf697f7966d496f2e0d52df395..0f63928c870fddbaae77d8c1173a8d47086588cd 100644 (file)
--- a/mono/metadata/pedump.c
+++ b/mono/metadata/pedump.c
@@ -37,6 +37,7 @@ gboolean dump_data = TRUE;
 gboolean verify_pe = FALSE;
 gboolean verify_metadata = FALSE;
 gboolean verify_code = FALSE;
+gboolean verify_partial_md = FALSE;
 
 /* unused
 static void
@@ -454,10 +455,9 @@ verify_image_file (const char *fname)
 
        mono_image_load_names (image);
 
-       if (!mono_verifier_verify_full_table_data (image, &errors))
+       if (!verify_partial_md && !mono_verifier_verify_full_table_data (image, &errors))
                goto invalid_image;
 
-
        /*fake an assembly for class loading to work*/
        assembly = g_new0 (MonoAssembly, 1);
        assembly->in_gac = FALSE;
@@ -468,6 +468,10 @@ verify_image_file (const char *fname)
        for (i = 1; i <= table->rows; ++i) {
                guint32 token = i | MONO_TOKEN_TYPE_DEF;
                MonoClass *class = mono_class_get (image, token);
+               if (!class) {
+                       printf ("Could not load class with token %x\n", token);
+                       continue;
+               }
                mono_class_init (class);
                if (class->exception_type != MONO_EXCEPTION_NONE || mono_loader_get_last_error ()) {
                        printf ("Error verifying class(0x%08x) %s.%s a type load error happened\n", token, class->name_space, class->name);
@@ -476,7 +480,7 @@ verify_image_file (const char *fname)
                }
        }
        if (count)
-               return 1;
+               return 5;
        return 0;
 
 invalid_image:
@@ -597,16 +601,18 @@ pedump_assembly_search_hook (MonoAssemblyName *aname, gpointer user_data)
 #define VALID_ONLY_FLAG 0x08000000
 #define VERIFY_CODE_ONLY MONO_VERIFY_ALL + 1 
 #define VERIFY_METADATA_ONLY VERIFY_CODE_ONLY + 1
+#define VERIFY_PARTIAL_METADATA VERIFY_CODE_ONLY + 2
 
 int
 main (int argc, char *argv [])
 {
+       int image_result = 0;
        MonoImage *image;
        char *file = NULL;
        char *flags = NULL;
        MiniVerifierMode verifier_mode = MONO_VERIFIER_MODE_VERIFIABLE;
-       const char *flag_desc [] = {"error", "warn", "cls", "all", "code", "fail-on-verifiable", "non-strict", "valid-only", "metadata", NULL};
-       guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, VERIFY_CODE_ONLY, MONO_VERIFY_FAIL_FAST, MONO_VERIFY_NON_STRICT, VALID_ONLY_FLAG, VERIFY_METADATA_ONLY, 0};
+       const char *flag_desc [] = {"error", "warn", "cls", "all", "code", "fail-on-verifiable", "non-strict", "valid-only", "metadata", "partial-md", NULL};
+       guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, VERIFY_CODE_ONLY, MONO_VERIFY_FAIL_FAST, MONO_VERIFY_NON_STRICT, VALID_ONLY_FLAG, VERIFY_METADATA_ONLY, VERIFY_PARTIAL_METADATA, 0};
        int i, verify_flags = MONO_VERIFY_REPORT_ALL_ERRORS, run_new_metadata_verifier = 0;
        
        for (i = 1; i < argc; i++){
@@ -652,6 +658,8 @@ main (int argc, char *argv [])
                                        } else if(flag_vals [i] == VERIFY_METADATA_ONLY) {
                                                verify_metadata = 0;
                                                run_new_metadata_verifier = 1;
+                                       } else if(flag_vals [i] == VERIFY_PARTIAL_METADATA) {
+                                               verify_partial_md = 1;
                                        }
                                        if (flag_vals [i] == VALID_ONLY_FLAG)
                                                verifier_mode = MONO_VERIFIER_MODE_VALID;
@@ -682,12 +690,11 @@ main (int argc, char *argv [])
        }
        
        if (run_new_metadata_verifier) {
-               int res;
                mono_verifier_set_mode (MONO_VERIFIER_MODE_VERIFIABLE);
 
-               res = verify_image_file (file);
-               if (res || !verify_code)
-                       return res;
+               image_result = verify_image_file (file);
+               if (image_result == 1 || !verify_code)
+                       return image_result;
        }
 
        image = mono_image_open (file, NULL);
@@ -702,6 +709,7 @@ main (int argc, char *argv [])
                MonoAssembly *assembly;
                MonoImage *image;
                MonoImageOpenStatus status;
+               int code_result;
 
                mono_verifier_set_mode (verifier_mode);
 
@@ -719,7 +727,8 @@ main (int argc, char *argv [])
                        return 4;
                }
 
-               return dump_verify_info (assembly->image, verify_flags);
+               code_result = dump_verify_info (assembly->image, verify_flags);
+               return code_result ? code_result : image_result;
        } else
                mono_image_close (image);