2002-08-27 Martin Baulig <martin@gnome.org>

	* debug-mono-symfile.h (MonoSymbolFileMethodAddress): Removed the
	`trampoline_address' field.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 1a71134d23e2440b3d333d3c1858e741a3def97d..800bf72e731310dc82126ded4f3b563fbe908082 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-27  Martin Baulig  <martin@gnome.org>
+
+       * debug-mono-symfile.h (MonoSymbolFileMethodAddress): Removed the
+       `trampoline_address' field.
+
 2002-08-27  Dietmar Maurer  <dietmar@ximian.com>
 
        * marshal.c (mono_marshal_get_native_wrapper): removed wrong null

diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c
index 2ba5dc8580f104eef1ce5c85e08b4c7a79f2be09..327b3107adb93698b6c31094e13a76aa33e665e3 100644 (file)
--- a/mono/metadata/debug-mono-symfile.c
+++ b/mono/metadata/debug-mono-symfile.c
@@ -22,7 +22,6 @@ struct MonoSymbolFilePriv
        GHashTable *method_table;
        GHashTable *method_hash;
        MonoSymbolFileOffsetTable *offset_table;
-       FILE *f;
 };
 
 typedef struct
@@ -307,31 +306,19 @@ update_method_func (gpointer key, gpointer value, gpointer user_data)
        MonoSymbolFileLineNumberEntry *lne;
        int i;
 
-       if (!mep->minfo)
+       if (!mep->minfo) {
                mep->minfo = g_hash_table_lookup (mydata->method_hash, mep->method);
+               if (!mep->minfo)
+                       return;
+       }
 
        address = (MonoSymbolFileMethodAddress *)
                (mydata->symfile->address_table + mep->entry->address_table_offset);
 
        address->is_valid = TRUE;
-       address->trampoline_address = GPOINTER_TO_UINT (mep->method->info);
-
-       if (!mep->minfo) {
-               address->start_address = address->end_address = 0;
-               fprintf (mydata->symfile->_priv->f, "%s.%s - %d - 0x%lx\n", mep->method->klass->name,
-                        mep->method->name, mep->method->wrapper_type,
-                        (long) address->trampoline_address);
-               return;
-       }
-
        address->start_address = GPOINTER_TO_UINT (mep->minfo->code_start);
        address->end_address = GPOINTER_TO_UINT (mep->minfo->code_start + mep->minfo->code_size);
 
-       fprintf (mydata->symfile->_priv->f, "%s.%s - %d - 0x%lx - 0x%lx - 0x%lx\n", mep->method->klass->name,
-                  mep->method->name, mep->method->wrapper_type,
-                  (long) address->start_address, (long) address->end_address,
-                  (long) address->trampoline_address);
-
        lne = (MonoSymbolFileLineNumberEntry *)
                (mydata->symfile->raw_contents + mep->entry->line_number_table_offset);
 
@@ -384,10 +371,7 @@ mono_debug_update_mono_symbol_file (MonoSymbolFile *symfile, GHashTable *method_
                if (!symfile->address_table)
                        symfile->address_table = g_malloc0 (symfile->address_table_size);
 
-               symfile->_priv->f = fopen ("log", "at");
-               fprintf (symfile->_priv->f, "STARTING UPDATE\n");
                g_hash_table_foreach (symfile->_priv->method_table, update_method_func, &mydata);
-               fclose (symfile->_priv->f);
        }
 }
 

diff --git a/mono/metadata/debug-mono-symfile.h b/mono/metadata/debug-mono-symfile.h
index 10931d004f69b785f6ca0de183b8926ad8ec1c79..191538cfaee2c55b6bfe683ea74656f2e1b9686b 100644 (file)
--- a/mono/metadata/debug-mono-symfile.h
+++ b/mono/metadata/debug-mono-symfile.h
@@ -41,7 +41,6 @@ struct MonoSymbolFileMethodAddress {
        guint32 is_valid;
        guint64 start_address;
        guint64 end_address;
-       guint64 trampoline_address;
        guint32 line_addresses [MONO_ZERO_LEN_ARRAY];
 };