X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2Fmain.c;h=13583f14cb1c0f52539489eadc827deef8a07451;hb=19460c4ca7c710bf80a7121c76e5b5ef8fc48c8c;hp=2b952e329203ba8d83914fe07f70fefc96eff86d;hpb=d17eb17b12e5b1cf13471c70f5be8a3b8ada87b0;p=mono.git diff --git a/mono/dis/main.c b/mono/dis/main.c index 2b952e32920..13583f14cb1 100644 --- a/mono/dis/main.c +++ b/mono/dis/main.c @@ -27,6 +27,11 @@ #include #include +static void setup_filter (MonoImage *image); +static gboolean should_include_type (int idx); +static gboolean should_include_method (int idx); +static gboolean should_include_field (int idx); + FILE *output; /* True if you want to get a dump of the header data */ @@ -48,11 +53,10 @@ dump_header_data (MonoImage *img) } static void -dump_cattrs (MonoImage *m, guint32 token, const char *indent) +dump_cattrs_list (GList *list, const char *indent) { - GList *tmp, *list; + GList *tmp; - list = dis_get_custom_attrs (m, token); for (tmp = list; tmp; tmp = tmp->next) { fprintf (output, "%s%s\n", indent, (char*)tmp->data); g_free (tmp->data); @@ -60,6 +64,86 @@ dump_cattrs (MonoImage *m, guint32 token, const char *indent) g_list_free (list); } +static void +dump_cattrs (MonoImage *m, guint32 token, const char *indent) +{ + GList *list; + + list = dis_get_custom_attrs (m, token); + dump_cattrs_list (list, indent); +} + +static const char* +get_il_security_action (int val) +{ + static char buf [32]; + + switch (val) { + case SECURITY_ACTION_DEMAND: + return "demand"; + case SECURITY_ACTION_ASSERT: + return "assert"; + case SECURITY_ACTION_DENY: + return "deny"; + case SECURITY_ACTION_PERMITONLY: + return "permitonly"; + case SECURITY_ACTION_LINKDEMAND: + return "linkcheck"; + case SECURITY_ACTION_INHERITDEMAND: + return "inheritcheck"; + case SECURITY_ACTION_REQMIN: + return "reqmin"; + case SECURITY_ACTION_REQOPT: + return "reqopt"; + case SECURITY_ACTION_REQREFUSE: + return "reqrefuse"; + /* 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 "linkdemandor"; + case SECURITY_ACTION_INHERITDEMANDCHOICE: + return "inheritancedemandor"; + case SECURITY_ACTION_DEMANDCHOICE: + return "demandor"; + default: + g_snprintf (buf, sizeof (buf), "0x%04X", val); + return buf; + } +} + +#define OBJECT_TYPE_TYPEDEF 0 +#define OBJECT_TYPE_METHODDEF 1 +#define OBJECT_TYPE_ASSEMBLYDEF 2 + +static void +dump_declarative_security (MonoImage *m, guint32 objectType, guint32 token, const char *indent) +{ + MonoTableInfo *t = &m->tables [MONO_TABLE_DECLSECURITY]; + guint32 cols [MONO_DECL_SECURITY_SIZE]; + int i, len; + guint32 idx; + const char *blob, *action; + + for (i = 1; i <= t->rows; i++) { + mono_metadata_decode_row (t, i - 1, cols, MONO_DECL_SECURITY_SIZE); + blob = mono_metadata_blob_heap (m, cols [MONO_DECL_SECURITY_PERMISSIONSET]); + len = mono_metadata_decode_blob_size (blob, &blob); + action = get_il_security_action (cols [MONO_DECL_SECURITY_ACTION]); + idx = cols [MONO_DECL_SECURITY_PARENT]; + if (((idx & MONO_HAS_DECL_SECURITY_MASK) == objectType) && ((idx >> MONO_HAS_DECL_SECURITY_BITS) == token)) { + char *dump = data_dump (blob, len, indent); + fprintf (output, "%s.permissionset %s = %s", indent, action, dump); + g_free (dump); + } + } +} + static void dis_directive_assembly (MonoImage *m) { @@ -74,6 +158,7 @@ dis_directive_assembly (MonoImage *m) fprintf (output, ".assembly '%s'\n{\n", mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_NAME])); dump_cattrs (m, MONO_TOKEN_ASSEMBLY | 1, " "); + dump_declarative_security (m, OBJECT_TYPE_ASSEMBLYDEF, 1, " "); fprintf (output, " .hash algorithm 0x%08x\n" " .ver %d:%d:%d:%d\n", @@ -103,40 +188,129 @@ dis_directive_assemblyref (MonoImage *m) return; for (i = 0; i < t->rows; i++){ + char *esc; + mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE); + esc = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_NAME])); + fprintf (output, ".assembly extern %s\n" "{\n" - " .ver %d:%d:%d:%d\n" - "}\n", - mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_NAME]), + " .ver %d:%d:%d:%d\n", + esc, cols [MONO_ASSEMBLYREF_MAJOR_VERSION], cols [MONO_ASSEMBLYREF_MINOR_VERSION], cols [MONO_ASSEMBLYREF_BUILD_NUMBER], cols [MONO_ASSEMBLYREF_REV_NUMBER] ); + if (cols [MONO_ASSEMBLYREF_CULTURE]){ + fprintf (output, " .locale %s\n", mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_CULTURE])); + } + if (cols [MONO_ASSEMBLYREF_PUBLIC_KEY]){ + const char* b = mono_metadata_blob_heap (m, cols [MONO_ASSEMBLYREF_PUBLIC_KEY]); + int len = mono_metadata_decode_blob_size (b, &b); + char *dump = data_dump (b, len, "\t\t"); + fprintf (output, " .publickeytoken =%s", dump); + g_free (dump); + } + fprintf (output, "}\n"); + g_free (esc); + } +} + +static void +dis_directive_module (MonoImage *m) +{ + MonoTableInfo *t = &m->tables [MONO_TABLE_MODULE]; + int i; + + for (i = 0; i < t->rows; i++){ + guint32 cols [MONO_MODULE_SIZE]; + const char *name; + char *guid, *ename; + + mono_metadata_decode_row (t, i, cols, MONO_MODULE_SIZE); + + name = mono_metadata_string_heap (m, cols [MONO_MODULE_NAME]); + ename = get_escaped_name (name); + guid = get_guid (m, cols [MONO_MODULE_MVID]); + fprintf (output, ".module %s // GUID = %s\n\n", ename, guid); + g_free (ename); + + dump_cattrs (m, MONO_TOKEN_MODULE | (i + 1), ""); } } -static map_t visibility_map [] = { +static void +dis_directive_moduleref (MonoImage *m) +{ + MonoTableInfo *t = &m->tables [MONO_TABLE_MODULEREF]; + int i; + + for (i = 0; i < t->rows; i++){ + guint32 cols [MONO_MODULEREF_SIZE]; + const char *name; + + mono_metadata_decode_row (t, i, cols, MONO_MODULEREF_SIZE); + + name = mono_metadata_string_heap (m, cols [MONO_MODULEREF_NAME]); + fprintf (output, ".module extern %s\n", name); + } + +} + +static void +dis_directive_file (MonoImage *m) +{ + MonoTableInfo *t = &m->tables [MONO_TABLE_FILE]; + int i, j, len; + guint32 entry_point; + + entry_point = mono_image_get_entry_point (m); + + for (i = 0; i < t->rows; i++){ + guint32 cols [MONO_FILE_SIZE]; + const char *name, *hash; + guint32 token; + + mono_metadata_decode_row (t, i, cols, MONO_FILE_SIZE); + + name = mono_metadata_string_heap (m, cols [MONO_FILE_NAME]); + + hash = mono_metadata_blob_heap (m, cols [MONO_FILE_HASH_VALUE]); + len = mono_metadata_decode_blob_size (hash, &hash); + + fprintf (output, ".file %s%s .hash = (", name, + cols [MONO_FILE_FLAGS] & FILE_CONTAINS_NO_METADATA ? " nometadata" : ""); + + for (j = 0; j < len; ++j) + fprintf (output, " %02X", hash [j] & 0xff); + + token = mono_metadata_make_token (MONO_TABLE_FILE, i + 1); + fprintf (output, " )%s\n", (token == entry_point) ? " .entrypoint" : ""); + } + +} + +static dis_map_t visibility_map [] = { { TYPE_ATTRIBUTE_NOT_PUBLIC, "private " }, { TYPE_ATTRIBUTE_PUBLIC, "public " }, { TYPE_ATTRIBUTE_NESTED_PUBLIC, "nested public " }, { TYPE_ATTRIBUTE_NESTED_PRIVATE, "nested private " }, - { TYPE_ATTRIBUTE_NESTED_FAMILY, "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_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 " }, { 0, NULL } }; -static map_t layout_map [] = { +static dis_map_t layout_map [] = { { TYPE_ATTRIBUTE_AUTO_LAYOUT, "auto " }, { TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT, "sequential " }, { TYPE_ATTRIBUTE_EXPLICIT_LAYOUT, "explicit " }, { 0, NULL } }; -static map_t format_map [] = { +static dis_map_t format_map [] = { { TYPE_ATTRIBUTE_ANSI_CLASS, "ansi " }, { TYPE_ATTRIBUTE_UNICODE_CLASS, "unicode " }, { TYPE_ATTRIBUTE_AUTO_CLASS, "auto " }, @@ -186,6 +360,7 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end) { MonoTableInfo *t = &m->tables [MONO_TABLE_FIELD]; guint32 cols [MONO_FIELD_SIZE]; + char *esname; char rva_desc [32]; guint32 rva; int i; @@ -198,7 +373,9 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end) for (i = start; i < end; i++){ char *sig, *flags, *attrs = NULL; guint32 field_offset = -1; - + + if (!should_include_field (i + 1)) + continue; mono_metadata_decode_row (t, i, cols, MONO_FIELD_SIZE); sig = get_field_signature (m, cols [MONO_FIELD_SIGNATURE]); flags = field_flags (cols [MONO_FIELD_FLAGS]); @@ -213,36 +390,37 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end) mono_metadata_field_info (m, i, &field_offset, NULL, NULL); if (field_offset != -1) attrs = g_strdup_printf ("[%d]", field_offset); + esname = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_FIELD_NAME])); if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_LITERAL){ char *lit; guint32 const_cols [MONO_CONSTANT_SIZE]; guint32 crow; - if ((crow = mono_metadata_get_constant_index (m, MONO_TOKEN_FIELD_DEF | (i+1)))) { + if ((crow = mono_metadata_get_constant_index (m, MONO_TOKEN_FIELD_DEF | (i+1), 0))) { mono_metadata_decode_row (&m->tables [MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE); lit = get_constant (m, const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]); } else { lit = g_strdup ("not found"); } + fprintf (output, " .field %s %s %s = ", - flags, sig, - mono_metadata_string_heap (m, cols [MONO_FIELD_NAME])); + flags, sig, esname); fprintf (output, "%s\n", lit); g_free (lit); } else fprintf (output, " .field %s %s %s %s%s\n", - attrs? attrs: "", flags, sig, - mono_metadata_string_heap (m, cols [MONO_FIELD_NAME]), rva_desc); + attrs? attrs: "", flags, sig, esname, rva_desc); g_free (attrs); g_free (flags); g_free (sig); + g_free (esname); dump_cattrs (m, MONO_TOKEN_FIELD_DEF | (i + 1), " "); } } -static map_t method_access_map [] = { - { METHOD_ATTRIBUTE_COMPILER_CONTROLLED, "compilercontrolled " }, +static dis_map_t method_access_map [] = { + { METHOD_ATTRIBUTE_COMPILER_CONTROLLED, "privatescope " }, { METHOD_ATTRIBUTE_PRIVATE, "private " }, { METHOD_ATTRIBUTE_FAM_AND_ASSEM, "famandassem " }, { METHOD_ATTRIBUTE_ASSEM, "assembly " }, @@ -252,7 +430,7 @@ static map_t method_access_map [] = { { 0, NULL } }; -static map_t method_flags_map [] = { +static dis_map_t method_flags_map [] = { { METHOD_ATTRIBUTE_STATIC, "static " }, { METHOD_ATTRIBUTE_FINAL, "final " }, { METHOD_ATTRIBUTE_VIRTUAL, "virtual " }, @@ -262,7 +440,8 @@ static map_t method_flags_map [] = { { METHOD_ATTRIBUTE_SPECIAL_NAME, "specialname " }, { METHOD_ATTRIBUTE_RT_SPECIAL_NAME, "rtspecialname " }, { METHOD_ATTRIBUTE_UNMANAGED_EXPORT, "export " }, - { METHOD_ATTRIBUTE_HAS_SECURITY, "hassecurity" }, +/* MS ilasm doesn't compile this statement - is must be added automagically when permissionset are present */ +/* { METHOD_ATTRIBUTE_HAS_SECURITY, "hassecurity" }, */ { METHOD_ATTRIBUTE_REQUIRE_SEC_OBJECT, "requiresecobj" }, { METHOD_ATTRIBUTE_PINVOKE_IMPL, "pinvokeimpl " }, { 0, NULL } @@ -289,13 +468,17 @@ method_flags (guint32 f) return s; } -static map_t pinvoke_flags_map [] = { +static dis_map_t pinvoke_flags_map [] = { { PINVOKE_ATTRIBUTE_NO_MANGLE , "nomangle " }, { PINVOKE_ATTRIBUTE_SUPPORTS_LAST_ERROR, "lasterr " }, + { PINVOKE_ATTRIBUTE_BEST_FIT_ENABLED, "bestfit:on" }, + { PINVOKE_ATTRIBUTE_BEST_FIT_DISABLED, "bestfit:off" }, + { PINVOKE_ATTRIBUTE_THROW_ON_UNMAPPABLE_ENABLED, "charmaperror:on" }, + { PINVOKE_ATTRIBUTE_THROW_ON_UNMAPPABLE_DISABLED, "charmaperror:off" }, { 0, NULL } }; -static map_t pinvoke_call_conv_map [] = { +static dis_map_t pinvoke_call_conv_map [] = { { PINVOKE_ATTRIBUTE_CALL_CONV_WINAPI, "winapi " }, { PINVOKE_ATTRIBUTE_CALL_CONV_CDECL, "cdecl " }, { PINVOKE_ATTRIBUTE_CALL_CONV_STDCALL, "stdcall " }, @@ -304,7 +487,7 @@ static map_t pinvoke_call_conv_map [] = { { 0, NULL } }; -static map_t pinvoke_char_set_map [] = { +static dis_map_t pinvoke_char_set_map [] = { { PINVOKE_ATTRIBUTE_CHAR_SET_NOT_SPEC, "" }, { PINVOKE_ATTRIBUTE_CHAR_SET_ANSI, "ansi " }, { PINVOKE_ATTRIBUTE_CHAR_SET_UNICODE , "unicode " }, @@ -335,7 +518,7 @@ pinvoke_flags (guint32 f) return s; } -static map_t method_impl_map [] = { +static dis_map_t method_impl_map [] = { { METHOD_IMPL_ATTRIBUTE_IL, "cil " }, { METHOD_IMPL_ATTRIBUTE_NATIVE, "native " }, { METHOD_IMPL_ATTRIBUTE_OPTIL, "optil " }, @@ -343,13 +526,13 @@ static map_t method_impl_map [] = { { 0, NULL } }; -static map_t managed_type_map [] = { +static dis_map_t managed_type_map [] = { { METHOD_IMPL_ATTRIBUTE_UNMANAGED, "unmanaged " }, { METHOD_IMPL_ATTRIBUTE_MANAGED, "managed " }, { 0, NULL } }; -static map_t managed_impl_flags [] = { +static dis_map_t managed_impl_flags [] = { { METHOD_IMPL_ATTRIBUTE_FORWARD_REF, "fwdref " }, { METHOD_IMPL_ATTRIBUTE_PRESERVE_SIG, "preservesig " }, { METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL, "internalcall " }, @@ -376,11 +559,38 @@ method_impl_flags (guint32 f) } static void -dis_locals (MonoImage *m, MonoMethodHeader *mh) +dis_locals (MonoImage *m, MonoMethodHeader *mh, const char *ptr) { int i; - fprintf(output, "\t.locals %s(\n", mh->init_locals ? "init " : ""); + if (show_tokens) { + unsigned char flags = *(const unsigned char *) ptr; + unsigned char format = flags & METHOD_HEADER_FORMAT_MASK; + guint16 fat_flags; + guint32 local_var_sig_tok, max_stack, code_size, init_locals; + int hsize; + + g_assert (format == METHOD_HEADER_FAT_FORMAT); + fat_flags = read16 (ptr); + ptr += 2; + hsize = (fat_flags >> 12) & 0xf; + max_stack = read16 (ptr); + ptr += 2; + code_size = read32 (ptr); + ptr += 4; + local_var_sig_tok = read32 (ptr); + ptr += 4; + + if (fat_flags & METHOD_HEADER_INIT_LOCALS) + init_locals = 1; + else + init_locals = 0; + + fprintf(output, "\t.locals /*%08x*/ %s(\n", + local_var_sig_tok, init_locals ? "init " : ""); + } else + fprintf(output, "\t.locals %s(\n", mh->init_locals ? "init " : ""); + for (i=0; i < mh->num_locals; ++i) { char * desc; if (i) @@ -394,17 +604,23 @@ dis_locals (MonoImage *m, MonoMethodHeader *mh) } static void -dis_code (MonoImage *m, guint32 rva) +dis_code (MonoImage *m, guint32 token, 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; + gchar *override; guint32 entry_point; if (rva == 0) return; + override = get_method_override (m, token); + if (override) { + fprintf (output, "\t.override %s\n", override); + g_free (override); + } + mh = mono_metadata_parse_mh (m, ptr); if ((entry_point = mono_image_get_entry_point (m))){ loc = mono_metadata_locate_token (m, entry_point); @@ -415,7 +631,7 @@ dis_code (MonoImage *m, guint32 rva) fprintf (output, "\t// Code size %d (0x%x)\n", mh->code_size, mh->code_size); fprintf (output, "\t.maxstack %d\n", mh->max_stack); if (mh->num_locals) - dis_locals (m, mh); + dis_locals (m, mh, ptr); dissasemble_cil (m, mh); /* @@ -462,10 +678,10 @@ pinvoke_info (MonoImage *m, guint32 mindex) } static void -cattrs_for_method (MonoImage *m, guint32 midx, MonoMethodSignature *sig) { +dump_cattrs_for_method_params (MonoImage *m, guint32 midx, MonoMethodSignature *sig) { MonoTableInfo *methodt; MonoTableInfo *paramt; - guint param_index, lastp, i, pid; + guint param_index, lastp, i; methodt = &m->tables [MONO_TABLE_METHOD]; paramt = &m->tables [MONO_TABLE_PARAM]; @@ -475,9 +691,32 @@ cattrs_for_method (MonoImage *m, guint32 midx, MonoMethodSignature *sig) { else lastp = paramt->rows + 1; for (i = param_index; i < lastp; ++i) { - pid = mono_metadata_decode_row_col (paramt, i - 1, MONO_PARAM_SEQUENCE); - fprintf (output, "\t.param [%d]\n", pid); - dump_cattrs (m, MONO_TOKEN_PARAM_DEF | i, "\t"); + char *lit; + int crow; + guint32 param_cols [MONO_PARAM_SIZE]; + GList *list; + + list = dis_get_custom_attrs (m, MONO_TOKEN_PARAM_DEF | i); + + mono_metadata_decode_row (paramt, i-1, param_cols, MONO_PARAM_SIZE); + if (!(param_cols[MONO_PARAM_FLAGS] & PARAM_ATTRIBUTE_HAS_DEFAULT)) { + if(list != NULL) + fprintf (output, "\t.param [%d]\n", param_cols[MONO_PARAM_SEQUENCE]); + } else { + fprintf (output, "\t.param [%d] = ", param_cols[MONO_PARAM_SEQUENCE]); + + if ((crow = mono_metadata_get_constant_index(m, MONO_TOKEN_PARAM_DEF | i, 0))) { + guint32 const_cols [MONO_CONSTANT_SIZE]; + mono_metadata_decode_row( &m->tables[MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE); + lit = get_constant(m, const_cols [MONO_CONSTANT_TYPE], const_cols [MONO_CONSTANT_VALUE]); + } + else { + lit = g_strdup ("not found"); + } + fprintf(output, "%s\n", lit); + g_free(lit); + } + dump_cattrs_list (list, "\t"); } } @@ -507,7 +746,10 @@ dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 en char *flags, *impl_flags; const char *sig; char *sig_str; - + guint32 token; + + if (!should_include_method (i + 1)) + continue; mono_metadata_decode_row (t, i, cols, MONO_METHOD_SIZE); flags = method_flags (cols [MONO_METHOD_FLAGS]); @@ -521,20 +763,31 @@ dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 en fprintf (output, " // method line %d\n", i + 1); fprintf (output, " .method %s", flags); - if (cols [MONO_METHOD_FLAGS] & METHOD_ATTRIBUTE_PINVOKE_IMPL) - fprintf (output, "%s", pinvoke_info (m, i)); + if ((cols [MONO_METHOD_FLAGS] & METHOD_ATTRIBUTE_PINVOKE_IMPL) && (cols [MONO_METHOD_RVA] == 0)) { + gchar *pi = pinvoke_info (m, i); + if (pi) { + fprintf (output, "%s", pi); + g_free (pi); + } + } fprintf (output, "\n %s", sig_str); fprintf (output, " %s\n", impl_flags); g_free (flags); g_free (impl_flags); + + token = MONO_TOKEN_METHOD_DEF | (i + 1); fprintf (output, " {\n"); - dump_cattrs (m, MONO_TOKEN_METHOD_DEF | (i + 1), " "); - cattrs_for_method (m, i, ms); + dump_cattrs (m, token, " "); + dump_cattrs_for_method_params (m, i, ms); /* FIXME: need to sump also param custom attributes */ fprintf (output, " // Method begins at RVA 0x%x\n", cols [MONO_METHOD_RVA]); - dis_code (m, cols [MONO_METHOD_RVA]); + dump_declarative_security (m, OBJECT_TYPE_METHODDEF, i + 1, " "); + if (cols [MONO_METHOD_IMPLFLAGS] & METHOD_IMPL_ATTRIBUTE_NATIVE) + fprintf (output, " // Disassembly of native methods is not supported\n"); + else + dis_code (m, token, cols [MONO_METHOD_RVA]); fprintf (output, " } // end of method %s::%s\n\n", klass_name, sig_str); mono_metadata_free_method_signature (ms); g_free (sig_str); @@ -578,15 +831,15 @@ dis_property_methods (MonoImage *m, guint32 prop) const char *type[] = {NULL, ".set", ".get", NULL, ".other"}; start = mono_metadata_methods_from_property (m, prop, &end); - while (start < end) { + for (; start < end; ++start) { mono_metadata_decode_row (msemt, start, cols, MONO_METHOD_SEMA_SIZE); + if (!should_include_method (cols [MONO_METHOD_SEMA_METHOD])) + continue; sig = dis_stringify_method_signature (m, NULL, cols [MONO_METHOD_SEMA_METHOD], TRUE); fprintf (output, "\t\t%s %s\n", type [cols [MONO_METHOD_SEMA_SEMANTICS]], sig); g_free (sig); - ++start; } } - static char* dis_property_signature (MonoImage *m, guint32 prop_idx) { @@ -596,7 +849,7 @@ dis_property_signature (MonoImage *m, guint32 prop_idx) guint32 cols [MONO_PROPERTY_SIZE]; MonoType *type; MonoType *param; - char *blurb; + char *blurb, *qk; const char *name; int prop_flags; GString *res = g_string_new (""); @@ -617,7 +870,9 @@ dis_property_signature (MonoImage *m, guint32 prop_idx) g_string_append (res, "specialname "); if (prop_flags & 0x0400) g_string_append (res, "rtspecialname "); - g_string_sprintfa (res, "%s %s (", blurb, name); + qk = get_escaped_name (name); + g_string_sprintfa (res, "%s %s (", blurb, qk); + g_free (qk); g_free (blurb); mono_metadata_free_type (type); for (i = 0; i < pcount; i++) { @@ -656,17 +911,27 @@ static char* dis_event_signature (MonoImage *m, guint32 event_idx) { MonoTableInfo *et = &m->tables [MONO_TABLE_EVENT]; - const char *name; - char *type, *res; + char *type, *result, *esname; guint32 cols [MONO_EVENT_SIZE]; + int event_flags; + GString *res = g_string_new (""); mono_metadata_decode_row (et, event_idx, cols, MONO_EVENT_SIZE); - name = mono_metadata_string_heap (m, cols [MONO_EVENT_NAME]); + esname = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_EVENT_NAME])); type = get_typedef_or_ref (m, cols [MONO_EVENT_TYPE]); + event_flags = cols [MONO_EVENT_FLAGS]; + + if (event_flags & 0x0200) + g_string_append (res, "specialname "); + if (event_flags & 0x0400) + g_string_append (res, "rtspecialname "); + g_string_sprintfa (res, "%s %s", type, esname); - res = g_strdup_printf ("%s %s", type, name); g_free (type); - return res; + g_free (esname); + result = res->str; + g_string_free (res, FALSE); + return result; } static void @@ -676,11 +941,13 @@ dis_event_methods (MonoImage *m, guint32 event) MonoTableInfo *msemt = &m->tables [MONO_TABLE_METHODSEMANTICS]; guint32 cols [MONO_METHOD_SEMA_SIZE]; char *sig; - const char *type; + const char *type = ""; start = mono_metadata_methods_from_event (m, event, &end); - while (start < end) { + for (; start < end; ++start) { mono_metadata_decode_row (msemt, start, cols, MONO_METHOD_SEMA_SIZE); + if (!should_include_method (cols [MONO_METHOD_SEMA_METHOD])) + continue; sig = dis_stringify_method_signature (m, NULL, cols [MONO_METHOD_SEMA_METHOD], TRUE); switch (cols [MONO_METHOD_SEMA_SEMANTICS]) { case METHOD_SEMANTIC_OTHER: @@ -696,7 +963,6 @@ dis_event_methods (MonoImage *m, guint32 event) } fprintf (output, "\t\t%s %s\n", type, sig); g_free (sig); - ++start; } } @@ -795,9 +1061,9 @@ dis_generic_param_and_constraints (MonoImage *m, int table_type, guint32 typedef continue; if (found_count == 0) - fprintf (output, "<%s", mono_metadata_string_heap (m, cols [MONO_GENERICPARAM_NAME])); + fprintf (output, "<"); else - fprintf (output, ", %s", mono_metadata_string_heap (m, cols [MONO_GENERICPARAM_NAME])); + fprintf (output, ", "); for (cnst_ind = cnst_start; cnst_ind < ct->rows; cnst_ind++) { char *sig; @@ -807,12 +1073,13 @@ dis_generic_param_and_constraints (MonoImage *m, int table_type, guint32 typedef if (cnst_block == NULL) cnst_block = g_string_new (""); sig = get_typedef_or_ref (m, ccols [MONO_GENPARCONSTRAINT_CONSTRAINT]); - g_string_append_printf (cnst_block, " .constraint !%d is %s\n", - cols [MONO_GENERICPARAM_NUMBER], sig); + fprintf (output, "(%s) ", sig); g_free (sig); cnst_start = cnst_ind; } - + + fprintf (output, "%s", mono_metadata_string_heap (m, cols [MONO_GENERICPARAM_NAME])); + found_count++; } @@ -837,10 +1104,13 @@ dis_type (MonoImage *m, int n) guint32 cols [MONO_TYPEDEF_SIZE]; guint32 cols_next [MONO_TYPEDEF_SIZE]; const char *name, *nspace; + char *esname; guint32 packing_size, class_size; gboolean next_is_valid, last; guint32 nested; + if (!should_include_type (n + 1)) + return; mono_metadata_decode_row (t, n, cols, MONO_TYPEDEF_SIZE); if (t->rows > n + 1) { @@ -849,13 +1119,15 @@ dis_type (MonoImage *m, int n) } else next_is_valid = 0; + name = mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAME]); nspace = mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAMESPACE]); if (*nspace) fprintf (output, ".namespace %s\n{\n", nspace); - name = mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAME]); + esname = get_escaped_name (name); if ((cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_CLASS_SEMANTIC_MASK) == TYPE_ATTRIBUTE_CLASS){ - fprintf (output, " .class %s%s", typedef_flags (cols [MONO_TYPEDEF_FLAGS]), name); + fprintf (output, " .class %s%s", typedef_flags (cols [MONO_TYPEDEF_FLAGS]), esname); + cnst_block = dis_generic_param_and_constraints (m, MONO_TYPEORMETHOD_TYPE, n+1); fprintf (output, "\n"); if (cols [MONO_TYPEDEF_EXTENDS]) { @@ -863,9 +1135,14 @@ dis_type (MonoImage *m, int n) fprintf (output, " \textends %s\n", base); g_free (base); } - } else - fprintf (output, " .class interface %s%s\n", typedef_flags (cols [MONO_TYPEDEF_FLAGS]), name); - + } else { + fprintf (output, " .class interface %s%s", typedef_flags (cols [MONO_TYPEDEF_FLAGS]), esname); + + cnst_block = dis_generic_param_and_constraints (m, MONO_TYPEORMETHOD_TYPE, n+1); + fprintf (output, "\n"); + } + + g_free (esname); dis_interfaces (m, n + 1); fprintf (output, " {\n"); if (cnst_block) { @@ -873,6 +1150,7 @@ dis_type (MonoImage *m, int n) g_string_free (cnst_block, TRUE); } dump_cattrs (m, MONO_TOKEN_TYPE_DEF | (n + 1), " "); + dump_declarative_security (m, OBJECT_TYPE_TYPEDEF, (n + 1), " "); if (mono_metadata_packing_from_typedef (m, n + 1, &packing_size, &class_size)) { fprintf (output, " .pack %d\n", packing_size); @@ -910,7 +1188,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"); @@ -1008,7 +1286,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 */ @@ -1020,7 +1298,7 @@ dis_data (MonoImage *m) for (b = 0; b < size; ++b) { if (!(b % 16)) fprintf (output, "\n\t"); - fprintf (output, " %02x", rva [b] & 0xff); + fprintf (output, " %02X", rva [b] & 0xff); } fprintf (output, ") // size: %d\n", size); } @@ -1059,7 +1337,11 @@ struct { { "--propertymap", MONO_TABLE_PROPERTYMAP, dump_table_property_map }, { "--typedef", MONO_TABLE_TYPEDEF, dump_table_typedef }, { "--typeref", MONO_TABLE_TYPEREF, dump_table_typeref }, - { NULL, -1 } + { "--typespec", MONO_TABLE_TYPESPEC, dump_table_typespec }, + { "--implmap", MONO_TABLE_IMPLMAP, dump_table_implmap }, + { "--standalonesig", MONO_TABLE_STANDALONESIG, dump_table_standalonesig }, + { "--blob", 0, dump_stream_blob }, + { NULL, -1, } }; /** @@ -1083,6 +1365,8 @@ disassemble_file (const char *file) img = ass->image; + setup_filter (img); + if (dump_table != -1){ (*table_list [dump_table].dumper) (img); } else { @@ -1090,6 +1374,9 @@ disassemble_file (const char *file) dis_directive_assemblyref (img); dis_directive_assembly (img); + dis_directive_file (img); + dis_directive_module (img); + dis_directive_moduleref (img); dis_types (img); dis_data (img); } @@ -1097,10 +1384,188 @@ disassemble_file (const char *file) mono_image_close (img); } +typedef struct { + int size; + int count; + int *elems; +} TableFilter; + +typedef struct { + char *name; + char *guid; + TableFilter types; + TableFilter fields; + TableFilter methods; +} ImageFilter; + +static GList *filter_list = NULL; +static ImageFilter *cur_filter = NULL; + +static void +setup_filter (MonoImage *image) +{ + ImageFilter *ifilter; + GList *item; + const char *name = mono_image_get_name (image); + + for (item = filter_list; item; item = item->next) { + ifilter = item->data; + if (strcmp (ifilter->name, name) == 0) { + cur_filter = ifilter; + return; + } + } + cur_filter = NULL; +} + +static int +int_cmp (const void *e1, const void *e2) +{ + const int *i1 = e1; + const int *i2 = e2; + return *i1 - *i2; +} + +static gboolean +table_includes (TableFilter *tf, int idx) +{ + if (!tf->count) + return FALSE; + return bsearch (&idx, tf->elems, tf->count, sizeof (int), int_cmp) != NULL; +} + +static gboolean +should_include_type (int idx) +{ + if (!cur_filter) + return TRUE; + return table_includes (&cur_filter->types, idx); +} + +static gboolean +should_include_method (int idx) +{ + if (!cur_filter) + return TRUE; + return table_includes (&cur_filter->methods, idx); +} + +static gboolean +should_include_field (int idx) +{ + if (!cur_filter) + return TRUE; + return table_includes (&cur_filter->fields, idx); +} + +static ImageFilter* +add_filter (const char *name) +{ + ImageFilter *ifilter; + GList *item; + + for (item = filter_list; item; item = item->next) { + ifilter = item->data; + if (strcmp (ifilter->name, name) == 0) + return ifilter; + } + ifilter = g_new0 (ImageFilter, 1); + ifilter->name = g_strdup (name); + filter_list = g_list_prepend (filter_list, ifilter); + return ifilter; +} + +static void +add_item (TableFilter *tf, int val) +{ + if (tf->count >= tf->size) { + if (!tf->size) { + tf->size = 8; + tf->elems = g_malloc (sizeof (int) * tf->size); + } else { + tf->size *= 2; + tf->elems = g_realloc (tf->elems, sizeof (int) * tf->size); + } + } + tf->elems [tf->count++] = val; +} + +static void +sort_filter_elems (void) +{ + ImageFilter *ifilter; + GList *item; + + for (item = filter_list; item; item = item->next) { + ifilter = item->data; + qsort (ifilter->types.elems, ifilter->types.count, sizeof (int), int_cmp); + qsort (ifilter->fields.elems, ifilter->fields.count, sizeof (int), int_cmp); + qsort (ifilter->methods.elems, ifilter->methods.count, sizeof (int), int_cmp); + } +} + +static void +load_filter (const char* filename) +{ + FILE *file; + char buf [1024]; + char *p, *s, *endptr; + int line = 0; + ImageFilter *ifilter = NULL; + int value = 0; + + if (!(file = fopen (filename, "r"))) { + g_print ("Cannot open filter file '%s'\n", filename); + exit (1); + } + while (fgets (buf, sizeof (buf), file) != NULL) { + ++line; + s = buf; + while (*s && g_ascii_isspace (*s)) ++s; + switch (*s) { + case 0: + case '#': + break; + case '[': + p = strchr (s, ']'); + if (!p) + g_error ("No matching ']' in filter at line %d\n", line); + *p = 0; + ifilter = add_filter (s + 1); + break; + case 'T': + if (!ifilter) + g_error ("Invalid format in filter at line %d\n", line); + if ((s [1] != ':') || !(value = strtol (s + 2, &endptr, 0)) || (endptr == s + 2)) + g_error ("Invalid type number in filter at line %d\n", line); + add_item (&ifilter->types, value); + break; + case 'M': + if (!ifilter) + g_error ("Invalid format in filter at line %d\n", line); + if ((s [1] != ':') || !(value = strtol (s + 2, &endptr, 0)) || (endptr == s + 2)) + g_error ("Invalid method number in filter at line %d\n", line); + add_item (&ifilter->methods, value); + break; + case 'F': + if (!ifilter) + g_error ("Invalid format in filter at line %d\n", line); + if ((s [1] != ':') || !(value = strtol (s + 2, &endptr, 0)) || (endptr == s + 2)) + g_error ("Invalid field number in filter at line %d\n", line); + add_item (&ifilter->fields, value); + break; + default: + g_error ("Invalid format in filter at line %d\n", line); + } + } + fclose (file); + sort_filter_elems (); +} + static void usage (void) { - GString *args = g_string_new ("[--output=filename] [--help] [--mscorlib]\n"); + GString *args = g_string_new ("[--output=filename] [--filter=filename] [--help] [--mscorlib]\n"); int i; for (i = 0; table_list [i].name != NULL; i++){ @@ -1122,6 +1587,7 @@ main (int argc, char *argv []) int i, j; output = stdout; + init_key_table (); for (i = 1; i < argc; i++){ if (argv [i][0] == '-'){ if (argv [i][1] == 'h') @@ -1131,6 +1597,12 @@ main (int argc, char *argv []) else if (strcmp (argv [i], "--mscorlib") == 0) { substitute_with_mscorlib_p = TRUE; continue; + } else if (strcmp (argv [i], "--show-method-tokens") == 0) { + show_method_tokens = TRUE; + continue; + } else if (strcmp (argv [i], "--show-tokens") == 0) { + show_tokens = TRUE; + continue; } else if (strncmp (argv [i], "--output=", 9) == 0) { output = fopen (argv [i]+9, "w"); if (output == NULL) { @@ -1139,6 +1611,9 @@ main (int argc, char *argv []) exit (1); } continue; + } else if (strncmp (argv [i], "--filter=", 9) == 0) { + load_filter (argv [i]+9); + continue; } else if (strcmp (argv [i], "--help") == 0) usage (); for (j = 0; table_list [j].name != NULL; j++) { @@ -1153,11 +1628,21 @@ main (int argc, char *argv []) if (input_files == NULL) usage (); - - mono_init (argv [0]); - for (l = input_files; l; l = l->next) - disassemble_file (l->data); + /* + * If we just have one file, use the corlib version it requires. + */ + if (!input_files->next) { + char *filename = input_files->data; + + mono_init_from_assembly (argv [0], filename); + disassemble_file (filename); + } else { + mono_init (argv [0]); + + for (l = input_files; l; l = l->next) + disassemble_file (l->data); + } return 0; }