#define _IN_THE_MONO_DEBUGGER
#include <mono/metadata/mono-debug-debugger.h>
-#include "debug-mini.h"
-#ifdef HAVE_VALGRIND_H
-#include <valgrind/valgrind.h>
-#endif
-
-#ifdef MONO_DEBUGGER_SUPPORTED
-#include <libgc/include/libgc-mono-debugger.h>
-#endif
+#include <mono/utils/valgrind.h>
typedef struct {
guint32 index;
guint32 breakpoint_id;
} MiniDebugMethodInfo;
-struct _MonoDebuggerThreadInfo {
- guint64 tid;
- guint64 lmf_addr;
- guint64 end_stack;
-
- guint64 extended_notifications;
-
- /* Next pointer. */
- MonoDebuggerThreadInfo *next;
-
- /*
- * The stack bounds are only used when reading a core file.
- */
- guint64 stack_start;
- guint64 signal_stack_start;
- guint32 stack_size;
- guint32 signal_stack_size;
-
- /*
- * The debugger doesn't access anything beyond this point.
- */
- MonoJitTlsData *jit_tls;
- MonoThread *thread;
-};
-
-MonoDebuggerThreadInfo *mono_debugger_thread_table = NULL;
-
static inline void
record_line_number (MiniDebugMethodInfo *info, guint32 address, guint32 offset)
{
{
MiniDebugMethodInfo *info;
- if (mono_debug_format == MONO_DEBUG_FORMAT_NONE)
+ if (!mono_debug_enabled ())
return;
info = g_new0 (MiniDebugMethodInfo, 1);
mono_class_init (cfg->method->klass);
- header = mono_method_get_header (cfg->method);
+ header = cfg->header;
g_assert (header);
info->jit = jit = g_new0 (MonoDebugMethodJitInfo, 1);
var->index = inst->dreg | MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER;
else if (inst->flags & MONO_INST_IS_DEAD)
var->index = MONO_DEBUG_VAR_ADDRESS_MODE_DEAD;
- else {
+ else if (inst->opcode == OP_REGOFFSET) {
/* the debug interface needs fixing to allow 0(%base) address */
var->index = inst->inst_basereg | MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET;
var->offset = inst->inst_offset;
+ } else if (inst->opcode == OP_GSHAREDVT_ARG_REGOFFSET) {
+ var->index = inst->inst_basereg | MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET_INDIR;
+ var->offset = inst->inst_offset;
+ } else if (inst->opcode == OP_GSHAREDVT_LOCAL) {
+ var->index = inst->inst_imm | MONO_DEBUG_VAR_ADDRESS_MODE_GSHAREDVT_LOCAL;
+ } else if (inst->opcode == OP_VTARG_ADDR) {
+ MonoInst *vtaddr;
+
+ vtaddr = inst->inst_left;
+ g_assert (vtaddr->opcode == OP_REGOFFSET);
+ var->offset = vtaddr->inst_offset;
+ var->index = vtaddr->inst_basereg | MONO_DEBUG_VAR_ADDRESS_MODE_VTADDR;
+ } else {
+ g_assert_not_reached ();
}
}
g_free (addresses);
g_free (lines);
+ mono_metadata_free_mh (header);
#endif /* VALGRIND_ADD_LINE_INFO */
}
}
method = cfg->method;
- header = mono_method_get_header (method);
+ header = cfg->header;
sig = mono_method_signature (method);
jit = info->jit;
for (i = 0; i < jit->num_params; i++)
write_variable (cfg->args [i + sig->hasthis], &jit->params [i]);
+ if (cfg->gsharedvt_info_var) {
+ jit->gsharedvt_info_var = g_new0 (MonoDebugVarInfo, 1);
+ jit->gsharedvt_locals_var = g_new0 (MonoDebugVarInfo, 1);
+ write_variable (cfg->gsharedvt_info_var, jit->gsharedvt_info_var);
+ write_variable (cfg->gsharedvt_locals_var, jit->gsharedvt_locals_var);
+ }
+
jit->num_line_numbers = info->line_numbers->len;
jit->line_numbers = g_new0 (MonoDebugLineNumberEntry, jit->num_line_numbers);
for (i = 0; i < jit->num_line_numbers; i++)
jit->line_numbers [i] = g_array_index (info->line_numbers, MonoDebugLineNumberEntry, i);
- debug_info = mono_debug_add_method (method, jit, cfg->domain);
+ debug_info = mono_debug_add_method (cfg->method_to_register, jit, cfg->domain);
mono_debug_add_vg_method (method, jit);
- if (info->breakpoint_id)
- mono_debugger_breakpoint_callback (method, info->breakpoint_id);
+ mono_debug_free_method_jit_info (jit);
+ mono_debug_free_method (cfg);
+}
- mono_debugger_check_breakpoints (method, debug_info);
+void
+mono_debug_free_method (MonoCompile *cfg)
+{
+ MiniDebugMethodInfo *info;
- mono_debug_free_method_jit_info (jit);
- g_array_free (info->line_numbers, TRUE);
- g_free (info);
+ info = (MiniDebugMethodInfo *) cfg->debug_info;
+ if (info) {
+ if (info->line_numbers)
+ g_array_free (info->line_numbers, TRUE);
+ g_free (info);
+ cfg->debug_info = NULL;
+ }
}
void
if (!info || !info->jit || !ins->cil_code)
return;
- header = mono_method_get_header (cfg->method);
+ header = cfg->header;
g_assert (header);
if ((ins->cil_code < header->code) ||
if (!info || !info->jit || !bb->cil_code)
return;
- header = mono_method_get_header (cfg->method);
+ header = cfg->header;
g_assert (header);
if ((bb->cil_code < header->code) ||
case MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER:
break;
case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET:
+ case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET_INDIR:
encode_value (var->offset, p, &p);
break;
+ case MONO_DEBUG_VAR_ADDRESS_MODE_GSHAREDVT_LOCAL:
+ case MONO_DEBUG_VAR_ADDRESS_MODE_VTADDR:
case MONO_DEBUG_VAR_ADDRESS_MODE_DEAD:
break;
default:
for (i = 0; i < jit->num_locals; i++)
serialize_variable (&jit->locals [i], p, &p);
+ if (jit->gsharedvt_info_var) {
+ encode_value (1, p, &p);
+ serialize_variable (jit->gsharedvt_info_var, p, &p);
+ serialize_variable (jit->gsharedvt_locals_var, p, &p);
+ } else {
+ encode_value (0, p, &p);
+ }
+
encode_value (jit->num_line_numbers, p, &p);
prev_offset = 0;
case MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER:
break;
case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET:
+ case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET_INDIR:
var->offset = decode_value (p, &p);
break;
+ case MONO_DEBUG_VAR_ADDRESS_MODE_GSHAREDVT_LOCAL:
+ case MONO_DEBUG_VAR_ADDRESS_MODE_VTADDR:
case MONO_DEBUG_VAR_ADDRESS_MODE_DEAD:
break;
default:
for (i = 0; i < jit->num_locals; i++)
deserialize_variable (&jit->locals [i], p, &p);
+ if (decode_value (p, &p)) {
+ jit->gsharedvt_info_var = g_new0 (MonoDebugVarInfo, 1);
+ jit->gsharedvt_locals_var = g_new0 (MonoDebugVarInfo, 1);
+ deserialize_variable (jit->gsharedvt_info_var, p, &p);
+ deserialize_variable (jit->gsharedvt_locals_var, p, &p);
+ }
+
jit->num_line_numbers = decode_value (p, &p);
jit->line_numbers = g_new0 (MonoDebugLineNumberEntry, jit->num_line_numbers);
prev_native_offset = native_offset;
}
+ mono_metadata_free_mh (header);
return jit;
}
{
MonoDebugMethodJitInfo *jit;
- if (mono_debug_format == MONO_DEBUG_FORMAT_NONE)
+ if (!mono_debug_enabled ())
return;
if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
mono_debug_free_method_jit_info (jit);
}
-void
-mono_debug_add_icall_wrapper (MonoMethod *method, MonoJitICallInfo* callinfo)
-{
- if (mono_debug_format == MONO_DEBUG_FORMAT_NONE)
- return;
-
- // mono_debug_add_wrapper (method, callinfo->wrapper, callinfo->func);
-}
-
static void
print_var_info (MonoDebugVarInfo *info, int idx, const char *name, const char *type)
{
case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET:
g_print ("%s %s (%d) in memory: base register %s + %d\n", type, name, idx, mono_arch_regname (info->index & (~MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS)), info->offset);
break;
+ case MONO_DEBUG_VAR_ADDRESS_MODE_REGOFFSET_INDIR:
+ g_print ("%s %s (%d) in indir memory: base register %s + %d\n", type, name, idx, mono_arch_regname (info->index & (~MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS)), info->offset);
+ break;
+ case MONO_DEBUG_VAR_ADDRESS_MODE_GSHAREDVT_LOCAL:
+ g_print ("%s %s (%d) gsharedvt local.\n", type, name, idx);
+ break;
+ case MONO_DEBUG_VAR_ADDRESS_MODE_VTADDR:
+ g_print ("%s %s (%d) vt address: base register %s + %d\n", type, name, idx, mono_arch_regname (info->index & (~MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS)), info->offset);
+ break;
case MONO_DEBUG_VAR_ADDRESS_MODE_TWO_REGISTERS:
default:
g_assert_not_reached ();
if (!ji)
return;
- jit = mono_debug_find_method (mono_jit_info_get_method (ji), domain);
+ jit = mono_debug_find_method (jinfo_get_method (ji), domain);
if (!jit)
return;
if (only_arguments) {
char **names;
names = g_new (char *, jit->num_params);
- mono_method_get_param_names (mono_jit_info_get_method (ji), (const char **) names);
+ mono_method_get_param_names (jinfo_get_method (ji), (const char **) names);
if (jit->this_var)
print_var_info (jit->this_var, 0, "this", "Arg");
for (i = 0; i < jit->num_params; ++i) {
static GPtrArray *breakpoints = NULL;
-int
+static int
mono_debugger_insert_breakpoint_full (MonoMethodDesc *desc)
{
static int last_breakpoint_id = 0;
return info->index;
}
-int
-mono_debugger_remove_breakpoint (int breakpoint_id)
-{
- int i;
-
- if (!breakpoints)
- return 0;
-
- for (i = 0; i < breakpoints->len; i++) {
- MiniDebugBreakpointInfo *info = g_ptr_array_index (breakpoints, i);
-
- if (info->index != breakpoint_id)
- continue;
-
- mono_method_desc_free (info->desc);
- g_ptr_array_remove (breakpoints, info);
- g_free (info);
- return 1;
- }
-
- return 0;
-}
-
+/*FIXME This is part of the public API by accident, remove it from there when possible. */
int
mono_debugger_insert_breakpoint (const gchar *method_name, gboolean include_namespace)
{
return mono_debugger_insert_breakpoint_full (desc);
}
+/*FIXME This is part of the public API by accident, remove it from there when possible. */
int
mono_debugger_method_has_breakpoint (MonoMethod *method)
{
int i;
- if (!breakpoints || (method->wrapper_type != MONO_WRAPPER_NONE))
+ if (!breakpoints)
return 0;
for (i = 0; i < breakpoints->len; i++) {
return 0;
}
-
-void
-mono_debugger_breakpoint_callback (MonoMethod *method, guint32 index)
-{
- mono_debugger_event (MONO_DEBUGGER_EVENT_JIT_BREAKPOINT, (guint64) (gsize) method, index);
-}
-
-void
-mono_debugger_thread_created (gsize tid, MonoThread *thread, MonoJitTlsData *jit_tls)
-{
-#ifdef MONO_DEBUGGER_SUPPORTED
- size_t stsize = 0;
- guint8 *staddr = NULL;
- MonoDebuggerThreadInfo *info;
-
- if (mono_debug_format == MONO_DEBUG_FORMAT_NONE)
- return;
-
- mono_debugger_lock ();
-
- mono_thread_get_stack_bounds (&staddr, &stsize);
-
- info = g_new0 (MonoDebuggerThreadInfo, 1);
- info->tid = tid;
- info->thread = thread;
- info->stack_start = (guint64) (gsize) staddr;
- info->signal_stack_start = (guint64) (gsize) jit_tls->signal_stack;
- info->stack_size = stsize;
- info->signal_stack_size = jit_tls->signal_stack_size;
- info->end_stack = (guint64) (gsize) GC_mono_debugger_get_stack_ptr ();
- info->lmf_addr = (guint64) (gsize) mono_get_lmf_addr ();
- info->jit_tls = jit_tls;
-
- info->next = mono_debugger_thread_table;
- mono_debugger_thread_table = info;
-
- mono_debugger_event (MONO_DEBUGGER_EVENT_THREAD_CREATED,
- tid, (guint64) (gsize) info);
-
- mono_debugger_unlock ();
-#endif /* MONO_DEBUGGER_SUPPORTED */
-}
-
-void
-mono_debugger_thread_cleanup (MonoJitTlsData *jit_tls)
-{
-#ifdef MONO_DEBUGGER_SUPPORTED
- MonoDebuggerThreadInfo **ptr;
-
- if (mono_debug_format == MONO_DEBUG_FORMAT_NONE)
- return;
-
- mono_debugger_lock ();
-
- for (ptr = &mono_debugger_thread_table; *ptr; ptr = &(*ptr)->next) {
- MonoDebuggerThreadInfo *info = *ptr;
-
- if (info->jit_tls != jit_tls)
- continue;
-
- mono_debugger_event (MONO_DEBUGGER_EVENT_THREAD_CLEANUP,
- info->tid, (guint64) (gsize) info);
-
- *ptr = info->next;
- g_free (info);
- break;
- }
-
- mono_debugger_unlock ();
-#endif
-}
-
-void
-mono_debugger_extended_notification (MonoDebuggerEvent event, guint64 data, guint64 arg)
-{
-#ifdef MONO_DEBUGGER_SUPPORTED
- MonoDebuggerThreadInfo **ptr;
- MonoThread *thread = mono_thread_current ();
-
- if (!mono_debug_using_mono_debugger ())
- return;
-
- mono_debugger_lock ();
-
- for (ptr = &mono_debugger_thread_table; *ptr; ptr = &(*ptr)->next) {
- MonoDebuggerThreadInfo *info = *ptr;
-
- if (info->thread != thread)
- continue;
-
- if ((info->extended_notifications & (int) event) == 0)
- continue;
-
- mono_debugger_event (event, data, arg);
- }
-
- mono_debugger_unlock ();
-#endif
-}
-
-void
-mono_debugger_trampoline_compiled (MonoMethod *method, const guint8 *code)
-{
- mono_debugger_extended_notification (MONO_DEBUGGER_EVENT_TRAMPOLINE,
- (guint64) (gsize) method, (guint64) (gsize) code);
-}
projects / mono.git / blobdiff