2002-07-05 Martin Baulig <martin@gnome.org>

	* debug-symfile.c: Reflect latest MonoDwarfFileWriter changes.

svn path=/trunk/mono/; revision=5611

diff --git a/mono/metadata/debug-symfile.c b/mono/metadata/debug-symfile.c
index 0d912cc197170bec9a805b5302a91f4211ae606e..4cf9fa90029866d512595d6c19613d927b399496 100644 (file)
--- a/mono/metadata/debug-symfile.c
+++ b/mono/metadata/debug-symfile.c
@@ -146,6 +146,13 @@ get_sections_elf32 (MonoDebugSymbolFile *symfile, gboolean emit_warnings)
                        sfs->type = MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS;
                        sfs->file_offset = section->sh_offset;
                        sfs->size = section->sh_size;
+               } else if (!strcmp (name, ".mono_symbol_table")) {
+                       MonoDebugSymbolFileSection *sfs;
+
+                       sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE];
+                       sfs->type = MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE;
+                       sfs->file_offset = section->sh_offset;
+                       sfs->size = section->sh_size;
                }
        }
 
@@ -220,16 +227,91 @@ read_line_numbers (MonoDebugSymbolFile *symfile)
 }
 
 static MonoClass *
-mono_debug_class_get (MonoDebugSymbolFile *symfile, guint32 type_token)
+find_class_by_name (MonoDebugSymbolFile *symfile, const char *nspace, const char *name)
 {
+       MonoAssembly **assembly;
        MonoClass *klass;
 
-       if ((klass = g_hash_table_lookup (symfile->image->class_cache, GUINT_TO_POINTER (type_token))))
+       klass = mono_class_from_name (symfile->image, nspace, name);
+
+       if (klass)
                return klass;
 
+       for (assembly = symfile->image->references; assembly && *assembly; assembly++) {
+               klass = mono_class_from_name ((*assembly)->image, nspace, name);
+
+               if (klass)
+                       return klass;
+       }
+
+       g_message (G_STRLOC ": Can't find class %s.%s", nspace, name);
+
        return NULL;
 }
 
+static void
+read_symbol_table (MonoDebugSymbolFile *symfile)
+{
+       const char *ptr, *start, *end;
+       int version, i;
+       long section_size;
+
+       if (!symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE].file_offset)
+               return;
+
+       ptr = start = symfile->raw_contents +
+               symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE].file_offset;
+
+       version = *((guint16 *) ptr)++;
+       if (version != MONO_DEBUG_SYMBOL_FILE_VERSION) {
+               g_warning ("Symbol file %s has incorrect line number table version "
+                          "(expected %d, got %d)", symfile->file_name,
+                          MONO_DEBUG_SYMBOL_FILE_VERSION, version);
+               return;
+       }
+
+       section_size = *((guint32 *) ptr)++;
+       end = ptr + section_size;
+
+       g_free (symfile->type_table);
+
+       symfile->num_types = * ((guint32 *) ptr)++;
+       symfile->type_table = g_new0 (MonoClass *, symfile->num_types);
+
+       for (i = 0; i < symfile->num_types; i++) {
+               const char *name, *namespace;
+               MonoClass *klass;
+
+               namespace = ptr;
+               ptr += strlen (namespace) + 1;
+
+               name = ptr;
+               ptr += strlen (name) + 1;
+
+               klass = find_class_by_name (symfile, namespace, name);
+
+               if (klass)
+                       symfile->type_table [i] = klass;
+       }
+}
+
+static MonoClass *
+mono_debug_class_get (MonoDebugSymbolFile *symfile, guint32 type_token)
+{
+       MonoClass *klass;
+
+       if (!type_token)
+               return mono_defaults.object_class;
+
+       if (type_token <= symfile->num_types)
+               return symfile->type_table [type_token - 1];
+
+       if ((klass = g_hash_table_lookup (symfile->image->class_cache, GUINT_TO_POINTER (type_token))))
+                return klass;
+
+        return NULL;
+}
+
 MonoDebugSymbolFile *
 mono_debug_open_symbol_file (MonoImage *image, const char *filename, gboolean emit_warnings)
 {
@@ -273,6 +355,8 @@ mono_debug_open_symbol_file (MonoImage *image, const char *filename, gboolean em
                return NULL;
        }
 
+       read_symbol_table (symfile);
+
        read_line_numbers (symfile);
 
        return symfile;
@@ -387,6 +471,8 @@ mono_debug_update_symbol_file (MonoDebugSymbolFile *symfile,
        int version, already_relocated = 0;
        long reloc_size;
 
+       read_symbol_table (symfile);
+
        if (!symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE].file_offset)
                return;
 
@@ -571,12 +657,7 @@ mono_debug_update_symbol_file (MonoDebugSymbolFile *symfile,
                }
                case MRT_type_sizeof: {
                        guint32 token = *((guint32 *) tmp_ptr)++;
-                       MonoClass *klass;
-
-                       if (!token)
-                               klass = mono_defaults.object_class;
-                       else
-                               klass = mono_debug_class_get (symfile, token);
+                       MonoClass *klass = mono_debug_class_get (symfile, token);
 
                        if (!klass)
                                continue;
@@ -885,7 +966,7 @@ mono_debug_update_symbol_file (MonoDebugSymbolFile *symfile,
                                   token, klass, off);
 #endif
 
-                       * (void **) base_ptr = vtable->data + off;
+                       * (void **) base_ptr = (char *) vtable->data + off;
 
                        break;
                }

diff --git a/mono/metadata/debug-symfile.h b/mono/metadata/debug-symfile.h
index 71a3f0c25365a9ce2cc9a99d442c73799be7f17f..5504f0916154ceae7f5aa978f282f5389ea358a9 100644 (file)
--- a/mono/metadata/debug-symfile.h
+++ b/mono/metadata/debug-symfile.h
@@ -82,6 +82,8 @@ struct MonoDebugSymbolFile {
        /* Array of MONO_DEBUG_SYMBOL_SECTION_MAX elements. */
        MonoDebugSymbolFileSection *section_offsets;
        GHashTable *line_number_table;
+       guint32 num_types;
+       MonoClass **type_table;
        gpointer user_data;
 };
 
@@ -91,7 +93,7 @@ struct MonoDebugSymbolFileSection {
        gulong size;
 };
 
-#define MONO_DEBUG_SYMBOL_FILE_VERSION                 14
+#define MONO_DEBUG_SYMBOL_FILE_VERSION                 15
 
 /* Keep in sync with Mono.CSharp.Debugger.MonoDwarfFileWriter.Section */
 #define MONO_DEBUG_SYMBOL_SECTION_DEBUG_INFO           0x01
@@ -99,8 +101,9 @@ struct MonoDebugSymbolFileSection {
 #define MONO_DEBUG_SYMBOL_SECTION_DEBUG_LINE           0x03
 #define MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE     0x04
 #define MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS    0x05
+#define MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE    0x06
 
-#define MONO_DEBUG_SYMBOL_SECTION_MAX                  0x06
+#define MONO_DEBUG_SYMBOL_SECTION_MAX                  0x07
 
 /* Tries to load `filename' as a debugging information file, if `emit_warnings" is set,
  * use g_warning() to signal error messages on failure, otherwise silently return NULL. */