X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fdwarfwriter.c;h=c9c3b120000d38480d243672922254dc0f66d6cf;hb=48992d4b3f8b568be17180372160d2f3e03b8ccb;hp=9f68a62683e94c6033c25e4995891bf282e2fb5d;hpb=b60bbdc365f66c0d9ce8e72eae129f2296ad9a14;p=mono.git

diff --git a/mono/mini/dwarfwriter.c b/mono/mini/dwarfwriter.c
index 9f68a62683e..c9c3b120000 100644
--- a/mono/mini/dwarfwriter.c
+++ b/mono/mini/dwarfwriter.c
@@ -30,6 +30,9 @@
 
 #include <mono/utils/freebsd-dwarf.h>
 
+#define DW_AT_MIPS_linkage_name 0x2007
+#define DW_LNE_set_prologue_end 0x0a
+
 typedef struct {
 	MonoMethod *method;
 	char *start_symbol, *end_symbol;
@@ -455,6 +458,9 @@ static int compile_unit_attr [] = {
 
 static int subprogram_attr [] = {
 	DW_AT_name         , DW_FORM_string,
+	DW_AT_MIPS_linkage_name, DW_FORM_string,
+	DW_AT_decl_file    , DW_FORM_udata,
+	DW_AT_decl_line    , DW_FORM_udata,
 #ifndef TARGET_IOS
 	DW_AT_description  , DW_FORM_string,
 #endif
@@ -1376,6 +1382,7 @@ static const guint8 *token_handler_ip;
 static char*
 token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
 {
+	MonoError error;
 	char *res, *desc;
 	MonoMethod *cmethod;
 	MonoClass *klass;
@@ -1389,10 +1396,12 @@ token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
 	case CEE_ISINST:
 	case CEE_CASTCLASS:
 	case CEE_LDELEMA:
-		if (method->wrapper_type)
+		if (method->wrapper_type) {
 			klass = data;
-		else
-			klass = mono_class_get_full (method->klass->image, token, NULL);
+		} else {
+			klass = mono_class_get_checked (method->klass->image, token, &error);
+			g_assert (mono_error_ok (&error)); /* FIXME error handling */
+		}
 		res = g_strdup_printf ("<%s>", klass->name);
 		break;
 	case CEE_NEWOBJ:
@@ -1419,10 +1428,12 @@ token_handler (MonoDisHelper *dh, MonoMethod *method, guint32 token)
 	case CEE_LDSFLD:
 	case CEE_STFLD:
 	case CEE_STSFLD:
-		if (method->wrapper_type)
+		if (method->wrapper_type) {
 			field = data;
-		else
-			field = mono_field_from_token (method->klass->image, token, &klass, NULL);
+		} else {
+			field = mono_field_from_token_checked (method->klass->image, token, &klass, NULL,  &error);
+			g_assert (mono_error_ok (&error)); /* FIXME error handling */
+		}
 		desc = mono_field_full_name (field);
 		res = g_strdup_printf ("<%s>", desc);
 		g_free (desc);
@@ -1661,14 +1672,6 @@ emit_line_number_info (MonoDwarfWriter *w, MonoMethod *method,
 				emit_pointer_unaligned (w, start_symbol);
 			else
 				emit_pointer_value (w, code);
-
-			/* 
-			 * The prolog+initlocals region does not have a line number, this
-			 * makes them belong to the first line of the method.
-			 */
-			emit_byte (w, DW_LNS_advance_line);
-			//printf ("FIRST: %d %d %d\n", prev_line, loc->row, il_offset);
-			emit_sleb128 (w, (gint32)loc->row - (gint32)prev_line);
 			first = FALSE;
 		}
 
@@ -1692,7 +1695,10 @@ emit_line_number_info (MonoDwarfWriter *w, MonoMethod *method,
 			}
 		}
 
-		if (loc->row != prev_line && !first) {
+		if (loc->row != prev_line) {
+			if (prev_native_offset == 0)
+				emit_byte (w, DW_LNE_set_prologue_end);
+
 			//printf ("X: %p(+0x%x) %d %s:%d(+%d)\n", code + i, addr_diff, loc->il_offset, loc->source_file, loc->row, line_diff);
 			emit_advance_op (w, line_diff, addr_diff);
 
@@ -1819,13 +1825,16 @@ find_vmv (MonoCompile *cfg, MonoInst *ins)
 }
 
 void
-mono_dwarf_writer_emit_method (MonoDwarfWriter *w, MonoCompile *cfg, MonoMethod *method, char *start_symbol, char *end_symbol, guint8 *code, guint32 code_size, MonoInst **args, MonoInst **locals, GSList *unwind_info, MonoDebugMethodJitInfo *debug_info)
+mono_dwarf_writer_emit_method (MonoDwarfWriter *w, MonoCompile *cfg, MonoMethod *method, char *start_symbol, char *end_symbol, char *linkage_name,
+							   guint8 *code, guint32 code_size, MonoInst **args, MonoInst **locals, GSList *unwind_info, MonoDebugMethodJitInfo *debug_info)
 {
 	char *name;
 	MonoMethodSignature *sig;
 	MonoMethodHeader *header;
 	char **names;
 	MonoDebugLocalsInfo *locals_info;
+	MonoDebugMethodInfo *minfo;
+	MonoDebugSourceLocation *loc = NULL;
 	int i;
 	guint8 buf [128];
 	guint8 *p;
@@ -1857,13 +1866,32 @@ mono_dwarf_writer_emit_method (MonoDwarfWriter *w, MonoCompile *cfg, MonoMethod
 		emit_type (w, header->locals [i]);
 	}
 
+	minfo = mono_debug_lookup_method (method);
+	if (minfo)
+		loc = mono_debug_symfile_lookup_location (minfo, 0);
+
 	/* Subprogram */
 	names = g_new0 (char *, sig->param_count);
 	mono_method_get_param_names (method, (const char **) names);
 
 	emit_uleb128 (w, ABBREV_SUBPROGRAM);
+	/* DW_AT_name */
 	name = mono_method_full_name (method, FALSE);
 	emit_string (w, name);
+	/* DW_AT_MIPS_linkage_name */
+	if (linkage_name)
+		emit_string (w, linkage_name);
+	else
+		emit_string (w, "");
+	/* DW_AT_decl_file/DW_AT_decl_line */
+	if (loc) {
+		int file_index = add_line_number_file_name (w, loc->source_file, 0, 0);
+		emit_uleb128 (w, file_index + 1);
+		emit_uleb128 (w, loc->row);
+	} else {
+		emit_uleb128 (w, 0);
+		emit_uleb128 (w, 0);
+	}
 #ifndef TARGET_IOS
 	emit_string (w, name);
 #endif