X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2Fdump.c;h=ba2354d5fef582a649cad118d0d94c6fd252f265;hb=e698ebe6355598c0a4a52338dd5cacfce2a2d9d7;hp=37e2bc9c62519b8e8c0d204864fe47c5e3a1dbb0;hpb=9d61782c6e2392d7ceec2006b35be582598a70ae;p=mono.git

diff --git a/mono/dis/dump.c b/mono/dis/dump.c
index 37e2bc9c625..ba2354d5fef 100644
--- a/mono/dis/dump.c
+++ b/mono/dis/dump.c
@@ -142,6 +142,7 @@ dump_table_assemblyref (MonoImage *m)
 			 cols [MONO_ASSEMBLYREF_BUILD_NUMBER], 
 			 cols [MONO_ASSEMBLYREF_REV_NUMBER],
 			 mono_metadata_string_heap (m, cols [MONO_ASSEMBLYREF_NAME]));
+		fprintf (output, "\tFlags=0x%08x\n", cols [MONO_ASSEMBLYREF_FLAGS]);
 		ptr = mono_metadata_blob_heap (m, cols [MONO_ASSEMBLYREF_PUBLIC_KEY]);
 		len = mono_metadata_decode_value (ptr, &ptr);
 		if (len > 0){
@@ -538,7 +539,7 @@ dump_table_module (MonoImage *m)
 {
 	MonoTableInfo *t = &m->tables [MONO_TABLE_MODULE];
 	int i;
-	fprintf (output, "ModuleRef Table (1..%d)\n", t->rows);
+	fprintf (output, "Module Table (1..%d)\n", t->rows);
 
 	for (i = 0; i < t->rows; i++){
 		guint32 cols [MONO_MODULE_SIZE];
@@ -592,11 +593,11 @@ dump_table_method (MonoImage *m)
 		method_container = mono_metadata_load_generic_params (m, MONO_TOKEN_METHOD_DEF | i, type_container);
 		if (method_container)
 			mono_metadata_load_generic_param_constraints (m, MONO_TOKEN_METHOD_DEF | i, method_container);
-		mono_metadata_decode_row (t, i - 1, cols, MONO_METHOD_SIZE);
+		mono_metadata_decode_table_row (m, MONO_TABLE_METHOD, i - 1, cols, MONO_METHOD_SIZE);
 		sigblob = mono_metadata_blob_heap (m, cols [MONO_METHOD_SIGNATURE]);
 		mono_metadata_decode_blob_size (sigblob, &sigblob);
 		method = mono_metadata_parse_method_signature_full (m, method_container ? method_container : type_container, i, sigblob, &sigblob);
-		sig = dis_stringify_method_signature (m, method, i, (MonoGenericContext *) (method_container ? method_container : type_container), FALSE);
+		sig = dis_stringify_method_signature (m, method, i, method_container ? method_container : type_container, FALSE);
 		fprintf (output, "%d: %s (param: %d)\n", i, sig, cols [MONO_METHOD_PARAMLIST]);
 		g_free (sig);
 		mono_metadata_free_method_signature (method);
@@ -1208,6 +1209,38 @@ dump_stream_blob (MonoImage *m)
 	fprintf (output, "\n");
 }
 
+void
+dump_stream_strings (MonoImage *m)
+{
+	guint32 i;
+
+	fprintf (output, "Strings heap contents\n");
+
+	for (i = 0; i < m->heap_strings.size; ) {
+		const char *str = mono_metadata_string_heap (m, i);
+		fprintf (output, "%02x: \"%s\"\n", i, str);
+		i += strlen (str) + 1;
+	}
+}
+
+void
+dump_stream_us (MonoImage *m)
+{
+	guint32 i;
+
+	fprintf (output, "User Strings heap contents\n");
+
+	for (i = 0; i < m->heap_us.size; ) {
+		const char *us_ptr = mono_metadata_user_string (m, i);
+		int len = mono_metadata_decode_blob_size (us_ptr, (const char**)&us_ptr);
+
+		char *str = get_encoded_user_string_or_bytearray ((const guchar*)us_ptr, len);
+		fprintf (output, "%02x: %s\n", i, str);
+		g_free (str);
+		i += len + 1;
+	}
+}
+
 void
 dump_table_standalonesig (MonoImage *m)
 {
@@ -1234,3 +1267,49 @@ dump_table_standalonesig (MonoImage *m)
 		fprintf (output, "\n");
 	}
 }
+
+static void
+dump_table_ptr (MonoImage *m, int table, const char *name)
+{
+	MonoTableInfo *t = &m->tables [table];
+	guint32 cols [1];
+	int i;
+	
+	fprintf (output, "%s (1..%d)\n", name, t->rows);
+
+	for (i = 1; i <= t->rows; i++) {
+		mono_metadata_decode_row (t, i - 1, cols, 1);
+
+		fprintf (output, "%d: %d\n", i, cols [0]);
+	}
+}
+
+void
+dump_table_methodptr (MonoImage *m)
+{
+	dump_table_ptr (m, MONO_TABLE_METHOD_POINTER, "Method Ptr");
+}
+
+void
+dump_table_fieldptr (MonoImage *m)
+{
+	dump_table_ptr (m, MONO_TABLE_FIELD_POINTER, "Field Ptr");
+}
+
+void
+dump_table_paramptr (MonoImage *m)
+{
+	dump_table_ptr (m, MONO_TABLE_PARAM_POINTER, "Param Ptr");
+}
+
+void
+dump_table_eventptr (MonoImage *m)
+{
+	dump_table_ptr (m, MONO_TABLE_EVENT_POINTER, "Event Ptr");
+}
+
+void
+dump_table_propertyptr (MonoImage *m)
+{
+	dump_table_ptr (m, MONO_TABLE_PROPERTY_POINTER, "Property Ptr");
+}