2004-07-30 Martin Baulig <martin@ximian.com>

[mono.git] / mono / dis / main.c

diff --git a/mono/dis/main.c b/mono/dis/main.c
index 52913d9c6ee1c72c2b3f8d8d696c37003df39dd3..c6688cd364a68e2be64e2256318c21170edf8be8 100644 (file)
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -197,9 +197,9 @@ static dis_map_t visibility_map [] = {
        { TYPE_ATTRIBUTE_NESTED_PUBLIC,        "nested public " },
        { TYPE_ATTRIBUTE_NESTED_PRIVATE,       "nested private " },
        { TYPE_ATTRIBUTE_NESTED_FAMILY,        "nested family " },
-       { TYPE_ATTRIBUTE_NESTED_ASSEMBLY,      "nested assembly" },
-       { TYPE_ATTRIBUTE_NESTED_FAM_AND_ASSEM, "nested famandassem" },
-       { TYPE_ATTRIBUTE_NESTED_FAM_OR_ASSEM,  "nested famorassem" },
+       { TYPE_ATTRIBUTE_NESTED_ASSEMBLY,      "nested assembly " },
+       { TYPE_ATTRIBUTE_NESTED_FAM_AND_ASSEM, "nested famandassem " },
+       { TYPE_ATTRIBUTE_NESTED_FAM_OR_ASSEM,  "nested famorassem " },
        { 0, NULL }
 };
 
@@ -473,8 +473,7 @@ static void
 dis_code (MonoImage *m, guint32 rva)
 {
        MonoMethodHeader *mh;
-       MonoCLIImageInfo *ii = m->image_info;
-       const char *ptr = mono_cli_rva_map (ii, rva);
+       const char *ptr = mono_image_rva_map (m, rva);
        const char *loc;
        guint32 entry_point;
 
@@ -1007,7 +1006,7 @@ dis_type (MonoImage *m, int n)
                nested = mono_metadata_nesting_typedef (m, n + 1, nested + 1);
        }
        
-       fprintf (output, "  } // end of type %s%s%s\n", nspace, *nspace? ".": "", name);
+       fprintf (output, "  } // end of class %s%s%s\n", nspace, *nspace? ".": "", name);
        if (*nspace)
                fprintf (output, "}\n");
        fprintf (output, "\n");
@@ -1105,7 +1104,7 @@ dis_data (MonoImage *m)
 
        for (i = 0; i < t->rows; i++) {
                mono_metadata_decode_row (t, i, cols, MONO_FIELD_RVA_SIZE);
-               rva = mono_cli_rva_map (m->image_info, cols [MONO_FIELD_RVA_RVA]);
+               rva = mono_image_rva_map (m, cols [MONO_FIELD_RVA_RVA]);
                sig = mono_metadata_blob_heap (m, mono_metadata_decode_row_col (ft, cols [MONO_FIELD_RVA_FIELD] -1, MONO_FIELD_SIGNATURE));
                mono_metadata_decode_value (sig, &sig);
                /* FIELD signature == 0x06 */