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);
+
+static void debugger_event_handler (MonoDebuggerEvent event, guint64 data, guint64 arg);
static guint64 debugger_create_string (G_GNUC_UNUSED guint64 dummy, G_GNUC_UNUSED guint64 dummy2,
- const gchar *string_argument);
+ G_GNUC_UNUSED guint64 dummy3, const gchar *string_argument);
static gint64 debugger_lookup_class (guint64 image_argument, G_GNUC_UNUSED guint64 dummy,
- gchar *full_name);
+ G_GNUC_UNUSED guint64 dummy2, gchar *full_name);
static guint64 debugger_insert_method_breakpoint (guint64 method_argument, guint64 index);
-static void debugger_remove_method_breakpoint (G_GNUC_UNUSED guint64 dummy, guint64 index);
-
-static void (*mono_debugger_notification_function) (guint64 command, guint64 data, guint64 data2);
+static guint64 debugger_insert_source_breakpoint (guint64 image_argument, guint64 token,
+ guint64 index, const gchar *class_name);
+static void debugger_remove_breakpoint (guint64 index, G_GNUC_UNUSED guint64 dummy);
+static guint64 debugger_register_class_init_callback (guint64 image_argument, guint64 token,
+ guint64 index, const gchar *class_name);
+static void debugger_remove_class_init_callback (guint64 index, G_GNUC_UNUSED guint64 dummy);
+static guint64 debugger_get_method_signature (guint64 argument1, G_GNUC_UNUSED guint64 argument2);
#define EXECUTABLE_CODE_BUFFER_SIZE 4096
static guint8 *debugger_executable_code_buffer = NULL;
+static GCThreadFunctions debugger_thread_vtable;
+
static MonoDebuggerMetadataInfo debugger_metadata_info = {
sizeof (MonoDebuggerMetadataInfo),
sizeof (MonoDefaults),
G_STRUCT_OFFSET (MonoVTable, vtable)
};
+extern void MONO_DEBUGGER__notification_function (guint64 command, guint64 data, guint64 data2);
+
/*
* This is a global data symbol which is read by the debugger.
*/
MonoDebuggerInfo MONO_DEBUGGER__debugger_info = {
MONO_DEBUGGER_MAGIC,
- MONO_DEBUGGER_VERSION,
+ MONO_DEBUGGER_MAJOR_VERSION,
+ MONO_DEBUGGER_MINOR_VERSION,
+ 0, /* dummy */
sizeof (MonoDebuggerInfo),
sizeof (MonoSymbolTable),
- 0,
- &mono_debugger_notification_function,
+ MONO_TRAMPOLINE_NUM,
mono_trampoline_code,
+ &MONO_DEBUGGER__notification_function,
&mono_symbol_table,
&debugger_metadata_info,
+ &mono_debug_debugger_version,
+
&debugger_compile_method,
&debugger_get_virtual_method,
&debugger_get_boxed_object,
&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,
+
&debugger_insert_method_breakpoint,
- &debugger_remove_method_breakpoint,
+ &debugger_insert_source_breakpoint,
+ &debugger_remove_breakpoint,
+
+ &debugger_register_class_init_callback,
+ &debugger_remove_class_init_callback,
- &mono_debug_debugger_version,
&mono_debugger_thread_table,
&debugger_executable_code_buffer,
- NULL, /* &_mono_debugger_breakpoint_info_area, */
- NULL, /* &mono_debugger_breakpoint_table, */
+ mono_breakpoint_info,
+ mono_breakpoint_info_index,
EXECUTABLE_CODE_BUFFER_SIZE,
- -1, /* MONO_DEBUGGER_BREAKPOINT_TABLE_SIZE, */
+ MONO_BREAKPOINT_ARRAY_SIZE,
+
+ debugger_get_method_signature,
+ debugger_init_code_buffer,
+
+ &gc_thread_vtable,
+ &debugger_thread_vtable,
+
+ &mono_debugger_event_handler,
+ debugger_event_handler,
+
+ &_mono_debug_using_mono_debugger,
+ (gint32*)&_mono_debugger_interruption_request
};
static guint64
static guint64
debugger_create_string (G_GNUC_UNUSED guint64 dummy, G_GNUC_UNUSED guint64 dummy2,
- const gchar *string_argument)
+ G_GNUC_UNUSED guint64 dummy3, const gchar *string_argument)
{
return (guint64) (gsize) mono_string_new_wrapper (string_argument);
}
static gint64
debugger_lookup_class (guint64 image_argument, G_GNUC_UNUSED guint64 dummy,
- gchar *full_name)
+ G_GNUC_UNUSED guint64 dummy2, gchar *full_name)
{
MonoImage *image = (MonoImage *) GUINT_TO_POINTER ((gsize) image_argument);
gchar *name_space, *name, *pos;
return -1;
mono_class_init (klass);
+ mono_class_setup_methods (klass);
return (gint64) (gssize) klass;
}
if (method->klass->parent == mono_defaults.multicastdelegate_class) {
if (*name == 'I' && (strcmp (name, "Invoke") == 0))
- nm = mono_marshal_get_delegate_invoke (method);
+ nm = mono_marshal_get_delegate_invoke (method, NULL);
else if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0))
nm = mono_marshal_get_delegate_begin_invoke (method);
else if (*name == 'E' && (strcmp (name, "EndInvoke") == 0))
return (guint64) (gsize) info;
}
+static guint64
+debugger_insert_source_breakpoint (guint64 image_argument, guint64 token, guint64 index,
+ const gchar *class_name)
+{
+ MonoImage *image = GUINT_TO_POINTER ((gsize) image_argument);
+ MonoDebugMethodAddressList *info;
+ MonoClass *klass;
+ int i;
+
+ mono_debugger_lock ();
+
+ klass = mono_debugger_register_class_init_callback (image, class_name, token, index);
+ if (!klass || !klass->inited || !klass->methods) {
+ mono_debugger_unlock ();
+ return 0;
+ }
+
+ for (i = 0; i < klass->method.count; i++) {
+ MonoMethod *method = klass->methods [i];
+
+ if (method->token != token)
+ continue;
+
+ if (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
+ const char *name = method->name;
+ MonoMethod *nm = NULL;
+
+ if (method->klass->parent == mono_defaults.multicastdelegate_class) {
+ if (*name == 'I' && (strcmp (name, "Invoke") == 0))
+ nm = mono_marshal_get_delegate_invoke (method, NULL);
+ else if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0))
+ nm = mono_marshal_get_delegate_begin_invoke (method);
+ else if (*name == 'E' && (strcmp (name, "EndInvoke") == 0))
+ nm = mono_marshal_get_delegate_end_invoke (method);
+ }
+
+ if (!nm) {
+ mono_debugger_unlock ();
+ return 0;
+ }
+
+ method = nm;
+ }
+
+ info = mono_debug_lookup_method_addresses (method);
+ mono_debugger_unlock ();
+ return (guint64) (gsize) info;
+ }
+
+ mono_debugger_unlock ();
+ return 0;
+}
+
static void
-debugger_remove_method_breakpoint (G_GNUC_UNUSED guint64 dummy, guint64 index)
+debugger_remove_breakpoint (guint64 index, G_GNUC_UNUSED guint64 dummy)
{
mono_debugger_lock ();
mono_debugger_remove_method_breakpoint (index);
+ mono_debugger_remove_class_init_callback (index);
+ mono_debugger_unlock ();
+}
+
+static guint64
+debugger_register_class_init_callback (guint64 image_argument, guint64 token, guint64 index,
+ const gchar *class_name)
+{
+ MonoImage *image = GUINT_TO_POINTER ((gsize) image_argument);
+ MonoClass *klass;
+
+ mono_debugger_lock ();
+ klass = mono_debugger_register_class_init_callback (image, class_name, token, index);
+ mono_debugger_unlock ();
+ return (guint64) (gsize) klass;
+}
+
+static void
+debugger_remove_class_init_callback (guint64 index, G_GNUC_UNUSED guint64 dummy)
+{
+ mono_debugger_lock ();
+ mono_debugger_remove_class_init_callback (index);
mono_debugger_unlock ();
}
+static guint64
+debugger_get_method_signature (guint64 method_arg, G_GNUC_UNUSED guint64 dummy)
+{
+ MonoMethod *method = (MonoMethod *) GUINT_TO_POINTER ((gsize) method_arg);
+ MonoMethodSignature *sig;
+
+ sig = mono_method_signature (method);
+ return (guint64) (gsize) sig;
+}
+
static void
debugger_event_handler (MonoDebuggerEvent event, guint64 data, guint64 arg)
{
- mono_debugger_notification_function (event, data, arg);
+ MONO_DEBUGGER__notification_function (event, data, arg);
}
static void
static void
debugger_gc_stop_world (void)
{
- mono_debugger_event (
- MONO_DEBUGGER_EVENT_ACQUIRE_GLOBAL_THREAD_LOCK, 0, 0);
+ mono_debugger_event (MONO_DEBUGGER_EVENT_ACQUIRE_GLOBAL_THREAD_LOCK, 0, 0);
}
static void
debugger_gc_start_world (void)
{
- mono_debugger_event (
- MONO_DEBUGGER_EVENT_RELEASE_GLOBAL_THREAD_LOCK, 0, 0);
+ mono_debugger_event (MONO_DEBUGGER_EVENT_RELEASE_GLOBAL_THREAD_LOCK, 0, 0);
}
static GCThreadFunctions debugger_thread_vtable = {
gc_thread_vtable = &debugger_thread_vtable;
}
+#if 0
+
static void
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 ();
-}
+#endif
-static void
-debugger_detach (void)
+static guint64
+debugger_init_code_buffer (void)
{
- mono_debugger_event_handler = NULL;
- mono_debugger_notification_function = NULL;
- debugger_finalize_threads ();
+ if (!debugger_executable_code_buffer)
+ debugger_executable_code_buffer = mono_global_codeman_reserve (EXECUTABLE_CODE_BUFFER_SIZE);
+ return (guint64) (gsize) debugger_executable_code_buffer;
}
extern MonoDebuggerInfo *MONO_DEBUGGER__debugger_info_ptr;
void
mono_debugger_init (void)
{
- mono_debugger_notification_function = mono_debugger_create_notification_function ();
debugger_executable_code_buffer = mono_global_codeman_reserve (EXECUTABLE_CODE_BUFFER_SIZE);
mono_debugger_event_handler = debugger_event_handler;
* linker from removing the .mdb_debug_info section.
*/
- mono_debugger_notification_function (MONO_DEBUGGER_EVENT_INITIALIZE_THREAD_MANAGER,
- (guint64) (gssize) MONO_DEBUGGER__debugger_info_ptr, 0);
+ mono_debugger_event (MONO_DEBUGGER_EVENT_INITIALIZE_THREAD_MANAGER,
+ (guint64) (gssize) MONO_DEBUGGER__debugger_info_ptr, 0);
}
typedef struct
main_thread_handler (gpointer user_data)
{
MainThreadArgs *main_args = (MainThreadArgs *) user_data;
- int retval;
-
- mono_debugger_notification_function (MONO_DEBUGGER_EVENT_REACHED_MAIN,
- (guint64) (gsize) main_args->method, 0);
-
- retval = mono_runtime_run_main (main_args->method, main_args->argc, main_args->argv, NULL);
-
- /*
- * This will never return.
- */
- mono_debugger_notification_function (MONO_DEBUGGER_EVENT_MAIN_EXITED, 0,
- (guint64) (gsize) retval);
- return retval;
+ return mono_runtime_run_main (main_args->method, main_args->argc, main_args->argv, NULL);
}
int
/*
* Initialize managed code.
*/
- mono_debugger_notification_function (MONO_DEBUGGER_EVENT_INITIALIZE_MANAGED_CODE,
- (guint64) (gssize) main_method, 0);
+ mono_debugger_event (MONO_DEBUGGER_EVENT_INITIALIZE_MANAGED_CODE,
+ (guint64) (gssize) main_method, 0);
/*
* Start the main thread and wait until it's ready.
/*
* This will never return.
*/
- mono_debugger_notification_function (MONO_DEBUGGER_EVENT_WRAPPER_MAIN, 0, 0);
+ mono_debugger_event (MONO_DEBUGGER_EVENT_WRAPPER_MAIN, 0, 0);
return 0;
}
projects / mono.git / blobdiff