X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fdebug-mono-symfile.c;h=9832418bec12990296a243288a4958fdba0f801b;hb=e946a6cdebde729e1c03ec374184254ab38da184;hp=000f9b8ef1635a712530cc7e319bf571c817be96;hpb=6f94553690b1cd6487bcc206aec7f58c99f77adb;p=mono.git

diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index 000f9b8ef16..9832418bec1 100644
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -1,16 +1,24 @@
+/*
+ * debug-mono-symfile.c: 
+ *
+ * Author:
+ *	Mono Project (http://www.mono-project.com)
+ *
+ * Copyright (C) 2005-2008 Novell, Inc. (http://www.novell.com)
+ * Copyright 2012 Xamarin Inc (http://www.xamarin.com)
+ */
+
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <signal.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include <sys/stat.h>
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/tabledefs.h>
-#include <mono/metadata/rawbuffer.h>
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/exception.h>
@@ -21,6 +29,8 @@
 #include <mono/metadata/mono-endian.h>
 #include <mono/metadata/metadata-internals.h>
 #include <mono/metadata/class-internals.h>
+#include <mono/utils/mono-mmap.h>
+#include <mono/utils/bsearch.h>
 
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
@@ -32,60 +42,73 @@
 #define TYPE_TABLE_PTR_CHUNK_SIZE	256
 #define TYPE_TABLE_CHUNK_SIZE		65536
 
+struct _MonoSymbolFile {
+	const uint8_t *raw_contents;
+	int raw_contents_size;
+	void *raw_contents_handle;
+	int major_version;
+	int minor_version;
+	char *filename;
+	GHashTable *method_hash;
+	GHashTable *source_hash;
+	MonoSymbolFileOffsetTable *offset_table;
+	gboolean was_loaded_from_memory;
+};
+
 static void
 free_method_info (MonoDebugMethodInfo *minfo)
 {
 	g_free (minfo);
 }
 
-static gchar *
-get_class_name (MonoClass *klass)
+static void
+free_source_info (MonoDebugSourceInfo *sinfo)
 {
-	MonoClass *nested_in = mono_class_get_nesting_type (klass);
-	const char *name_space;
-	if (nested_in) {
-		gchar *parent_name = get_class_name (nested_in);
-		gchar *name = g_strdup_printf ("%s.%s", parent_name, mono_class_get_name (klass));
-		g_free (parent_name);
-		return name;
-	}
-
-	name_space = mono_class_get_namespace (klass);
-	return g_strdup_printf ("%s%s%s", name_space,
-				name_space [0] ? "." : "", mono_class_get_name (klass));
+	g_free (sinfo->source_file);
+	g_free (sinfo->guid);
+	g_free (sinfo->hash);
+	g_free (sinfo);
 }
 
 static int
