#include "dump.h"
#include "get.h"
#include "dis-cil.h"
+#include "declsec.h"
#include <mono/metadata/class-internals.h>
#include <mono/metadata/object-internals.h>
#include <mono/metadata/loader.h>
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);
+ char *dump;
+ if (blob [0] == MONO_DECLSEC_FORMAT_20) {
+ /* 2.0 declarative security format */
+ dump = dump_declsec_entry20 (m, blob, indent);
+ fprintf (output, "%s.permissionset %s = %s\n", indent, action, dump);
+ } else {
+ /* 1.x declarative security metadata format */
+ dump = data_dump (blob, len, indent);
+ fprintf (output, "%s.permissionset %s = %s", indent, action, dump);
+ }
g_free (dump);
}
}
}
+static char *
+assembly_flags (guint32 f)
+{
+ if (f & ASSEMBLYREF_RETARGETABLE_FLAG)
+ return g_strdup ("retargetable ");
+ return g_strdup ("");
+}
+
static void
dis_directive_assembly (MonoImage *m)
{
MonoTableInfo *t = &m->tables [MONO_TABLE_ASSEMBLY];
guint32 cols [MONO_ASSEMBLY_SIZE];
+ char *flags;
if (t->base == NULL)
return;
mono_metadata_decode_row (t, 0, cols, MONO_ASSEMBLY_SIZE);
+ flags = assembly_flags (cols [MONO_ASSEMBLY_FLAGS]);
- fprintf (output, ".assembly '%s'\n{\n",
- mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_NAME]));
+ fprintf (output, ".assembly %s'%s'\n{\n",
+ flags, 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,
cols [MONO_ASSEMBLY_HASH_ALG],
cols [MONO_ASSEMBLY_MAJOR_VERSION], cols [MONO_ASSEMBLY_MINOR_VERSION],
cols [MONO_ASSEMBLY_BUILD_NUMBER], cols [MONO_ASSEMBLY_REV_NUMBER]);
- if (cols [MONO_ASSEMBLY_CULTURE])
- fprintf (output, " .locale %s\n", mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_CULTURE]));
- if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) {
+ if (cols [MONO_ASSEMBLY_CULTURE]){
+ const char *locale = mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_CULTURE]);
+ glong items_read, items_written;
+ gunichar2 *render = g_utf8_to_utf16 (locale, strlen (locale), &items_read, &items_written, NULL);
+ char *dump = data_dump ((const char *) render, items_written * sizeof (gunichar2), "\t\t");
+ fprintf (output, " .locale %s\n", dump);
+ g_free (dump);
+ g_free (render);
+
+ } if (cols [MONO_ASSEMBLY_PUBLIC_KEY]) {
const char* b = mono_metadata_blob_heap (m, cols [MONO_ASSEMBLY_PUBLIC_KEY]);
int len = mono_metadata_decode_blob_size (b, &b);
char *dump = data_dump (b, len, "\t\t");
g_free (dump);
}
fprintf (output, "}\n");
+
+ g_free (flags);
}
static void
return;
for (i = 0; i < t->rows; i++){
- char *esc;
+ char *esc, *flags;
mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE);
esc = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_NAME]));
+ flags = assembly_flags (cols [MONO_ASSEMBLYREF_FLAGS]);
fprintf (output,
- ".assembly extern %s\n"
+ ".assembly extern %s%s\n"
"{\n"
" .ver %d:%d:%d:%d\n",
+ flags,
esc,
cols [MONO_ASSEMBLYREF_MAJOR_VERSION], cols [MONO_ASSEMBLYREF_MINOR_VERSION],
cols [MONO_ASSEMBLYREF_BUILD_NUMBER], cols [MONO_ASSEMBLYREF_REV_NUMBER]
g_free (dump);
}
fprintf (output, "}\n");
+ g_free (flags);
g_free (esc);
}
}
if (flags & TYPE_ATTRIBUTE_SEALED)
strcat (buffer, "sealed ");
if (flags & TYPE_ATTRIBUTE_SPECIAL_NAME)
- strcat (buffer, "special-name ");
+ strcat (buffer, "specialname ");
if (flags & TYPE_ATTRIBUTE_IMPORT)
strcat (buffer, "import ");
if (flags & TYPE_ATTRIBUTE_SERIALIZABLE)
strcat (buffer, "serializable ");
if (flags & TYPE_ATTRIBUTE_BEFORE_FIELD_INIT)
strcat (buffer, "beforefieldinit ");
+ if (flags & TYPE_ATTRIBUTE_FORWARDER)
+ strcat (buffer, "forwarder ");
return buffer;
}
* This routine displays all the decoded fields from @start to @end
*/
static void
-dis_field_list (MonoImage *m, guint32 start, guint32 end, MonoGenericContext *context)
+dis_field_list (MonoImage *m, guint32 start, guint32 end, MonoGenericContainer *container)
{
MonoTableInfo *t = &m->tables [MONO_TABLE_FIELD];
guint32 cols [MONO_FIELD_SIZE];
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], context);
+ sig = get_field_signature (m, cols [MONO_FIELD_SIGNATURE], container);
flags = field_flags (cols [MONO_FIELD_FLAGS]);
if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_HAS_FIELD_MARSHAL) {
}
static void
-dis_code (MonoImage *m, guint32 token, guint32 rva, MonoGenericContext *context)
+dis_code (MonoImage *m, guint32 token, guint32 rva, MonoGenericContainer *container)
{
MonoMethodHeader *mh;
const char *ptr = mono_image_rva_map (m, rva);
if (rva == 0)
return;
- override = get_method_override (m, token, context);
+ override = get_method_override (m, token, container);
if (override) {
fprintf (output, "\t.override %s\n", override);
g_free (override);
}
- mh = mono_metadata_parse_mh_full (m, context, ptr);
- if ((entry_point = mono_image_get_entry_point (m))){
+ mh = mono_metadata_parse_mh_full (m, container, ptr);
+ if ((entry_point = mono_image_get_entry_point (m)) && mono_metadata_token_index (entry_point)){
loc = mono_metadata_locate_token (m, entry_point);
if (rva == read32 (loc))
fprintf (output, "\t.entrypoint\n");
fprintf (output, "\t.maxstack %d\n", mh->max_stack);
if (mh->num_locals)
dis_locals (m, mh, ptr);
- dissasemble_cil (m, mh, context);
+ disassemble_cil (m, mh, container);
/*
hex_dump (mh->code, 0, mh->code_size);
return NULL;
}
+/*
+ * dump_cattrs_for_type_params
+ *
+ * @m:
+ * @token: TypeOrMethodDef token, owner for GenericParam
+ *
+ * Dumps the custom attributes for @token's type parameters
+ */
+static void
+dump_cattrs_for_type_params (MonoImage *m, guint32 token, const char *indent)
+{
+ MonoTableInfo *tdef = &m->tables [MONO_TABLE_GENERICPARAM];
+ guint32 cols [MONO_GENERICPARAM_SIZE];
+ guint32 owner = 0, i;
+ GList *list = NULL;
+
+ if (! (i = mono_metadata_get_generic_param_row (m, token, &owner)))
+ return;
+
+ mono_metadata_decode_row (tdef, i - 1, cols, MONO_GENERICPARAM_SIZE);
+ do {
+ list = dis_get_custom_attrs (m, mono_metadata_make_token (MONO_TABLE_GENERICPARAM, i));
+ if (list) {
+ fprintf (output, "%s.param type %s\n", indent, mono_metadata_string_heap (m, cols [MONO_GENERICPARAM_NAME]));
+ dump_cattrs_list (list, indent);
+ }
+
+ if (++i > tdef->rows)
+ break;
+ mono_metadata_decode_row (tdef, i - 1, cols, MONO_GENERICPARAM_SIZE);
+ } while (cols [MONO_GENERICPARAM_OWNER] == owner);
+}
+
static void
dump_cattrs_for_method_params (MonoImage *m, guint32 midx, MonoMethodSignature *sig) {
MonoTableInfo *methodt;
* This routine displays the methods in the Method Table from @start to @end
*/
static void
-dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 end, MonoGenericContext *context)
+dis_method_list (const char *klass_name, MonoImage *m, guint32 start, guint32 end, MonoGenericContainer *type_container)
{
MonoTableInfo *t = &m->tables [MONO_TABLE_METHOD];
guint32 cols [MONO_METHOD_SIZE];
for (i = start; i < end; i++){
MonoMethodSignature *ms;
MonoGenericContainer *container;
- MonoGenericContext *method_context = context;
char *flags, *impl_flags;
- const char *sig;
+ const char *sig, *method_name;
char *sig_str;
guint32 token;
sig = mono_metadata_blob_heap (m, cols [MONO_METHOD_SIGNATURE]);
mono_metadata_decode_blob_size (sig, &sig);
- container = mono_metadata_load_generic_params (
- m, MONO_TOKEN_METHOD_DEF | (i + 1), context ? context->container : NULL);
+ container = mono_metadata_load_generic_params (m, MONO_TOKEN_METHOD_DEF | (i + 1), type_container);
if (container)
- method_context = (MonoGenericContext *) container;
+ mono_metadata_load_generic_param_constraints (m, MONO_TOKEN_METHOD_DEF | (i + 1), container);
+ else
+ container = type_container;
- ms = mono_metadata_parse_method_signature_full (m, method_context ? method_context->container : NULL, i + 1, sig, &sig);
- sig_str = dis_stringify_method_signature (m, ms, i + 1, method_context, FALSE);
+ ms = mono_metadata_parse_method_signature_full (m, container, i + 1, sig, &sig);
+ sig_str = dis_stringify_method_signature (m, ms, i + 1, container, FALSE);
+ method_name = mono_metadata_string_heap (m, cols [MONO_METHOD_NAME]);
fprintf (output, " // method line %d\n", i + 1);
fprintf (output, " .method %s", flags);
fprintf (output, " {\n");
dump_cattrs (m, token, " ");
+ dump_cattrs_for_type_params (m, MONO_TOKEN_METHOD_DEF | (i + 1), " ");
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
- dis_code (m, token, cols [MONO_METHOD_RVA], method_context);
- fprintf (output, " } // end of method %s::%s\n\n", klass_name, sig_str);
+ dis_code (m, token, cols [MONO_METHOD_RVA], container);
+ if (klass_name)
+ fprintf (output, " } // end of method %s::%s\n\n", klass_name, method_name);
+ else
+ fprintf (output, " } // end of global method %s\n\n", method_name);
mono_metadata_free_method_signature (ms);
g_free (sig_str);
}
}
static void
-dis_property_methods (MonoImage *m, guint32 prop, MonoGenericContext *context)
+dis_property_methods (MonoImage *m, guint32 prop, MonoGenericContainer *container)
{
guint start, end;
MonoTableInfo *msemt = &m->tables [MONO_TABLE_METHODSEMANTICS];
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], context, TRUE);
+ sig = dis_stringify_method_signature_full (m, NULL, cols [MONO_METHOD_SEMA_METHOD], container, TRUE, FALSE);
fprintf (output, "\t\t%s %s\n", type [cols [MONO_METHOD_SEMA_SEMANTICS]], sig);
g_free (sig);
}
}
static char*
-dis_property_signature (MonoImage *m, guint32 prop_idx, MonoGenericContext *context)
+dis_property_signature (MonoImage *m, guint32 prop_idx, MonoGenericContainer *container)
{
MonoTableInfo *propt = &m->tables [MONO_TABLE_PROPERTY];
const char *ptr;
prop_flags = cols [MONO_PROPERTY_FLAGS];
ptr = mono_metadata_blob_heap (m, cols [MONO_PROPERTY_TYPE]);
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);
+ if (!(*ptr & 0x08))
+ g_warning("incorrect signature in property blob: 0x%x", *ptr);
+ if (*ptr & 0x20)
+ g_string_append (res, "instance ");
ptr++;
pcount = mono_metadata_decode_value (ptr, &ptr);
- type = mono_metadata_parse_type_full (m, context, MONO_PARSE_TYPE, 0, ptr, &ptr);
+ type = mono_metadata_parse_type_full (m, container, MONO_PARSE_TYPE, 0, ptr, &ptr);
blurb = dis_stringify_type (m, type, TRUE);
if (prop_flags & 0x0200)
g_string_append (res, "specialname ");
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++) {
if (i)
g_string_append (res, ", ");
- param = mono_metadata_parse_type_full (m, context, MONO_PARSE_PARAM, 0, ptr, &ptr);
+ param = mono_metadata_parse_type_full (m, container, MONO_PARSE_PARAM, 0, ptr, &ptr);
blurb = dis_stringify_param (m, param);
g_string_append (res, blurb);
- mono_metadata_free_type (param);
g_free (blurb);
}
g_string_append_c (res, ')');
}
static void
-dis_property_list (MonoImage *m, guint32 typedef_row, MonoGenericContext *context)
+dis_property_list (MonoImage *m, guint32 typedef_row, MonoGenericContainer *container)
{
guint start, end, i;
start = mono_metadata_properties_from_typedef (m, typedef_row, &end);
for (i = start; i < end; ++i) {
- char *sig = dis_property_signature (m, i, context);
+ char *sig = dis_property_signature (m, i, container);
fprintf (output, "\t.property %s\n\t{\n", sig);
dump_cattrs (m, MONO_TOKEN_PROPERTY | (i + 1), "\t\t");
- dis_property_methods (m, i, context);
+ dis_property_methods (m, i, container);
fprintf (output, "\t}\n");
g_free (sig);
}
}
static char*
-dis_event_signature (MonoImage *m, guint32 event_idx, MonoGenericContext *context)
+dis_event_signature (MonoImage *m, guint32 event_idx, MonoGenericContainer *container)
{
MonoTableInfo *et = &m->tables [MONO_TABLE_EVENT];
char *type, *result, *esname;
mono_metadata_decode_row (et, event_idx, cols, MONO_EVENT_SIZE);
esname = get_escaped_name (mono_metadata_string_heap (m, cols [MONO_EVENT_NAME]));
- type = get_typedef_or_ref (m, cols [MONO_EVENT_TYPE], context);
+ type = get_typedef_or_ref (m, cols [MONO_EVENT_TYPE], container);
event_flags = cols [MONO_EVENT_FLAGS];
if (event_flags & 0x0200)
}
static void
-dis_event_methods (MonoImage *m, guint32 event, MonoGenericContext *context)
+dis_event_methods (MonoImage *m, guint32 event, MonoGenericContainer *container)
{
guint start, end;
MonoTableInfo *msemt = &m->tables [MONO_TABLE_METHODSEMANTICS];
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], context, TRUE);
+ sig = dis_stringify_method_signature_full (m, NULL, cols [MONO_METHOD_SEMA_METHOD], container, TRUE, FALSE);
switch (cols [MONO_METHOD_SEMA_SEMANTICS]) {
case METHOD_SEMANTIC_OTHER:
type = ".other"; break;
}
static void
-dis_event_list (MonoImage *m, guint32 typedef_row, MonoGenericContext *context)
+dis_event_list (MonoImage *m, guint32 typedef_row, MonoGenericContainer *container)
{
guint start, end, i;
start = mono_metadata_events_from_typedef (m, typedef_row, &end);
for (i = start; i < end; ++i) {
- char *sig = dis_event_signature (m, i, context);
+ char *sig = dis_event_signature (m, i, container);
fprintf (output, "\t.event %s\n\t{\n", sig);
dump_cattrs (m, MONO_TOKEN_EVENT | (i + 1), "\t\t");
- dis_event_methods (m, i, context);
+ dis_event_methods (m, i, container);
fprintf (output, "\t}\n");
g_free (sig);
}
}
static void
-dis_interfaces (MonoImage *m, guint32 typedef_row, MonoGenericContext *context)
+dis_interfaces (MonoImage *m, guint32 typedef_row, MonoGenericContainer *container)
{
plocator_t loc;
guint start;
mono_metadata_decode_row (table, start, cols, MONO_INTERFACEIMPL_SIZE);
if (cols [MONO_INTERFACEIMPL_CLASS] != loc.idx)
break;
- intf = get_typedef_or_ref (m, cols [MONO_INTERFACEIMPL_INTERFACE], context);
+ intf = get_typedef_or_ref (m, cols [MONO_INTERFACEIMPL_INTERFACE], container);
if (first_interface) {
fprintf (output, " \timplements %s", intf);
first_interface = 0;
fprintf (output, ".namespace %s\n{\n", nspace);
container = mono_metadata_load_generic_params (m, MONO_TOKEN_TYPE_DEF | (n + 1), NULL);
+ if (container)
+ mono_metadata_load_generic_param_constraints (m, MONO_TOKEN_TYPE_DEF | (n + 1), container);
esname = get_escaped_name (name);
if ((cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_CLASS_SEMANTIC_MASK) == TYPE_ATTRIBUTE_CLASS){
}
fprintf (output, "\n");
if (cols [MONO_TYPEDEF_EXTENDS]) {
- char *base = get_typedef_or_ref (
- m, cols [MONO_TYPEDEF_EXTENDS], (MonoGenericContext *) container);
+ char *base = get_typedef_or_ref (m, cols [MONO_TYPEDEF_EXTENDS], container);
fprintf (output, " \textends %s\n", base);
g_free (base);
}
}
g_free (esname);
- dis_interfaces (m, n + 1, (MonoGenericContext *) container);
+ dis_interfaces (m, n + 1, container);
fprintf (output, " {\n");
if (!forward) {
dump_cattrs (m, MONO_TOKEN_TYPE_DEF | (n + 1), " ");
+ dump_cattrs_for_type_params (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)) {
last = m->tables [MONO_TABLE_FIELD].rows;
if (cols [MONO_TYPEDEF_FIELD_LIST] && cols [MONO_TYPEDEF_FIELD_LIST] <= m->tables [MONO_TABLE_FIELD].rows)
- dis_field_list (m, cols [MONO_TYPEDEF_FIELD_LIST] - 1, last, (MonoGenericContext *) container);
+ dis_field_list (m, cols [MONO_TYPEDEF_FIELD_LIST] - 1, last, container);
fprintf (output, "\n");
if (next_is_valid)
last = m->tables [MONO_TABLE_METHOD].rows;
if (cols [MONO_TYPEDEF_METHOD_LIST] && cols [MONO_TYPEDEF_METHOD_LIST] <= m->tables [MONO_TABLE_METHOD].rows)
- dis_method_list (name, m, cols [MONO_TYPEDEF_METHOD_LIST] - 1, last, (MonoGenericContext *) container);
+ dis_method_list (name, m, cols [MONO_TYPEDEF_METHOD_LIST] - 1, last, container);
- dis_property_list (m, n, (MonoGenericContext *) container);
- dis_event_list (m, n, (MonoGenericContext *) container);
+ dis_property_list (m, n, container);
+ dis_event_list (m, n, container);
}
t = &m->tables [MONO_TABLE_NESTEDCLASS];
guint32 cols [MONO_TYPEDEF_SIZE];
guint32 cols_next [MONO_TYPEDEF_SIZE];
gboolean next_is_valid, last;
- gchar *name;
-
- name = g_strdup ("<Module>");
mono_metadata_decode_row (t, 0, cols, MONO_TYPEDEF_SIZE);
last = m->tables [MONO_TABLE_METHOD].rows;
if (cols [MONO_TYPEDEF_METHOD_LIST] && cols [MONO_TYPEDEF_METHOD_LIST] <= m->tables [MONO_TABLE_METHOD].rows)
- dis_method_list (name, m, cols [MONO_TYPEDEF_METHOD_LIST] - 1, last, NULL);
+ dis_method_list (NULL, m, cols [MONO_TYPEDEF_METHOD_LIST] - 1, last, NULL);
}
}
}
+static const char *
+get_uninitialized_data_type (guint32 size)
+{
+ switch (size) {
+ case 1:
+ return "int8";
+ case 2:
+ return "int16";
+ case 4:
+ return "int32";
+ case 8:
+ return "int64";
+ default:
+ g_error ("get_uninitialized_data_type for size: %d\n", size);
+ }
+}
+
/**
* dis_data:
* @m: metadata context
MonoTableInfo *ft = &m->tables [MONO_TABLE_FIELD];
int i, b;
const char *rva, *sig;
- guint32 align, size;
+ guint32 size;
+ gint align;
guint32 cols [MONO_FIELD_RVA_SIZE];
MonoType *type;
type = mono_metadata_parse_field_type (m, 0, sig + 1, &sig);
mono_class_init (mono_class_from_mono_type (type));
size = mono_type_size (type, &align);
- fprintf (output, ".data D_%08x = bytearray (", cols [MONO_FIELD_RVA_RVA]);
- for (b = 0; b < size; ++b) {
- if (!(b % 16))
- fprintf (output, "\n\t");
- fprintf (output, " %02X", rva [b] & 0xff);
- }
- fprintf (output, ") // size: %d\n", size);
+
+ if (rva) {
+ fprintf (output, ".data D_%08x = bytearray (", cols [MONO_FIELD_RVA_RVA]);
+ for (b = 0; b < size; ++b) {
+ if (!(b % 16))
+ fprintf (output, "\n\t");
+ fprintf (output, " %02X", rva [b] & 0xff);
+ }
+ fprintf (output, ") // size: %d\n", size);
+ } else
+ fprintf (output, ".data D_%08x = %s [%d]\n",
+ cols [MONO_FIELD_RVA_RVA], get_uninitialized_data_type (size), size);
}
}
{ "--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 },
+ { "--methodptr", MONO_TABLE_METHOD_POINTER, dump_table_methodptr },
+ { "--fieldptr", MONO_TABLE_FIELD_POINTER, dump_table_fieldptr },
+ { "--paramptr", MONO_TABLE_PARAM_POINTER, dump_table_paramptr },
+ { "--eventptr", MONO_TABLE_EVENT_POINTER, dump_table_eventptr },
+ { "--propertyptr", MONO_TABLE_PROPERTY_POINTER, dump_table_propertyptr },
+ { "--blob", 0, dump_stream_blob },
+ { "--strings", 0, dump_stream_strings },
+ { "--userstrings", 0, dump_stream_us },
{ NULL, -1, }
};
static void
disassemble_file (const char *file)
{
- MonoAssembly *ass;
MonoImageOpenStatus status;
MonoImage *img;
- ass = mono_assembly_open (file, &status);
- if (ass == NULL){
+ img = mono_image_open (file, &status);
+ if (!img) {
fprintf (stderr, "Error while trying to process %s\n", file);
return;
+ } else {
+ mono_assembly_load_references (img, &status);
}
- img = ass->image;
-
setup_filter (img);
if (dump_table != -1){
return result;
}
+static GList *loaded_assemblies = NULL;
+
+static void
+monodis_assembly_load_hook (MonoAssembly *assembly, gpointer user_data)
+{
+ loaded_assemblies = g_list_prepend (loaded_assemblies, assembly);
+}
+
+static MonoAssembly *
+monodis_assembly_search_hook (MonoAssemblyName *aname, gpointer user_data)
+{
+ GList *tmp;
+
+ for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
+ MonoAssembly *ass = tmp->data;
+ if (mono_assembly_names_equal (aname, &ass->aname))
+ return ass;
+ }
+ return NULL;
+}
static void
usage (void)
}
g_string_append (args, "[--forward-decls]");
fprintf (stderr,
- "monodis -- Mono Common Intermediate Language Dissassembler\n"
+ "monodis -- Mono Common Intermediate Language Disassembler\n"
"Usage is: monodis %s file ..\n", args->str);
exit (1);
}
if (input_files == NULL)
usage ();
+ mono_install_assembly_load_hook (monodis_assembly_load_hook, NULL);
+ mono_install_assembly_search_hook (monodis_assembly_search_hook, NULL);
+
/*
* If we just have one file, use the corlib version it requires.
*/
projects / mono.git / blobdiff