2005-07-30 Zoltan Varga <vargaz@freemail.hu>
[mono.git] / mono / dis / dump.c
index 7f1f98cde61028945f5d52e6bd9dd6ca68e65f25..2ebd0d4bd45ffca24c6dc9f6067bebfa61f7dfc0 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
+#include <math.h>
 #include "meta.h"
 #include "util.h"
 #include "dump.h"
 #include "get.h"
 #include "mono/metadata/loader.h"
 #include "mono/metadata/class.h"
+#include "mono/utils/mono-compiler.h"
+
+#ifndef HAVE_ISINF
+
+#ifdef HAVE_IEEEFP_H
+extern int isinf (double);
+#endif
+
+#endif
 
 void
 dump_table_assembly (MonoImage *m)
@@ -25,9 +35,13 @@ dump_table_assembly (MonoImage *m)
        const char *ptr;
        int len;
 
-       mono_metadata_decode_row (t, 0, cols, MONO_ASSEMBLY_SIZE);
        fprintf (output, "Assembly Table\n");
 
+       if (!t->rows)
+               return;
+
+       mono_metadata_decode_row (t, 0, cols, MONO_ASSEMBLY_SIZE);
+
        fprintf (output, "Name:          %s\n", mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_NAME]));
        fprintf (output, "Hash Algoritm: 0x%08x\n", cols [MONO_ASSEMBLY_HASH_ALG]);
        fprintf (output, "Version:       %d.%d.%d.%d\n", cols [MONO_ASSEMBLY_MAJOR_VERSION], 
@@ -89,6 +103,23 @@ dump_table_typedef (MonoImage *m)
        fprintf (output, "\n");
 }
 
