[runtime] Centralize the processing of MonoTrampInfo structures into the mono_tramp_i...

[mono.git] / mono / mini / debug-debugger.c

diff --git a/mono/mini/debug-debugger.c b/mono/mini/debug-debugger.c
index b76d4d52a2ca5b57ca2dc56ed692967c7cb07a12..a103595c0bf72426da06cef43e283fb219b22e1a 100644 (file)
--- a/mono/mini/debug-debugger.c
+++ b/mono/mini/debug-debugger.c
@@ -1,3 +1,12 @@
+/*
+ * debug-debugger.c: Hard debugger support (mdb)
+ *
+ * Author:
+ *
+ * Copyright 2006-2010 Novell, Inc.
+ */
+#if MONO_DEBUGGER_SUPPORTED
+
 #include <config.h>
 #include <mono/io-layer/io-layer.h>
 #include <mono/metadata/threads.h>
@@ -20,10 +29,8 @@
  * configure.in checks whether we're using the included libgc and disables the debugger if not.
  */
 
-#if !defined(MONO_DEBUGGER_SUPPORTED)
-#error "Some clown tried to compile debug-debugger.c on an unsupported platform - fix Makefile.am!"
-#elif !defined(USE_INCLUDED_LIBGC)
-#error "Some clown #defined MONO_DEBUGGER_SUPPORTED without USE_INCLUDED_GC - fix configure.in!"
+#if !defined(USE_INCLUDED_LIBGC)
+#error "Inconsistency detected: #defined MONO_DEBUGGER_SUPPORTED without USE_INCLUDED_GC - fix configure.in!"
 #endif
 
 static guint64 debugger_compile_method (guint64 method_arg);
@@ -50,22 +57,26 @@ static guint64 debugger_register_class_init_callback (guint64 image_argument, gu
 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);
 
+static guint64 debugger_abort_runtime_invoke (G_GNUC_UNUSED guint64 dummy1, G_GNUC_UNUSED guint64 dummy2);
+
 #define EXECUTABLE_CODE_BUFFER_SIZE 4096
 static guint8 *debugger_executable_code_buffer = NULL;
 
 static GCThreadFunctions debugger_thread_vtable;
 
+static guint32 debugger_thread_abort_signal = 0;
+
 static MonoDebuggerMetadataInfo debugger_metadata_info = {
        sizeof (MonoDebuggerMetadataInfo),
        sizeof (MonoDefaults),
        &mono_defaults,
-       sizeof (MonoType),
+       MONO_SIZEOF_TYPE,
        sizeof (MonoArrayType),
        sizeof (MonoClass),
-       sizeof (MonoThread),
-       G_STRUCT_OFFSET (MonoThread, tid),
-       G_STRUCT_OFFSET (MonoThread, stack_ptr),
-       G_STRUCT_OFFSET (MonoThread, end_stack),
+       sizeof (MonoInternalThread),
+       G_STRUCT_OFFSET (MonoInternalThread, tid),
+       G_STRUCT_OFFSET (MonoInternalThread, stack_ptr),
+       G_STRUCT_OFFSET (MonoInternalThread, end_stack),
        G_STRUCT_OFFSET (MonoClass, image),
        G_STRUCT_OFFSET (MonoClass, instance_size),
        G_STRUCT_OFFSET (MonoClass, parent),
@@ -120,7 +131,7 @@ MonoDebuggerInfo MONO_DEBUGGER__debugger_info = {
        MONO_DEBUGGER_MAGIC,
        MONO_DEBUGGER_MAJOR_VERSION,
        MONO_DEBUGGER_MINOR_VERSION,
-       0, /* dummy */
+       0, /* runtime_flags */
        sizeof (MonoDebuggerInfo),
        sizeof (MonoSymbolTable),
        MONO_TRAMPOLINE_NUM,
@@ -167,9 +178,19 @@ MonoDebuggerInfo MONO_DEBUGGER__debugger_info = {
        debugger_event_handler,
 
        &_mono_debug_using_mono_debugger,
-       (gint32*)&_mono_debugger_interruption_request
+       (gint32*)&_mono_debugger_interruption_request,
+
+       &debugger_abort_runtime_invoke,
+
+       &debugger_thread_abort_signal
 };
 
+static guint64
+debugger_abort_runtime_invoke (G_GNUC_UNUSED guint64 dummy1, G_GNUC_UNUSED guint64 dummy2)
+{
+       return mono_debugger_abort_runtime_invoke ();
+}
+
 static guint64
 debugger_compile_method (guint64 method_arg)
 {
@@ -456,18 +477,49 @@ debugger_init_code_buffer (void)
 }
 
 extern MonoDebuggerInfo *MONO_DEBUGGER__debugger_info_ptr;
+extern long MONO_DEBUGGER__using_debugger;
 
 static void
 debugger_initialize (void)
 {
 }
 
+/**
+ * Check whether we're running inside the debugger.
+ *
+ * There seems to be a bug in some versions of glibc which causes _dl_debug_state() being called with
+ * RT_CONSISTENT before relocations are done.
+ *
+ * If that happens, the debugger cannot read the `MONO_DEBUGGER__debugger_info' structure at the time
+ * the `libmono.so' library is loaded.
+ *
+ * As a workaround, the `mdb_debug_info' now also contains a global variable called
+ * `MONO_DEBUGGER__using_debugger' which may we set to 1 by the debugger to tell us that we're running
+ * inside the debugger.
+ *
+ * mini_init() checks this and calls mini_debugger_init() if necessary.
+ *
+ */
+
+gboolean
+mini_debug_running_inside_mdb (void)
+{
+       return MONO_DEBUGGER__using_debugger || mono_debug_using_mono_debugger ();
+}
+
 void
-mono_debugger_init (void)
+mini_debugger_init (void)
 {
+       if (mono_debugger_event_handler) {
+               g_warning (G_STRLOC ": duplicate call to mono_debugger_init()!");
+               return;
+       }
+
        debugger_executable_code_buffer = mono_global_codeman_reserve (EXECUTABLE_CODE_BUFFER_SIZE);
        mono_debugger_event_handler = debugger_event_handler;
 
+       debugger_thread_abort_signal = mono_thread_get_abort_signal ();
+
        /*
         * Use an indirect call so gcc can't optimize it away.
         */
@@ -486,6 +538,13 @@ mono_debugger_init (void)
                             (guint64) (gssize) MONO_DEBUGGER__debugger_info_ptr, 0);
 }
 
+void
+mini_debugger_set_attach_ok (void)
+{
+       debugger_thread_abort_signal = mono_thread_get_abort_signal ();
+       MONO_DEBUGGER__debugger_info.runtime_flags |= DEBUGGER_RUNTIME_FLAGS_ATTACH_OK;
+}
+
 typedef struct 
 {
        MonoDomain *domain;
@@ -509,7 +568,7 @@ main_thread_handler (gpointer user_data)
 }
 
 int
-mono_debugger_main (MonoDomain *domain, MonoAssembly *assembly, int argc, char **argv)
+mini_debugger_main (MonoDomain *domain, MonoAssembly *assembly, int argc, char **argv)
 {
        MainThreadArgs main_args;
        MonoImage *image;
@@ -552,3 +611,4 @@ mono_debugger_main (MonoDomain *domain, MonoAssembly *assembly, int argc, char *
 
        return 0;
 }
+#endif /* MONO_DEBUGGER_SUPPORTED */