2008-04-21 Martin Baulig <martin@ximian.com>

	* debug-debugger.h (MonoDebuggerInfo): Removed `attach', `detach'
	and `get_lmf_addr'; `notification_address' is no longer a pointer.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 3e616a539c92bc9777d5f1faf564319609fc95ae..4dfd0be9536fbc2bb2c23889ebeaeb977647303a 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-21  Martin Baulig  <martin@ximian.com>
+
+       * debug-debugger.h (MonoDebuggerInfo): Removed `attach', `detach'
+       and `get_lmf_addr'; `notification_address' is no longer a pointer.
+
 2008-04-21  Martin Baulig  <martin@ximian.com>
 
        * debug-debugger.h (MonoDebuggerInfo): Added `thread_vtable_ptr',

diff --git a/mono/mini/debug-debugger.c b/mono/mini/debug-debugger.c
index ab7291117714de549911968c4373b8c25c5b891a..cda75d37f0b243bf2f3ad24d9eb9b7394465b3ed 100644 (file)
--- a/mono/mini/debug-debugger.c
+++ b/mono/mini/debug-debugger.c
@@ -32,8 +32,6 @@ static guint64 debugger_get_boxed_object (guint64 klass_arg, guint64 val_arg);
 static guint64 debugger_class_get_static_field_data (guint64 klass);
 
 static guint64 debugger_run_finally (guint64 argument1, guint64 argument2);
-static void debugger_attach (void);
-static void debugger_detach (void);
 static void debugger_initialize (void);
 static guint64 debugger_init_code_buffer (void);
 
@@ -115,13 +113,6 @@ static MonoDebuggerMetadataInfo debugger_metadata_info = {
 
 extern void MONO_DEBUGGER__notification_function (guint64 command, guint64 data, guint64 data2);
 
-/*
- * Backwards compatibility:
- * The debugger expects a pointer to the function in `MONO_DEBUGGER__debugger_info'.
- */
-static void (*__obsolete_notification_func_ptr) (guint64 command, guint64 data, guint64 data2) =
-       &MONO_DEBUGGER__notification_function;
-
 /*
  * This is a global data symbol which is read by the debugger.
  */
@@ -132,7 +123,7 @@ MonoDebuggerInfo MONO_DEBUGGER__debugger_info = {
        sizeof (MonoSymbolTable),
        MONO_TRAMPOLINE_NUM,
        mono_trampoline_code,
-       &__obsolete_notification_func_ptr,
+       &MONO_DEBUGGER__notification_function,
        &mono_symbol_table,
        &debugger_metadata_info,
        &mono_debug_debugger_version,
@@ -143,10 +134,7 @@ MonoDebuggerInfo MONO_DEBUGGER__debugger_info = {
        &mono_debugger_runtime_invoke,
        &debugger_class_get_static_field_data,
        &debugger_run_finally,
-       &debugger_attach,
-       &debugger_detach,
        &debugger_initialize,
-       (void*)&mono_get_lmf_addr,
 
        &debugger_create_string,
        &debugger_lookup_class,
@@ -448,23 +436,6 @@ debugger_finalize_threads (void)
        gc_thread_vtable = NULL;
 }
 
-static void
-debugger_attach (void)
-{
-       mono_debugger_init ();
-
-       mono_debugger_event_handler = debugger_event_handler;
-       debugger_executable_code_buffer = mono_global_codeman_reserve (EXECUTABLE_CODE_BUFFER_SIZE);
-       debugger_init_threads ();
-}
-
-static void
-debugger_detach (void)
-{
-       mono_debugger_event_handler = NULL;
-       debugger_finalize_threads ();
-}
-
 static guint64
 debugger_init_code_buffer (void)
 {

diff --git a/mono/mini/debug-debugger.h b/mono/mini/debug-debugger.h
index 9998a068196ee08ba712e3e6c11482f424de7dcc..e5338d9e894a21f82d96d040d839e1a97003b813 100644 (file)
--- a/mono/mini/debug-debugger.h
+++ b/mono/mini/debug-debugger.h
@@ -46,10 +46,7 @@ struct _MonoDebuggerInfo {
        MonoInvokeFunc runtime_invoke;
        guint64 (*class_get_static_field_data) (guint64 klass);
        guint64 (*run_finally) (guint64 argument1, guint64 argument2);
-       void (*attach) (void);
-       void (*detach) (void);
        void (*initialize) (void);
-       void * (*get_lmf_addr) (void);
 
        guint64 (*create_string) (G_GNUC_UNUSED guint64 dummy1, G_GNUC_UNUSED guint64 dummy2,
                                  G_GNUC_UNUSED guint64 dummy3, const gchar *string_argument);