2005-01-05 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mono/mini/debug-mini.c b/mono/mini/debug-mini.c
index 7fc906898c670948c7a35d051d0de6e695efb786..e408d3d77b00622b3fc376fcf15b7bacb5c89bee 100644 (file)
--- a/mono/mini/debug-mini.c
+++ b/mono/mini/debug-mini.c
@@ -26,8 +26,8 @@ record_line_number (MonoDebugMethodJitInfo *jit, guint32 address, guint32 offset
 {
        MonoDebugLineNumberEntry lne;
 
-       lne.address = address;
-       lne.offset = offset;
+       lne.native_offset = address;
+       lne.il_offset = offset;
 
        g_array_append_val (jit->line_numbers, lne);
 }
@@ -51,8 +51,10 @@ mono_debug_init_method (MonoCompile *cfg, MonoBasicBlock *start_block, guint32 b
        if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
            (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
            (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
-           (method->flags & METHOD_ATTRIBUTE_ABSTRACT) ||
-           (method->wrapper_type != MONO_WRAPPER_NONE))
+           (method->flags & METHOD_ATTRIBUTE_ABSTRACT))
+               return;
+       if ((method->wrapper_type != MONO_WRAPPER_NONE) &&
+           (method->wrapper_type != MONO_WRAPPER_MANAGED_TO_NATIVE))
                return;
 
        info = g_new0 (MiniDebugMethodInfo, 1);
@@ -74,9 +76,9 @@ mono_debug_open_method (MonoCompile *cfg)
 
        mono_class_init (cfg->method->klass);
 
-       g_assert (((MonoMethodNormal*)cfg->method)->header);
-       header = ((MonoMethodNormal*)cfg->method)->header;
-
+       header = mono_method_get_header (cfg->method);
+       g_assert (header);
+       
        info->jit = jit = g_new0 (MonoDebugMethodJitInfo, 1);
        jit->line_numbers = g_array_new (FALSE, TRUE, sizeof (MonoDebugLineNumberEntry));
        jit->num_locals = header->num_locals;
@@ -115,7 +117,7 @@ mono_debug_add_vg_method (MonoMethod *method, MonoDebugMethodJitInfo *jit)
        if (!RUNNING_ON_VALGRIND)
                return;
 
-       header = ((MonoMethodNormal*)method)->header;
+       header = mono_method_get_header (method);
 
        full_name = mono_method_full_name (method, TRUE);
 
@@ -200,7 +202,7 @@ mono_debug_close_method (MonoCompile *cfg)
                return;
 
        method = cfg->method;
-       header = ((MonoMethodNormal*)method)->header;
+       header = mono_method_get_header (method);
 
        jit = info->jit;
        jit->code_start = cfg->native_code;
@@ -242,8 +244,8 @@ mono_debug_record_line_number (MonoCompile *cfg, MonoInst *ins, guint32 address)
        if (!info || !info->jit || !ins->cil_code)
                return;
 
-       g_assert (((MonoMethodNormal*)cfg->method)->header);
-       header = ((MonoMethodNormal*)cfg->method)->header;
+       header = mono_method_get_header (cfg->method);
+       g_assert (header);
 
        if ((ins->cil_code < header->code) ||
            (ins->cil_code > header->code + header->code_size))
@@ -271,7 +273,7 @@ encode_value (gint32 value, char *buf, char **endbuf)
         */
        if ((value >= 0) && (value <= 127))
                *p++ = value;
-       else if ((value >= 0) && (value <= 16384)) {
+       else if ((value >= 0) && (value <= 16383)) {
                p [0] = 0x80 | (value >> 8);
                p [1] = value & 0xff;
                p += 2;
@@ -386,10 +388,10 @@ mono_debug_serialize_debug_info (MonoCompile *cfg,
                MonoDebugLineNumberEntry *lne = &g_array_index (jit->line_numbers, 
                                                                                                                MonoDebugLineNumberEntry,
                                                                                                                i);
-               encode_value (lne->offset - prev_offset, p, &p);
-               encode_value (lne->address - prev_native_offset, p, &p);
-               prev_offset = lne->offset;
-               prev_native_offset = lne->address;
+               encode_value (lne->il_offset - prev_offset, p, &p);
+               encode_value (lne->native_offset - prev_native_offset, p, &p);
+               prev_offset = lne->il_offset;
+               prev_native_offset = lne->native_offset;
        }
 
        g_assert (p - buf < size);
@@ -430,8 +432,8 @@ deserialize_debug_info (MonoMethod *method,
        char *p;
        int i;
 
-       g_assert (((MonoMethodNormal*)method)->header);
-       header = ((MonoMethodNormal*)method)->header;
+       header = mono_method_get_header (method);
+       g_assert (header);
 
        jit = g_new0 (MonoDebugMethodJitInfo, 1);
        jit->code_start = code_start;
@@ -528,3 +530,12 @@ mono_init_debugger (const char *file, const char *opt_flags)
 
        return domain;
 }
+
+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->func, mono_get_root_domain ());
+}