X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2Fmain.c;h=13583f14cb1c0f52539489eadc827deef8a07451;hb=19460c4ca7c710bf80a7121c76e5b5ef8fc48c8c;hp=1244b8ce5889e10acfd14d59844cff5c0abbcb80;hpb=dcecb3ce3d742567b1969fa6bf04ee8e8b30906f;p=mono.git diff --git a/mono/dis/main.c b/mono/dis/main.c index 1244b8ce588..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 */ @@ -68,6 +73,77 @@ dump_cattrs (MonoImage *m, guint32 token, const char *indent) 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) { @@ -82,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", @@ -111,17 +188,32 @@ 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); } } @@ -281,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]); @@ -326,7 +420,7 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end) } static dis_map_t method_access_map [] = { - { METHOD_ATTRIBUTE_COMPILER_CONTROLLED, "compilercontrolled " }, + { METHOD_ATTRIBUTE_COMPILER_CONTROLLED, "privatescope " }, { METHOD_ATTRIBUTE_PRIVATE, "private " }, { METHOD_ATTRIBUTE_FAM_AND_ASSEM, "famandassem " }, { METHOD_ATTRIBUTE_ASSEM, "assembly " }, @@ -346,7 +440,8 @@ static dis_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 } @@ -376,6 +471,10 @@ method_flags (guint32 f) 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 } }; @@ -518,7 +617,7 @@ dis_code (MonoImage *m, guint32 token, guint32 rva) override = get_method_override (m, token); if (override) { - fprintf (output, "\t.override method %s\n", override); + fprintf (output, "\t.override %s\n", override); g_free (override); } @@ -648,7 +747,9 @@ dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 en 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]); @@ -682,6 +783,7 @@ dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 en 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]); + 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 @@ -729,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) { @@ -747,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 (""); @@ -768,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++) { @@ -840,8 +944,10 @@ dis_event_methods (MonoImage *m, guint32 event) 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: @@ -857,7 +963,6 @@ dis_event_methods (MonoImage *m, guint32 event) } fprintf (output, "\t\t%s %s\n", type, sig); g_free (sig); - ++start; } } @@ -1004,6 +1109,8 @@ dis_type (MonoImage *m, int n) 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) { @@ -1043,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); @@ -1257,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 { @@ -1274,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++){ @@ -1323,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++) { @@ -1337,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; }