+void
+dump_table_typespec (MonoImage *m)
+{
+       MonoTableInfo *t = &m->tables [MONO_TABLE_TYPESPEC];
+       int i;
+
+       fprintf (output, "Typespec Table\n");
+       
+       for (i = 1; i <= t->rows; i++){         
+               char *typespec = get_typespec (m, i, TRUE, NULL);
+
+               fprintf (output, "%d: %s\n", i, typespec);
+               g_free (typespec);
+       }
+       fprintf (output, "\n");
+}
+
 void
 dump_table_assemblyref (MonoImage *m)
 {
@@ -133,7 +164,7 @@ dump_table_param (MonoImage *m)
        for (i = 0; i < t->rows; i++){
                guint32 cols [MONO_PARAM_SIZE];
 
-               mono_metadata_decode_row (t, i, cols, CSIZE (cols));
+               mono_metadata_decode_row (t, i, cols, MONO_PARAM_SIZE);
                fprintf (output, "%d: 0x%04x %d %s\n",
                         i + 1,
                         cols [MONO_PARAM_FLAGS], cols [MONO_PARAM_SEQUENCE], 
@@ -173,7 +204,7 @@ dump_table_field (MonoImage *m)
                        first_m = last_m;
                }
                mono_metadata_decode_row (t, i - 1, cols, MONO_FIELD_SIZE);
-               sig = get_field_signature (m, cols [MONO_FIELD_SIGNATURE]);
+               sig = get_field_signature (m, cols [MONO_FIELD_SIGNATURE], NULL);
                flags = field_flags (cols [MONO_FIELD_FLAGS]);
                fprintf (output, "%d: %s %s: %s\n",
                         i,
@@ -201,7 +232,7 @@ dump_table_memberref (MonoImage *m)
        int i, kind, idx;
        char *x, *xx;
        char *sig;
-       const char *blob, *ks;
+       const char *blob, *ks = NULL;
 
        fprintf (output, "MemberRef Table (1..%d)\n", t->rows);
 
@@ -217,7 +248,11 @@ dump_table_memberref (MonoImage *m)
                
                switch (kind){
                case 0:
-                       ks = "TypeDef"; break;
+                       ks = "TypeDef";
+                       xx = get_typedef (m, idx);
+                       x = g_strconcat (xx, ".", mono_metadata_string_heap (m, cols [MONO_MEMBERREF_NAME]), NULL);
+                       g_free (xx);
+                       break;
                case 1:
                        ks = "TypeRef";
                        xx = get_typeref (m, idx);
@@ -227,10 +262,12 @@ dump_table_memberref (MonoImage *m)
                case 2:
                        ks = "ModuleRef"; break;
                case 3:
-                       ks = "MethodDef"; break;
+                       ks = "MethodDef";
+                       x = get_methoddef (m, idx);
+                       break;
                case 4:
                        ks = "TypeSpec";
-                       xx = get_typespec (m, idx);
+                       xx = get_typespec (m, idx, FALSE, NULL);
                        x = g_strconcat (xx, ".", mono_metadata_string_heap (m, cols [MONO_MEMBERREF_NAME]), NULL);
                        g_free (xx);
                        break;
@@ -240,9 +277,9 @@ dump_table_memberref (MonoImage *m)
                blob = mono_metadata_blob_heap (m, cols [MONO_MEMBERREF_SIGNATURE]);
                mono_metadata_decode_blob_size (blob, &blob);
                if (*blob == 0x6) { /* it's a field */
-                       sig = get_field_signature (m, cols [MONO_MEMBERREF_SIGNATURE]);
+                       sig = get_field_signature (m, cols [MONO_MEMBERREF_SIGNATURE], NULL);
                } else {
-                       sig = get_methodref_signature (m, cols [MONO_MEMBERREF_SIGNATURE], NULL);
+                       sig = get_methodref_signature (m, cols [MONO_MEMBERREF_SIGNATURE], NULL, NULL);
                }
                fprintf (output, "%d: %s[%d] %s\n\tResolved: %s\n\tSignature: %s\n\t\n",
                         i + 1,
@@ -267,7 +304,7 @@ dump_table_class_layout (MonoImage *m)
        for (i = 0; i < t->rows; i++){
                guint32 cols [MONO_CLASS_LAYOUT_SIZE];
                
-               mono_metadata_decode_row (t, i, cols, CSIZE (cols));
+               mono_metadata_decode_row (t, i, cols, MONO_CLASS_LAYOUT_SIZE);
 
                fprintf (output, "%d: PackingSize=%d  ClassSize=%d  Parent=%s\n",
                         i + 1, cols [MONO_CLASS_LAYOUT_PACKING_SIZE], 
@@ -291,12 +328,12 @@ dump_table_constant (MonoImage *m)
 
        for (i = 0; i < t->rows; i++){
                guint32 cols [MONO_CONSTANT_SIZE];
-               const char *parent = desc [cols [MONO_CONSTANT_PARENT] & HASCONSTANT_MASK];
-               
+               const char *parent;
                mono_metadata_decode_row (t, i, cols, MONO_CONSTANT_SIZE);
+               parent = desc [cols [MONO_CONSTANT_PARENT] & MONO_HASCONSTANT_MASK];
 
                fprintf (output, "%d: Parent= %s: %d %s\n",
-                        i + 1, parent, cols [MONO_CONSTANT_PARENT] >> HASCONSTANT_BITS, 
+                        i + 1, parent, cols [MONO_CONSTANT_PARENT] >> MONO_HASCONSTANT_BITS, 
                         get_constant (m, (MonoTypeEnum) cols [MONO_CONSTANT_TYPE], cols [MONO_CONSTANT_VALUE]));
        }
        
@@ -351,18 +388,18 @@ dump_table_property (MonoImage *m)
                bsize = mono_metadata_decode_blob_size (ptr, &ptr);
                /* ECMA claims 0x08 ... */
                if (*ptr != 0x28 && *ptr != 0x08)
-                               g_warning("incorrect signature in propert blob: 0x%x", *ptr);
+                       g_warning("incorrect signature in propert blob: 0x%x", *ptr);
                ptr++;
                pcount = mono_metadata_decode_value (ptr, &ptr);
-               ptr = get_type (m, ptr, &type);
+               ptr = get_type (m, ptr, &type, NULL);
                fprintf (output, "%d: %s %s (",
                         i + 1, type, mono_metadata_string_heap (m, cols [MONO_PROPERTY_NAME]));
                g_free (type);
 
                for (j = 0; j < pcount; j++){
-                               ptr = get_param (m, ptr, &type);
-                               fprintf (output, "%s%s", j > 0? ", " : "",type);
-                               g_free (type);
+                       ptr = get_param (m, ptr, &type, NULL);
+                       fprintf (output, "%s%s", j > 0? ", " : "",type);
+                       g_free (type);
                }
                fprintf (output, ") %s\n", flags);
        }
@@ -383,7 +420,7 @@ dump_table_event (MonoImage *m)
                mono_metadata_decode_row (t, i, cols, MONO_EVENT_SIZE);
 
                name = mono_metadata_string_heap (m, cols [MONO_EVENT_NAME]);
-               type = get_typedef_or_ref (m, cols [MONO_EVENT_TYPE]);
+               type = get_typedef_or_ref (m, cols [MONO_EVENT_TYPE], NULL);
                fprintf (output, "%d: %s %s %s\n", i + 1, type, name,
                         cols [MONO_EVENT_FLAGS] & 0x200 ? "specialname " : "");
                g_free (type);
@@ -423,15 +460,17 @@ get_manifest_implementation (MonoImage *m, guint32 idx)
        const char* table = "";
        if (!idx)
                return g_strdup ("current module");
-       row = idx >> IMPLEMENTATION_BITS;
-       switch (idx & IMPLEMENTATION_MASK) {
-       case IMPLEMENTATION_FILE:
+       row = idx >> MONO_IMPLEMENTATION_BITS;
+       switch (idx & MONO_IMPLEMENTATION_MASK) {
+       case MONO_IMPLEMENTATION_FILE:
                table = "file";
                break;
-       case IMPLEMENTATION_ASSEMBLYREF:
+       case MONO_IMPLEMENTATION_ASSEMBLYREF:
                table = "assemblyref";
                break;
-       case IMPLEMENTATION_EXP_TYPE:
+       case MONO_IMPLEMENTATION_EXP_TYPE:
+               table = "exportedtype";
+               break;
        default:
                g_assert_not_reached ();
        }
@@ -509,8 +548,7 @@ dump_table_module (MonoImage *m)
                name = mono_metadata_string_heap (m, cols [MONO_MODULE_NAME]);
                guid = get_guid (m, cols [MONO_MODULE_MVID]);
                fprintf (output, "%d: %s %d %s\n", i + 1, name, cols [MONO_MODULE_MVID], guid);
-       }
-       
+       }       
 }
 
 void
@@ -546,7 +584,7 @@ dump_table_method (MonoImage *m)
                sigblob = mono_metadata_blob_heap (m, cols [MONO_METHOD_SIGNATURE]);
                mono_metadata_decode_blob_size (sigblob, &sigblob);
                method = mono_metadata_parse_method_signature (m, i, sigblob, &sigblob);
-               sig = dis_stringify_method_signature (m, method, i);
+               sig = dis_stringify_method_signature (m, method, i, NULL, FALSE);
                fprintf (output, "%d: %s (param: %d)\n", i, sig, cols [MONO_METHOD_PARAMLIST]);
                g_free (sig);
                mono_metadata_free_method_signature (method);
@@ -554,15 +592,29 @@ dump_table_method (MonoImage *m)
        
 }
 
-static guint32
-method_dor_to_token (guint32 idx) {
-       switch (idx & METHODDEFORREF_MASK) {
-       case METHODDEFORREF_METHODDEF:
-               return MONO_TOKEN_METHOD_DEF | (idx >> METHODDEFORREF_BITS);
-       case METHODDEFORREF_METHODREF:
-               return MONO_TOKEN_MEMBER_REF | (idx >> METHODDEFORREF_BITS);
+void
+dump_table_implmap (MonoImage *m)
+{
+       MonoTableInfo *t = &m->tables [MONO_TABLE_IMPLMAP];
+       MonoTableInfo *td = &m->tables [MONO_TABLE_MODULEREF];
+       int i;
+
+       fprintf (output, "ImplMap Table (1..%d)\n", t->rows);
+
+       for (i = 1; i <= t->rows; i++){
+               guint32 cols [MONO_IMPLMAP_SIZE];
+               char *method;
+
+               mono_metadata_decode_row (t, i - 1, cols, MONO_IMPLMAP_SIZE);
+
+               method = get_method (m, MONO_TOKEN_METHOD_DEF | (cols [MONO_IMPLMAP_MEMBER] >> MONO_MEMBERFORWD_BITS), NULL);
+               
+               fprintf (output, "%d: %s %d (%s %s)\n", i, 
+                                method,
+                                cols [MONO_IMPLMAP_FLAGS], 
+                                mono_metadata_string_heap (m, cols [MONO_IMPLMAP_NAME]),
+                                mono_metadata_string_heap (m, mono_metadata_decode_row_col (td, cols [MONO_IMPLMAP_SCOPE] - 1, MONO_MODULEREF_NAME)));
        }
-       return -1;
 }
 
 void
@@ -580,8 +632,8 @@ dump_table_methodimpl (MonoImage *m)
 
                mono_metadata_decode_row (t, i - 1, cols, MONO_METHODIMPL_SIZE);
                class = get_typedef (m, cols [MONO_METHODIMPL_CLASS]);
-               impl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_BODY]));
-               decl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_DECLARATION]));
+               impl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_BODY]), NULL);
+               decl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_DECLARATION]), NULL);
                fprintf (output, "%d: %s\n\tdecl: %s\n\timpl: %s\n", i, class, decl, impl);
                g_free (class);
                g_free (impl);
