2005-03-03 Sebastien Pouliot <sebastien@ximian.com>

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

diff --git a/mono/metadata/pedump.c b/mono/metadata/pedump.c
index aab36a8fb89fdc2985b469fded9c8eb4a5d5ea76..c9cda30f6796fb7a6138ddadbeab05371c14ef8a 100644 (file)
--- a/mono/metadata/pedump.c
+++ b/mono/metadata/pedump.c
@@ -21,6 +21,9 @@
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/metadata-internals.h>
+#include <mono/metadata/rawbuffer.h>
+#include <mono/metadata/class-internals.h>
 #include "mono/utils/mono-digest.h"
 
 gboolean dump_data = TRUE;
@@ -255,7 +258,7 @@ dsh (const char *label, MonoImage *meta, MonoStreamHeader *sh)
 {
        printf ("%s: 0x%08x - 0x%08x [%d == 0x%08x]\n",
                label,
-               sh->data - meta->raw_metadata, sh->data + sh->size - meta->raw_metadata,
+               (int)(sh->data - meta->raw_metadata), (int)(sh->data + sh->size - meta->raw_metadata),
                sh->size, sh->size);
 }
 
@@ -278,7 +281,7 @@ dump_metadata (MonoImage *meta)
        dump_metadata_ptrs (meta);
 
        printf ("Rows:\n");
-       for (table = 0; table < 64; table++){
+       for (table = 0; table < MONO_TABLE_NUM; table++){
                if (meta->tables [table].rows == 0)
                        continue;
                printf ("Table %s: %d records (%d bytes, at %p)\n",
@@ -347,8 +350,9 @@ dump_verify_info (MonoImage *image, int flags)
                        errors = mono_method_verify (method, flags);
                        if (errors) {
                                char *sig;
-                               sig = mono_signature_get_desc (method->signature, FALSE);
-                               g_print ("In method: %s.%s::%s(%s)\n", method->klass->name_space, method->klass->name, method->name, sig);
+                               MonoClass *klass = mono_method_get_class (method);
+                               sig = mono_signature_get_desc (mono_method_signature (method), FALSE);
+                               g_print ("In method: %s.%s::%s(%s)\n", mono_class_get_namespace (klass), mono_class_get_name (klass), mono_method_get_name (method), sig);
                                g_free (sig);
                        }
 
@@ -404,6 +408,12 @@ main (int argc, char *argv [])
        if (!file)
                usage ();
 
+       mono_metadata_init ();
+        mono_raw_buffer_init ();
+        mono_images_init ();
+        mono_assemblies_init ();
+        mono_loader_init ();
+ 
        image = mono_image_open (file, NULL);
        if (!image){
                fprintf (stderr, "Can not open image %s\n", file);
@@ -430,9 +440,8 @@ main (int argc, char *argv [])
                mono_init (file);
                assembly = mono_assembly_open (file, NULL);
                dump_verify_info (assembly->image, f);
-       }
-       
-       mono_image_close (image);
+       } else
+               mono_image_close (image);
        
        return 0;
 }