2009-12-15 Rodrigo Kumpera <rkumpera@novell.com>

	* pedump.c: Add partial-md mode that doesn't perform full metadata verification. It does the
	same amount done by a core-clr enabled runtime.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 9f183adf71fd563a6c62a5fd061ee45c54f54ab8..f2ec59335aa30662aef16a0c56f507892c7baf7d 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * pedump.c: Add partial-md mode that doesn't perform full metadata verification. It does the
+       same amount done by a core-clr enabled runtime.
+
 2009-12-15  Marek Habersack  <mhabersack@novell.com>
 
        * appdomain.c (mono_make_shadow_copy): make sure access mode of

diff --git a/mono/metadata/pedump.c b/mono/metadata/pedump.c
index dda3efe0db6cfdd7ad39f744cb2ca17b6b64ead4..5295fa46e635f9da6ab753bf6420003fe48c4098 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;
@@ -601,6 +601,7 @@ 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 [])
@@ -609,8 +610,8 @@ main (int argc, char *argv [])
        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++){
@@ -656,6 +657,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;