@@ -590,7 +642,7 @@ dump_table_methodimpl (MonoImage *m)
        
 }
 
-static map_t semantics_map [] = {
+static dis_map_t semantics_map [] = {
                {1, "setter"},
                {2, "getter"},
                {4, "other"},
@@ -613,8 +665,8 @@ dump_table_methodsem (MonoImage *m)
                
                mono_metadata_decode_row (t, i - 1, cols, MONO_METHOD_SEMA_SIZE);
                semantics = flags (cols [MONO_METHOD_SEMA_SEMANTICS], semantics_map);
-               is_property = cols [MONO_METHOD_SEMA_ASSOCIATION] & HAS_SEMANTICS_MASK;
-               index = cols [MONO_METHOD_SEMA_ASSOCIATION] >> HAS_SEMANTICS_BITS;
+               is_property = cols [MONO_METHOD_SEMA_ASSOCIATION] & MONO_HAS_SEMANTICS_MASK;
+               index = cols [MONO_METHOD_SEMA_ASSOCIATION] >> MONO_HAS_SEMANTICS_BITS;
                fprintf (output, "%d: [%d] %s method: %d %s %d\n", i, cols [MONO_METHOD_SEMA_ASSOCIATION], semantics,
                                                cols [MONO_METHOD_SEMA_METHOD] - 1, 
                                                is_property? "property" : "event",
@@ -634,74 +686,74 @@ dump_table_interfaceimpl (MonoImage *m)
                
                mono_metadata_decode_row (t, i - 1, cols, MONO_INTERFACEIMPL_SIZE);
                fprintf (output, "%d: %s implements %s\n", i,
-                       get_typedef (m, cols [MONO_INTERFACEIMPL_CLASS]),
-                       get_typedef_or_ref (m, cols [MONO_INTERFACEIMPL_INTERFACE]));
+                        get_typedef (m, cols [MONO_INTERFACEIMPL_CLASS]),
+                        get_typedef_or_ref (m, cols [MONO_INTERFACEIMPL_INTERFACE], NULL));
        }
 }
 
 static char*
 has_cattr_get_table (MonoImage *m, guint32 val)
 {
-       guint32 t = val & CUSTOM_ATTR_MASK;
-       guint32 index = val >> CUSTOM_ATTR_BITS;
+       guint32 t = val & MONO_CUSTOM_ATTR_MASK;
+       guint32 index = val >> MONO_CUSTOM_ATTR_BITS;
        const char *table;
 
        switch (t) {
-       case CUSTOM_ATTR_METHODDEF:
+       case MONO_CUSTOM_ATTR_METHODDEF:
                table = "MethodDef";
                break;
-       case CUSTOM_ATTR_FIELDDEF:
+       case MONO_CUSTOM_ATTR_FIELDDEF:
                table = "FieldDef";
                break;
-       case CUSTOM_ATTR_TYPEREF:
+       case MONO_CUSTOM_ATTR_TYPEREF:
                table = "TypeRef";
                break;
-       case CUSTOM_ATTR_TYPEDEF:
+       case MONO_CUSTOM_ATTR_TYPEDEF:
                table = "TypeDef";
                break;
-       case CUSTOM_ATTR_PARAMDEF:
+       case MONO_CUSTOM_ATTR_PARAMDEF:
                table = "Param";
                break;
-       case CUSTOM_ATTR_INTERFACE:
+       case MONO_CUSTOM_ATTR_INTERFACE:
                table = "InterfaceImpl";
                break;
-       case CUSTOM_ATTR_MEMBERREF:
+       case MONO_CUSTOM_ATTR_MEMBERREF:
                table = "MemberRef";
                break;
-       case CUSTOM_ATTR_MODULE:
+       case MONO_CUSTOM_ATTR_MODULE:
                table = "Module";
                break;
-       case CUSTOM_ATTR_PERMISSION:
+       case MONO_CUSTOM_ATTR_PERMISSION:
                table = "DeclSecurity?";
                break;
-       case CUSTOM_ATTR_PROPERTY:
+       case MONO_CUSTOM_ATTR_PROPERTY:
                table = "Property";
                break;
-       case CUSTOM_ATTR_EVENT:
+       case MONO_CUSTOM_ATTR_EVENT:
                table = "Event";
                break;
-       case CUSTOM_ATTR_SIGNATURE:
+       case MONO_CUSTOM_ATTR_SIGNATURE:
                table = "StandAloneSignature";
                break;
-       case CUSTOM_ATTR_MODULEREF:
+       case MONO_CUSTOM_ATTR_MODULEREF:
                table = "ModuleRef";
                break;
-       case CUSTOM_ATTR_TYPESPEC:
+       case MONO_CUSTOM_ATTR_TYPESPEC:
                table = "TypeSpec";
                break;
-       case CUSTOM_ATTR_ASSEMBLY:
+       case MONO_CUSTOM_ATTR_ASSEMBLY:
                table = "Assembly";
                break;
-       case CUSTOM_ATTR_ASSEMBLYREF:
+       case MONO_CUSTOM_ATTR_ASSEMBLYREF:
                table = "AssemblyRef";
                break;
-       case CUSTOM_ATTR_FILE:
+       case MONO_CUSTOM_ATTR_FILE:
                table = "File";
                break;
-       case CUSTOM_ATTR_EXP_TYPE:
+       case MONO_CUSTOM_ATTR_EXP_TYPE:
                table = "ExportedType";
                break;
-       case CUSTOM_ATTR_MANIFEST:
+       case MONO_CUSTOM_ATTR_MANIFEST:
                table = "Manifest";
                break;
        default:
@@ -768,30 +820,49 @@ handle_enum:
                        p += 4;
                        break;
                case MONO_TYPE_U8:
-                       g_string_sprintfa (res, "%lld", read64 (p));
+                       g_string_sprintfa (res, "%lld", (long long)read64 (p));
                        p += 8;
                        break;
                case MONO_TYPE_I8:
-                       g_string_sprintfa (res, "%lld", (gint64)read64 (p));
+                       g_string_sprintfa (res, "%lld", (long long)read64 (p));
                        p += 8;
                        break;
                case MONO_TYPE_R4: {
                        float val;
+                       int inf;
                        readr4 (p, &val);
-                       g_string_sprintfa (res, "%g", val);
+                       inf = isinf (val);
+                       if (inf == -1) 
+                               g_string_sprintfa (res, "(00 00 80 ff)"); /* negative infinity */
+                       else if (inf == 1)
+                               g_string_sprintfa (res, "(00 00 80 7f)"); /* positive infinity */
+                       else if (isnan (val))
+                               g_string_sprintfa (res, "(00 00 c0 ff)"); /* NaN */
+                       else
+                               g_string_sprintfa (res, "%g", val);
                        p += 4;
                        break;
                }
                case MONO_TYPE_R8: {
                        double val;
+                       int inf;
+                       
                        readr8 (p, &val);
-                       g_string_sprintfa (res, "%g", val);
+                       inf = isinf (val);
+                       if (inf == -1) 
+                               g_string_sprintfa (res, "(00 00 00 00 00 00 f0 ff)"); /* negative infinity */
+                       else if (inf == 1)
+                               g_string_sprintfa (res, "(00 00 00 00 00 00 f0 7f)"); /* positive infinity */
+                       else if (isnan (val))
+                               g_string_sprintfa (res, "(00 00 00 00 00 00 f8 ff)"); /* NaN */
+                       else
+                               g_string_sprintfa (res, "%g", val);
                        p += 8;
                        break;
                }
                case MONO_TYPE_VALUETYPE:
-                       if (sig->params [i]->data.klass->enumtype) {
-                               type = sig->params [i]->data.klass->enum_basetype->type;
+                       if (mono_class_is_enum (sig->params [i]->data.klass)) {
+                               type = mono_class_enum_basetype (sig->params [i]->data.klass)->type;
                                goto handle_enum;
                        } else {
                                g_warning ("generic valutype not handled in custom attr value decoding");
@@ -799,6 +870,11 @@ handle_enum:
                        break;
                case MONO_TYPE_CLASS: /* It must be a Type: check? */
                case MONO_TYPE_STRING:
+                       if (*p == (char)0xff) {
+                               g_string_append (res, "null");
+                               p++;
+                               break;
+                       }
                        slen = mono_metadata_decode_value (p, &p);
                        g_string_append_c (res, '"');
                        g_string_append (res, p);
@@ -841,21 +917,21 @@ dump_table_customattr (MonoImage *m)
                
                mono_metadata_decode_row (t, i - 1, cols, MONO_CUSTOM_ATTR_SIZE);
                desc = has_cattr_get_table (m, cols [MONO_CUSTOM_ATTR_PARENT]);
-               mtoken = cols [MONO_CUSTOM_ATTR_TYPE] >> CUSTOM_ATTR_TYPE_BITS;
-               switch (cols [MONO_CUSTOM_ATTR_TYPE] & CUSTOM_ATTR_TYPE_MASK) {
-               case CUSTOM_ATTR_TYPE_METHODDEF:
+               mtoken = cols [MONO_CUSTOM_ATTR_TYPE] >> MONO_CUSTOM_ATTR_TYPE_BITS;
+               switch (cols [MONO_CUSTOM_ATTR_TYPE] & MONO_CUSTOM_ATTR_TYPE_MASK) {
+               case MONO_CUSTOM_ATTR_TYPE_METHODDEF:
                        mtoken |= MONO_TOKEN_METHOD_DEF;
                        break;
-               case CUSTOM_ATTR_TYPE_MEMBERREF:
+               case MONO_CUSTOM_ATTR_TYPE_MEMBERREF:
                        mtoken |= MONO_TOKEN_MEMBER_REF;
                        break;
                default:
                        g_warning ("Unknown table for custom attr type %08x", cols [MONO_CUSTOM_ATTR_TYPE]);
                        break;
                }
-               method = get_method (m, mtoken);
+               method = get_method (m, mtoken, NULL);
                meth = mono_get_method (m, mtoken, NULL);
-               params = custom_attr_params (m, meth->signature, mono_metadata_blob_heap (m, cols [MONO_CUSTOM_ATTR_VALUE]));
+               params = custom_attr_params (m, mono_method_signature (meth), mono_metadata_blob_heap (m, cols [MONO_CUSTOM_ATTR_VALUE]));
                fprintf (output, "%d: %s: %s [%s]\n", i, desc, method, params);
                g_free (desc);
                g_free (method);
@@ -892,13 +968,18 @@ dump_table_exported (MonoImage *m)
        guint32 cols [MONO_EXP_TYPE_SIZE];
        int i;
        const char *name, *nspace;
+       char *impl;
+       guint32 index;
        fprintf (output, "ExportedType Table (1..%d)\n", t->rows);
 
        for (i = 1; i <= t->rows; i++) {
                mono_metadata_decode_row (t, i - 1, cols, MONO_EXP_TYPE_SIZE);
                name = mono_metadata_string_heap (m, cols [MONO_EXP_TYPE_NAME]);
                nspace = mono_metadata_string_heap (m, cols [MONO_EXP_TYPE_NAMESPACE]);
-               fprintf (output, "%d: %s %s\n", i, name, nspace);
+               impl = get_manifest_implementation (m, cols [MONO_EXP_TYPE_IMPLEMENTATION]);
+               index = cols [MONO_EXP_TYPE_TYPEDEF];
+               fprintf (output, "%d: %s%s%s is in %s, token %x\n", i, nspace, *nspace ? "." : "", name, impl, index);
+               g_free (impl);
        }
        
 }
@@ -918,8 +999,8 @@ dump_table_field_marshal (MonoImage *m)
                mono_metadata_decode_row (t, i - 1, cols, MONO_FIELD_MARSHAL_SIZE);
                blob = mono_metadata_blob_heap (m, cols [MONO_FIELD_MARSHAL_NATIVE_TYPE]);
                native = get_marshal_info (m, blob);
-               is_field = (cols [MONO_FIELD_MARSHAL_PARENT] & HAS_FIELD_MARSHAL_MASK) == HAS_FIELD_MARSHAL_FIELDSREF;
-               idx = cols [MONO_FIELD_MARSHAL_PARENT] >> HAS_FIELD_MARSHAL_BITS;
+               is_field = (cols [MONO_FIELD_MARSHAL_PARENT] & MONO_HAS_FIELD_MARSHAL_MASK) == MONO_HAS_FIELD_MARSHAL_FIELDSREF;
+               idx = cols [MONO_FIELD_MARSHAL_PARENT] >> MONO_HAS_FIELD_MARSHAL_BITS;
                fprintf (output, "%d: (0x%04x) %s %d: %s\n", i, cols [MONO_FIELD_MARSHAL_PARENT], is_field? "Field" : "Param", idx, native);
                g_free (native);
        }
@@ -949,6 +1030,20 @@ get_security_action (int val) {
                return "RequestOptional";
        case SECURITY_ACTION_REQREFUSE:
                return "RequestRefuse";
+       /* Special actions (for non CAS permissions) */
+       case SECURITY_ACTION_NONCASDEMAND:
+               return "NonCasDemand";
+       case SECURITY_ACTION_NONCASLINKDEMAND:
+               return "NonCasLinkDemand";
+       case SECURITY_ACTION_NONCASINHERITANCE:
+               return "NonCasInheritance";
+       /* Fx 2.0 actions (for both CAS and non-CAS permissions) */
+       case SECURITY_ACTION_LINKDEMANDCHOICE:
+               return "LinkDemandChoice";
+       case SECURITY_ACTION_INHERITDEMANDCHOICE:
+               return "InheritanceDemandChoice";
+       case SECURITY_ACTION_DEMANDCHOICE:
+               return "DemandChoice";
        default:
                g_snprintf (buf, sizeof (buf), "0x%04X", val);
                return buf;
@@ -975,7 +1070,7 @@ dump_table_declsec (MonoImage *m)
                len = mono_metadata_decode_blob_size (blob, &blob);
                action = get_security_action (cols [MONO_DECL_SECURITY_ACTION]);
                idx = cols [MONO_DECL_SECURITY_PARENT];
-               fprintf (output, "%d: %s on %s %d%s", i, action, parent [idx & HAS_DECL_SECURITY_MASK], idx >> HAS_DECL_SECURITY_BITS, len? ":\n\t":"\n");
+               fprintf (output, "%d: %s on %s %d%s", i, action, parent [idx & MONO_HAS_DECL_SECURITY_MASK], idx >> MONO_HAS_DECL_SECURITY_BITS, len? ":\n\t":"\n");
                if (!len)
                        continue;
                for (idx = 0; idx < len; ++idx)
@@ -990,17 +1085,20 @@ dump_table_genericpar (MonoImage *m)
        MonoTableInfo *t = &m->tables [MONO_TABLE_GENERICPARAM];
        guint32 cols [MONO_GENERICPARAM_SIZE];
        int i;
-       
-       fprintf (output, "GenericParameters (1..%d)\n", t->rows);
 
+       fprintf (output, "GenericParameters (1..%d)\n", t->rows);
+        
        for (i = 1; i <= t->rows; i++) {
+                char *sig;
                mono_metadata_decode_row (t, i - 1, cols, MONO_GENERICPARAM_SIZE);
 
-               fprintf (output, "%d: %d, flags=%d, owner=0x%x %s\n", i,
+                // sig = get_type_or_methdef (m, cols [MONO_GENERICPARAM_OWNER]);
+               sig = g_strdup_printf ("%x", cols [MONO_GENERICPARAM_OWNER]);
+               fprintf (output, "%d: %d, flags=%d, owner=%s %s\n", i,
                         cols [MONO_GENERICPARAM_NUMBER],
-                        cols [MONO_GENERICPARAM_FLAGS],
-                        cols [MONO_GENERICPARAM_OWNER],
+                        cols [MONO_GENERICPARAM_FLAGS], sig,
                         mono_metadata_string_heap (m, cols [MONO_GENERICPARAM_NAME]));
+                g_free (sig);
        }
 }
 
@@ -1014,21 +1112,20 @@ dump_table_methodspec (MonoImage *m)
        fprintf (output, "MethodSpec (1..%d)\n", t->rows);
 
        for (i = 1; i <= t->rows; i++) {
-               const char *sigblob;
-               MonoMethodSignature *method_sig;
                char *sig;
                char *method;
-               
+                guint32 token;
+                
                mono_metadata_decode_row (t, i - 1, cols, MONO_METHODSPEC_SIZE);
 
-               method = get_method (m, method_dor_to_token (cols [MONO_METHODSPEC_METHOD]));
-               sigblob = mono_metadata_blob_heap (m, cols [MONO_METHODSPEC_SIGNATURE]);
-               method_sig = mono_metadata_parse_method_signature (m, i, sigblob, &sigblob);
-               sig = dis_stringify_method_signature (m, method_sig, i);
+                /* build a methodspec token to get the method */
+                token = MONO_TOKEN_METHOD_SPEC | i;
+                method = get_method (m, token, NULL);
+                
+                sig = get_method_type_param (m, cols [MONO_METHODSPEC_SIGNATURE], NULL);
                fprintf (output, "%d: %s, %s\n", i, method, sig);
                g_free (sig);
                g_free (method);
-               mono_metadata_free_method_signature (method_sig);
        }
 }
 
@@ -1042,11 +1139,60 @@ dump_table_parconstraint (MonoImage *m)
        fprintf (output, "Generic Param Constraint (1..%d)\n", t->rows);
 
        for (i = 1; i <= t->rows; i++) {
+                char *sig;
                mono_metadata_decode_row (t, i - 1, cols, MONO_GENPARCONSTRAINT_SIZE);
-               
-               fprintf (output, "%d: gen-par=%d, Constraint=0x%x\n", i,
-                        cols [MONO_GENPARCONSTRAINT_GENERICPAR],
-                        cols [MONO_GENPARCONSTRAINT_CONSTRAINT]);
+
+                // sig = get_typedef_or_ref (m, cols [MONO_GENPARCONSTRAINT_CONSTRAINT], NULL);
+               sig = g_strdup_printf ("%x", cols [MONO_GENPARCONSTRAINT_CONSTRAINT]);
+               fprintf (output, "%d: gen-par=%d, Constraint=%s\n", i,
+                        cols [MONO_GENPARCONSTRAINT_GENERICPAR], sig);
+                g_free (sig);
+       }
+}
+
+void
+dump_stream_blob (MonoImage *m)
+{
+       int i;
+
+       fprintf (output, "Blob heap contents\n");
+
+       for (i = 0; i < m->heap_blob.size; i++) {
+               if (i > 0) {
+                       if ((i % 16) == 0)
+                               fprintf (output, "\n");
+                       else if ((i % 8) == 0)
+                               fprintf (output, "- ");
+               }
+               fprintf (output, "%02x ", m->heap_blob.data [i] & 0xff);
        }
+
+       fprintf (output, "\n");
 }
 
+void
+dump_table_standalonesig (MonoImage *m)
+{
+       MonoTableInfo *t = &m->tables [MONO_TABLE_STANDALONESIG];
+       guint32 cols [MONO_STAND_ALONE_SIGNATURE_SIZE];
+       int i;
+       
+       fprintf (output, "Stand alone signature (1..%d)\n", t->rows);
+
+       for (i = 1; i <= t->rows; i++) {
+                const char *locals_ptr;
+               int j, bsize;
+
+               mono_metadata_decode_row (t, i - 1, cols, MONO_STAND_ALONE_SIGNATURE_SIZE);
+
+               locals_ptr = mono_metadata_blob_heap (m, cols [MONO_STAND_ALONE_SIGNATURE]);
+               bsize = mono_metadata_decode_blob_size (locals_ptr, &locals_ptr);
+
+               fprintf (output, "%d: blob[0x%x] = ", i, cols [MONO_STAND_ALONE_SIGNATURE]);
+
+               for (j = 0; j < bsize; j++) {
+                       fprintf (output, "%02x ", locals_ptr [j]);
+               }
+               fprintf (output, "\n");
+       }
+}