-load_symfile (MonoDebugHandle *handle, MonoSymbolFile *symfile, gboolean in_the_debugger)
+load_symfile (MonoDebugHandle *handle, MonoSymbolFile *symfile, mono_bool in_the_debugger)
 {
 	const char *ptr, *start;
 	gchar *guid;
-	guint64 magic;
-	long version;
+	uint64_t magic;
+	int minor, major;
 
 	ptr = start = (const char*)symfile->raw_contents;
 	if (!ptr)
 		return FALSE;
 
 	magic = read64(ptr);
-	ptr += sizeof(guint64);
+	ptr += sizeof(uint64_t);
 	if (magic != MONO_SYMBOL_FILE_MAGIC) {
 		if (!in_the_debugger)
 			g_warning ("Symbol file %s is not a mono symbol file", symfile->filename);
 		return FALSE;
 	}
 
-	version = read32(ptr);
-	ptr += sizeof(guint32);
-	if ((version != MONO_SYMBOL_FILE_VERSION) && (version != MONO_SYMBOL_FILE_COMPATIBILITY_VERSION)) {
+	major = read32(ptr);
+	ptr += sizeof(uint32_t);
+	minor = read32(ptr);
+	ptr += sizeof(uint32_t);
+
+	/*
+	 * 50.0 is the frozen version for Mono 2.0.
+	 *
+	 * Nobody except me (Martin) is allowed to check the minor version.
+	 */
+	if (major != MONO_SYMBOL_FILE_MAJOR_VERSION) {
 		if (!in_the_debugger)
-			g_warning ("Symbol file %s has incorrect version "
-				   "(expected %d, got %ld)", symfile->filename,
-				   MONO_SYMBOL_FILE_VERSION, version);
+			g_warning ("Symbol file %s has incorrect version (expected %d.%d, got %d)",
+				   symfile->filename, MONO_SYMBOL_FILE_MAJOR_VERSION,
+				   MONO_SYMBOL_FILE_MINOR_VERSION, major);
 		return FALSE;
 	}
 
-	guid = mono_guid_to_string ((const guint8 *) ptr);
+	guid = mono_guid_to_string ((const uint8_t *) ptr);
 	ptr += 16;
 
 	if (strcmp (handle->image->guid, guid)) {
@@ -97,23 +120,26 @@ load_symfile (MonoDebugHandle *handle, MonoSymbolFile *symfile, gboolean in_the_
 		return FALSE;
 	}
 
-	symfile->version = version;
+	symfile->major_version = major;
+	symfile->minor_version = minor;
 
 	symfile->offset_table = (MonoSymbolFileOffsetTable *) ptr;
 
 	symfile->method_hash = g_hash_table_new_full (
-		g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) free_method_info);
+		NULL, NULL, NULL, (GDestroyNotify) free_method_info);
+
+	symfile->source_hash = g_hash_table_new_full (
+		NULL, NULL, NULL, (GDestroyNotify) free_source_info);
 
 	g_free (guid);
 	return TRUE;
 }
 
 MonoSymbolFile *
-mono_debug_open_mono_symbols (MonoDebugHandle *handle, const guint8 *raw_contents,
+mono_debug_open_mono_symbols (MonoDebugHandle *handle, const uint8_t *raw_contents,
 			      int size, gboolean in_the_debugger)
 {
 	MonoSymbolFile *symfile;
-	FILE* f;
 
 	mono_debugger_lock ();
 	symfile = g_new0 (MonoSymbolFile, 1);
@@ -124,22 +150,22 @@ mono_debug_open_mono_symbols (MonoDebugHandle *handle, const guint8 *raw_content
 		symfile->raw_contents = p = g_malloc (size);
 		memcpy (p, raw_contents, size);
 		symfile->filename = g_strdup_printf ("LoadedFromMemory");
+		symfile->was_loaded_from_memory = TRUE;
 	} else {
+		MonoFileMap *f;
 		symfile->filename = g_strdup_printf ("%s.mdb", mono_image_get_filename (handle->image));
-
-		if ((f = fopen (symfile->filename, "rb"))) {
-			struct stat stat_buf;
-			
-			if (fstat (fileno (f), &stat_buf) < 0) {
+		symfile->was_loaded_from_memory = FALSE;
+		if ((f = mono_file_map_open (symfile->filename))) {
+			symfile->raw_contents_size = mono_file_map_size (f);
+			if (symfile->raw_contents_size == 0) {
 				if (!in_the_debugger)
 					g_warning ("stat of %s failed: %s",
 						   symfile->filename,  g_strerror (errno));
 			} else {
-				symfile->raw_contents_size = stat_buf.st_size;
-				symfile->raw_contents = mono_raw_buffer_load (fileno (f), FALSE, 0, stat_buf.st_size);
+				symfile->raw_contents = mono_file_map (symfile->raw_contents_size, MONO_MMAP_READ|MONO_MMAP_PRIVATE, mono_file_map_fd (f), 0, &symfile->raw_contents_handle);
 			}
 
-			fclose (f);
+			mono_file_map_close (f);
 		}
 	}
 	
@@ -166,8 +192,12 @@ mono_debug_close_mono_symbol_file (MonoSymbolFile *symfile)
 	if (symfile->method_hash)
 		g_hash_table_destroy (symfile->method_hash);
 
-	if (symfile->raw_contents)
-		mono_raw_buffer_free ((gpointer) symfile->raw_contents);
+	if (symfile->raw_contents) {
+		if (symfile->was_loaded_from_memory)
+			g_free ((gpointer)symfile->raw_contents);
+		else
+			mono_file_unmap ((gpointer) symfile->raw_contents, symfile->raw_contents_handle);
+	}
 
 	if (symfile->filename)
 		g_free (symfile->filename);
@@ -175,8 +205,15 @@ mono_debug_close_mono_symbol_file (MonoSymbolFile *symfile)
 	mono_debugger_unlock ();
 }
 
+mono_bool
+mono_debug_symfile_is_loaded (MonoSymbolFile *symfile)
+{
+	return symfile && symfile->offset_table;
+}
+
+
 static int
-read_leb128 (const char *ptr, const char **rptr)
+read_leb128 (const uint8_t *ptr, const uint8_t **rptr)
 {
 	int ret = 0;
 	int shift = 0;
@@ -196,10 +233,64 @@ read_leb128 (const char *ptr, const char **rptr)
 }
 
 static gchar *
-read_string (const char *ptr)
+read_string (const uint8_t *ptr, const uint8_t **endp)
 {
+	gchar *s;
 	int len = read_leb128 (ptr, &ptr);
-	return g_filename_from_utf8 (ptr, len, NULL, NULL, NULL);
+
+	s = g_filename_from_utf8 ((const char *) ptr, len, NULL, NULL, NULL);
+	ptr += len;
+	if (endp)
+		*endp = ptr;
+	return s;
+}
+
+typedef struct {
+	MonoSymbolFile *symfile;
+	int line_base, line_range, max_address_incr;
+	uint8_t opcode_base;
+	uint32_t last_line, last_file, last_offset;
+	uint32_t first_file;
+	int line, file, offset;
+	gboolean is_hidden;
+} StatementMachine;
+
+static gboolean
+check_line (StatementMachine *stm, int offset, MonoDebugSourceLocation **location)
+{
+	gchar *source_file = NULL;
+
+	if (stm->offset <= offset) {
+		stm->last_offset = stm->offset;
+		stm->last_file = stm->file;
+		if (stm->line != 0xfeefee)
+			stm->last_line = stm->line;
+		return FALSE;
+	}
+
+	if (stm->last_file) {
+		int offset = read32(&(stm->symfile->offset_table->_source_table_offset)) +
+			(stm->last_file - 1) * sizeof (MonoSymbolFileSourceEntry);
+		MonoSymbolFileSourceEntry *se = (MonoSymbolFileSourceEntry *)
+			(stm->symfile->raw_contents + offset);
+
+		source_file = read_string (stm->symfile->raw_contents + read32(&(se->_data_offset)), NULL);
+	}
+
+	if (stm->last_line == 0) {
+		/* 
+		 * The IL offset is less than the first IL offset which has a corresponding
+		 * source line.
+		 */
+		*location = NULL;
+		return TRUE;
+	}
+
+	*location = g_new0 (MonoDebugSourceLocation, 1);
+	(*location)->source_file = source_file;
+	(*location)->row = stm->last_line;
+	(*location)->il_offset = stm->last_offset;
+	return TRUE;
 }
 
 /**
@@ -213,53 +304,385 @@ read_string (const char *ptr)
  * `native address -> IL offset' mapping.
  */
 MonoDebugSourceLocation *
-mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, guint32 offset)
+mono_debug_symfile_lookup_location (MonoDebugMethodInfo *minfo, uint32_t offset)
 {
-	MonoSymbolFileLineNumberEntry *lne;
+	MonoDebugSourceLocation *location = NULL;
 	MonoSymbolFile *symfile;
-	gchar *source_file = NULL;
 	const unsigned char *ptr;
-	int count, i;
+	StatementMachine stm;
+
+#define DW_LNS_copy 1
+#define DW_LNS_advance_pc 2
+#define DW_LNS_advance_line 3
+#define DW_LNS_set_file 4
+#define DW_LNS_const_add_pc 8
+
+#define DW_LNE_end_sequence 1
+#define DW_LNE_MONO_negate_is_hidden 0x40
+
+#define DW_LNE_MONO__extensions_start 0x40
+#define DW_LNE_MONO__extensions_end 0x7f
 
 	if ((symfile = minfo->handle->symfile) == NULL)
 		return NULL;
 
+	stm.line_base = read32 (&symfile->offset_table->_line_number_table_line_base);
+	stm.line_range = read32 (&symfile->offset_table->_line_number_table_line_range);
+	stm.opcode_base = (uint8_t) read32 (&symfile->offset_table->_line_number_table_opcode_base);
+	stm.max_address_incr = (255 - stm.opcode_base) / stm.line_range;
+
 	mono_debugger_lock ();
 
-	if (read32(&(minfo->entry->_source_index))) {
-		int offset = read32(&(symfile->offset_table->_source_table_offset)) +
-			(read32(&(minfo->entry->_source_index)) - 1) * sizeof (MonoSymbolFileSourceEntry);
-		MonoSymbolFileSourceEntry *se = (MonoSymbolFileSourceEntry *) (symfile->raw_contents + offset);
+	ptr = symfile->raw_contents + minfo->lnt_offset;
+
+	stm.symfile = symfile;
+	stm.offset = stm.last_offset = 0;
+	stm.last_file = 0;
+	stm.last_line = 0;
+	stm.first_file = 0;
+	stm.file = 1;
+	stm.line = 1;
+	stm.is_hidden = FALSE;
+
+	while (TRUE) {
+		uint8_t opcode = *ptr++;
+
+		if (opcode == 0) {
+			uint8_t size = *ptr++;
+			const unsigned char *end_ptr = ptr + size;
+
+			opcode = *ptr++;
+
+			if (opcode == DW_LNE_end_sequence) {
+				if (check_line (&stm, -1, &location))
+					goto out_success;
+				break;
+			} else if (opcode == DW_LNE_MONO_negate_is_hidden) {
+				stm.is_hidden = !stm.is_hidden;
+			} else if ((opcode >= DW_LNE_MONO__extensions_start) &&
+				   (opcode <= DW_LNE_MONO__extensions_end)) {
+				; // reserved for future extensions
+			} else {
+				g_warning ("Unknown extended opcode %x in LNT", opcode);
+			}
+
+			ptr = end_ptr;
+			continue;
+		} else if (opcode < stm.opcode_base) {
+			switch (opcode) {
+			case DW_LNS_copy:
+				if (check_line (&stm, offset, &location))
+					goto out_success;
+				break;
+			case DW_LNS_advance_pc:
+				stm.offset += read_leb128 (ptr, &ptr);
+				break;
+			case DW_LNS_advance_line:
+				stm.line += read_leb128 (ptr, &ptr);
+				break;
+			case DW_LNS_set_file:
+				stm.file = read_leb128 (ptr, &ptr);
+				break;
+			case DW_LNS_const_add_pc:
+				stm.offset += stm.max_address_incr;
+				break;
+			default:
+				g_warning ("Unknown standard opcode %x in LNT", opcode);
+				goto error_out;
+			}
+		} else {
+			opcode -= stm.opcode_base;
 
-		source_file = read_string ((const char*)symfile->raw_contents + read32(&(se->_name_offset)));
+			stm.offset += opcode / stm.line_range;
+			stm.line += stm.line_base + (opcode % stm.line_range);
+
+			if (check_line (&stm, offset, &location))
+				goto out_success;
+		}
 	}
 
-	ptr = symfile->raw_contents + read32(&(minfo->entry->_line_number_table_offset));
+ error_out:
+	mono_debugger_unlock ();
+	return NULL;
+
+ out_success:
+	mono_debugger_unlock ();
+	return location;
+}
+
+static void
+add_line (StatementMachine *stm, GPtrArray *il_offset_array, GPtrArray *line_number_array, GPtrArray *source_file_array)
+{
+	if (stm->line > 0) {
+		g_ptr_array_add (il_offset_array, GUINT_TO_POINTER (stm->offset));
+		g_ptr_array_add (line_number_array, GUINT_TO_POINTER (stm->line));
+		g_ptr_array_add (source_file_array, GUINT_TO_POINTER (stm->file));
+	}
+
+	if (!stm->is_hidden && !stm->first_file)
+		stm->first_file = stm->file;
+}
+
+/*
+ * mono_debug_symfile_free_location:
+ *
+ *   Free a MonoDebugSourceLocation returned by
+ *   mono_debug_symfile_lookup_location
+ */
+void
+mono_debug_symfile_free_location   (MonoDebugSourceLocation  *location)
+{
+	g_free (location->source_file);
+	g_free (location);
+}
+
+/*
+ * LOCKING: Assumes the debugger lock is held.
+ */
+static MonoDebugSourceInfo*
+get_source_info (MonoSymbolFile *symfile, int index)
+{
+	MonoDebugSourceInfo *info;
+
+	info = g_hash_table_lookup (symfile->source_hash, GUINT_TO_POINTER (index));
+	if (!info) {
+		int offset = read32(&(symfile->offset_table->_source_table_offset)) +
+			(index - 1) * sizeof (MonoSymbolFileSourceEntry);
+		MonoSymbolFileSourceEntry *se = (MonoSymbolFileSourceEntry *)
+			(symfile->raw_contents + offset);
+		const uint8_t *ptr = symfile->raw_contents + read32(&(se->_data_offset));
+
+		info = g_new0 (MonoDebugSourceInfo, 1);
+		info->source_file = read_string (ptr, &ptr);
+		info->guid = g_malloc0 (16);
+		memcpy (info->guid, ptr, 16);
+		ptr += 16;
+		info->hash = g_malloc0 (16);
+		memcpy (info->hash, ptr, 16);
+		ptr += 16;
+		g_hash_table_insert (symfile->source_hash, GUINT_TO_POINTER (index), info);
+	}
+	return info;
+}
+
+static gboolean
+method_has_column_info (MonoDebugMethodInfo *minfo)
+{
+	MonoSymbolFile *symfile;
+	const unsigned char *ptr;
+	guint32 flags;
+
+	if ((symfile = minfo->handle->symfile) == NULL)
+		return FALSE;
+
+	ptr = symfile->raw_contents + minfo->data_offset;
+
+	/* Has to read 'flags' which is preceeded by a bunch of other data */
+	/* compile_unit_index */
+	read_leb128 (ptr, &ptr);
+	/* local variable table offset */
+	read_leb128 (ptr, &ptr);
+	/* namespace id */
+	read_leb128 (ptr, &ptr);
+	/* code block table offset */
+	read_leb128 (ptr, &ptr);
+	/* scope variable table offset */
+	read_leb128 (ptr, &ptr);
+	/* real name offset */
+	read_leb128 (ptr, &ptr);
+
+	flags = read_leb128 (ptr, &ptr);
+	return (flags & 2) > 0;
+}
 
-	count = read32(&(minfo->entry->_num_line_numbers));
-	lne = ((MonoSymbolFileLineNumberEntry *) ptr) + count - 1;
+/*
+ * mono_debug_symfile_get_line_numbers_full:
+ *
+ * On return, SOURCE_FILE_LIST will point to a GPtrArray of MonoDebugSourceFile
+ * structures, and SOURCE_FILES will contain indexes into this array.
+ * The MonoDebugSourceFile structures are owned by this module.
+ */
+void
+mono_debug_symfile_get_line_numbers_full (MonoDebugMethodInfo *minfo, char **source_file, GPtrArray **source_file_list, int *n_il_offsets, int **il_offsets, int **line_numbers, int **column_numbers, int **source_files)
+{
+	// FIXME: Unify this with mono_debug_symfile_lookup_location
+	MonoSymbolFile *symfile;
+	const unsigned char *ptr;
+	StatementMachine stm;
+	uint32_t i;
+	GPtrArray *il_offset_array, *line_number_array, *source_file_array;
+	gboolean has_column_info;
+
+	if (source_file_list)
+		*source_file_list = NULL;
+	if (n_il_offsets)
+		*n_il_offsets = 0;
+	if (source_files)
+		*source_files = NULL;
+	if (source_file)
+		*source_file = NULL;
+	if (column_numbers)
+		*column_numbers = NULL;
 
-	for (i = count - 1; i >= 0; i--, lne--) {
-		MonoDebugSourceLocation *location;
+	if ((symfile = minfo->handle->symfile) == NULL)
+		return;
+
+	has_column_info = method_has_column_info (minfo);
+
+	il_offset_array = g_ptr_array_new ();
+	line_number_array = g_ptr_array_new ();
+	source_file_array = g_ptr_array_new ();
+
+	stm.line_base = read32 (&symfile->offset_table->_line_number_table_line_base);
+	stm.line_range = read32 (&symfile->offset_table->_line_number_table_line_range);
+	stm.opcode_base = (uint8_t) read32 (&symfile->offset_table->_line_number_table_opcode_base);
+	stm.max_address_incr = (255 - stm.opcode_base) / stm.line_range;
+
+	mono_debugger_lock ();
+
+	ptr = symfile->raw_contents + minfo->lnt_offset;
+
+	stm.symfile = symfile;
+	stm.offset = stm.last_offset = 0;
+	stm.last_file = 0;
+	stm.last_line = 0;
+	stm.first_file = 0;
+	stm.file = 1;
+	stm.line = 1;
+	stm.is_hidden = FALSE;
+
+	while (TRUE) {
+		uint8_t opcode = *ptr++;
+
+		if (opcode == 0) {
+			uint8_t size = *ptr++;
+			const unsigned char *end_ptr = ptr + size;
+
+			opcode = *ptr++;
+
+			if (opcode == DW_LNE_end_sequence) {
+				if (il_offset_array->len == 0)
+					/* Empty table */
+					break;
+				add_line (&stm, il_offset_array, line_number_array, source_file_array);
+				break;
+			} else if (opcode == DW_LNE_MONO_negate_is_hidden) {
+				stm.is_hidden = !stm.is_hidden;
+			} else if ((opcode >= DW_LNE_MONO__extensions_start) &&
+				   (opcode <= DW_LNE_MONO__extensions_end)) {
+				; // reserved for future extensions
+			} else {
+				g_warning ("Unknown extended opcode %x in LNT", opcode);
+			}
 
-		if (read32(&(lne->_offset)) > offset)
+			ptr = end_ptr;
 			continue;
+		} else if (opcode < stm.opcode_base) {
+			switch (opcode) {
+			case DW_LNS_copy:
+				add_line (&stm, il_offset_array, line_number_array, source_file_array);
+				break;
+			case DW_LNS_advance_pc:
+				stm.offset += read_leb128 (ptr, &ptr);
+				break;
+			case DW_LNS_advance_line:
+				stm.line += read_leb128 (ptr, &ptr);
+				break;
+			case DW_LNS_set_file:
+				stm.file = read_leb128 (ptr, &ptr);
+				break;
+			case DW_LNS_const_add_pc:
+				stm.offset += stm.max_address_incr;
+				break;
+			default:
+				g_warning ("Unknown standard opcode %x in LNT", opcode);
+				g_assert_not_reached ();
+			}
+		} else {
+			opcode -= stm.opcode_base;
 
-		location = g_new0 (MonoDebugSourceLocation, 1);
-		location->source_file = source_file;
-		location->row = read32(&(lne->_row));
-		location->il_offset = read32(&(lne->_offset));
+			stm.offset += opcode / stm.line_range;
+			stm.line += stm.line_base + (opcode % stm.line_range);
 
-		mono_debugger_unlock ();
-		return location;
+			add_line (&stm, il_offset_array, line_number_array, source_file_array);
+		}
+	}
+
+	if (!stm.file && stm.first_file)
+		stm.file = stm.first_file;
+
+	if (stm.file && source_file) {
+		int offset = read32(&(stm.symfile->offset_table->_source_table_offset)) +
+			(stm.file - 1) * sizeof (MonoSymbolFileSourceEntry);
+		MonoSymbolFileSourceEntry *se = (MonoSymbolFileSourceEntry *)
+			(stm.symfile->raw_contents + offset);
+
+		if (source_file)
+			*source_file = read_string (stm.symfile->raw_contents + read32(&(se->_data_offset)), NULL);
+	}
+
+	if (source_file_list) {
+		int file, last_file = 0;
+
+		*source_file_list = g_ptr_array_new ();
+		if (source_files)
+			*source_files = g_malloc (il_offset_array->len * sizeof (int));
+
+		for (i = 0; i < il_offset_array->len; ++i) {
+			file = GPOINTER_TO_UINT (g_ptr_array_index (source_file_array, i));
+			if (file && file != last_file) {
+				MonoDebugSourceInfo *info = get_source_info (symfile, file);
+
+				g_ptr_array_add (*source_file_list, info);
+			}
+			last_file = file;
+			if (source_files)
+				(*source_files) [i] = (*source_file_list)->len - 1;
+		}
+		if ((*source_file_list)->len == 0 && stm.file) {
+			MonoDebugSourceInfo *info = get_source_info (symfile, stm.file);
+
+			g_ptr_array_add (*source_file_list, info);
+		}
+	}				
+
+	if (n_il_offsets)
+		*n_il_offsets = il_offset_array->len;
+	if (il_offsets && line_numbers) {
+		*il_offsets = g_malloc (il_offset_array->len * sizeof (int));
+		*line_numbers = g_malloc (il_offset_array->len * sizeof (int));
+		for (i = 0; i < il_offset_array->len; ++i) {
+			(*il_offsets) [i] = GPOINTER_TO_UINT (g_ptr_array_index (il_offset_array, i));
+			(*line_numbers) [i] = GPOINTER_TO_UINT (g_ptr_array_index (line_number_array, i));
+		}
+	}
+
+	if (column_numbers && has_column_info) {
+		*column_numbers = g_malloc (il_offset_array->len * sizeof (int));
+		for (i = 0; i < il_offset_array->len; ++i)
+			(*column_numbers) [i] = read_leb128 (ptr, &ptr);
 	}
 
+	g_ptr_array_free (il_offset_array, TRUE);
+	g_ptr_array_free (line_number_array, TRUE);
+
 	mono_debugger_unlock ();
-	return NULL;
+	return;
 }
 
-gint32
-_mono_debug_address_from_il_offset (MonoDebugMethodJitInfo *jit, guint32 il_offset)
+/*
+ * mono_debug_symfile_get_line_numbers:
+ *
+ *   All the output parameters can be NULL.
+ */ 
+void
+mono_debug_symfile_get_line_numbers (MonoDebugMethodInfo *minfo, char **source_file, int *n_il_offsets, int **il_offsets, int **line_numbers)
+{
+	mono_debug_symfile_get_line_numbers_full (minfo, source_file, NULL, n_il_offsets, il_offsets, line_numbers, NULL, NULL);
+}
+	
+int32_t
+_mono_debug_address_from_il_offset (MonoDebugMethodJitInfo *jit, uint32_t il_offset)
 {
 	int i;
 
@@ -269,8 +692,6 @@ _mono_debug_address_from_il_offset (MonoDebugMethodJitInfo *jit, guint32 il_offs
 	for (i = jit->num_line_numbers - 1; i >= 0; i--) {
 		MonoDebugLineNumberEntry lne = jit->line_numbers [i];
 
-		if (lne.il_offset < 0)
-			continue;
 		if (lne.il_offset <= il_offset)
 			return lne.native_offset;
 	}
@@ -281,8 +702,8 @@ _mono_debug_address_from_il_offset (MonoDebugMethodJitInfo *jit, guint32 il_offs
 static int
 compare_method (const void *key, const void *object)
 {
-	guint32 token = GPOINTER_TO_UINT (key);
-	MonoSymbolFileMethodIndexEntry *me = (MonoSymbolFileMethodIndexEntry*)object;
+	uint32_t token = GPOINTER_TO_UINT (key);
+	MonoSymbolFileMethodEntry *me = (MonoSymbolFileMethodEntry*)object;
 
 	return token - read32(&(me->_token));
 }
@@ -290,8 +711,7 @@ compare_method (const void *key, const void *object)
 MonoDebugMethodInfo *
 mono_debug_symfile_lookup_method (MonoDebugHandle *handle, MonoMethod *method)
 {
-	MonoSymbolFileMethodEntry *me;
-	MonoSymbolFileMethodIndexEntry *first_ie, *ie;
+	MonoSymbolFileMethodEntry *first_ie, *ie;
 	MonoDebugMethodInfo *minfo;
 	MonoSymbolFile *symfile = handle->symfile;
 
@@ -302,32 +722,111 @@ mono_debug_symfile_lookup_method (MonoDebugHandle *handle, MonoMethod *method)
 		return NULL;
 
 	mono_debugger_lock ();
-	first_ie = (MonoSymbolFileMethodIndexEntry *)
+
+	minfo = g_hash_table_lookup (symfile->method_hash, method);
+	if (minfo) {
+		mono_debugger_unlock ();
+		return minfo;
+	}
+
+	first_ie = (MonoSymbolFileMethodEntry *)
 		(symfile->raw_contents + read32(&(symfile->offset_table->_method_table_offset)));
 
-	ie = bsearch (GUINT_TO_POINTER (mono_method_get_token (method)), first_ie,
+	ie = mono_binary_search (GUINT_TO_POINTER (mono_method_get_token (method)), first_ie,
 				   read32(&(symfile->offset_table->_method_count)),
-				   sizeof (MonoSymbolFileMethodIndexEntry), compare_method);
+				   sizeof (MonoSymbolFileMethodEntry), compare_method);
 
 	if (!ie) {
 		mono_debugger_unlock ();
 		return NULL;
 	}
 
-	me = (MonoSymbolFileMethodEntry *) (symfile->raw_contents + read32(&(ie->_file_offset)));
-
 	minfo = g_new0 (MonoDebugMethodInfo, 1);
 	minfo->index = (ie - first_ie) + 1;
 	minfo->method = method;
 	minfo->handle = handle;
-	minfo->num_il_offsets = read32(&(me->_num_line_numbers));
-	minfo->il_offsets = (MonoSymbolFileLineNumberEntry *)
-		(symfile->raw_contents + read32(&(me->_line_number_table_offset)));
 
-	minfo->entry = me;
+	minfo->data_offset = read32 (&(ie->_data_offset));
+	minfo->lnt_offset = read32 (&(ie->_line_number_table));
 
 	g_hash_table_insert (symfile->method_hash, method, minfo);
 
 	mono_debugger_unlock ();
 	return minfo;
 }
+
+/*
+ * mono_debug_symfile_lookup_locals:
+ *
+ *   Return information about the local variables of MINFO from the symbol file.
+ * Return NULL if no information can be found.
+ * The result should be freed using mono_debug_symfile_free_locals ().
+ */
+MonoDebugLocalsInfo*
+mono_debug_symfile_lookup_locals (MonoDebugMethodInfo *minfo)
+{
+	MonoSymbolFile *symfile = minfo->handle->symfile;
+	const uint8_t *p;
+	int i, len, compile_unit_index, locals_offset, num_locals, block_index;
+	int namespace_id, code_block_table_offset;
+	MonoDebugLocalsInfo *res;
+
+	if (!symfile)
+		return NULL;
+
+	p = symfile->raw_contents + minfo->data_offset;
+
+	compile_unit_index = read_leb128 (p, &p);
+	locals_offset = read_leb128 (p, &p);
+	namespace_id = read_leb128 (p, &p);
+	code_block_table_offset = read_leb128 (p, &p);
+
+	res = g_new0 (MonoDebugLocalsInfo, 1);
+
+	p = symfile->raw_contents + code_block_table_offset;
+	res->num_blocks = read_leb128 (p, &p);
+	res->code_blocks = g_new0 (MonoDebugCodeBlock, res->num_blocks);
+	for (i = 0; i < res->num_blocks; ++i) {
+		res->code_blocks [i].type = read_leb128 (p, &p);
+		res->code_blocks [i].parent = read_leb128 (p, &p);
+		res->code_blocks [i].start_offset = read_leb128 (p, &p);
+		res->code_blocks [i].end_offset = read_leb128 (p, &p);
+	}
+
+	p = symfile->raw_contents + locals_offset;
+	num_locals = read_leb128 (p, &p);
+
+	res->num_locals = num_locals;
+	res->locals = g_new0 (MonoDebugLocalVar, num_locals);
+
+	for (i = 0; i < num_locals; ++i) {
+		res->locals [i].index = read_leb128 (p, &p);
+		len = read_leb128 (p, &p);
+		res->locals [i].name = g_malloc (len + 1);
+		memcpy (res->locals [i].name, p, len);
+		res->locals [i].name [len] = '\0';
+		p += len;
+		block_index = read_leb128 (p, &p);
+		if (block_index >= 1 && block_index <= res->num_blocks)
+			res->locals [i].block = &res->code_blocks [block_index - 1];
+	}
+
+	return res;
+}
+
+/*
+ * mono_debug_symfile_free_locals:
+ *
+ *   Free all the data allocated by mono_debug_symfile_lookup_locals ().
+ */
+void
+mono_debug_symfile_free_locals (MonoDebugLocalsInfo *info)
+{
+	int i;
+
+	for (i = 0; i < info->num_locals; ++i)
+		g_free (info->locals [i].name);
+	g_free (info->locals);
+	g_free (info->code_blocks);
+	g_free (info);
+}