X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fxdebug.c;h=7d88f7da640f9ed10b62d915ac05ed5a81b6a4f2;hb=7263bfef5515646bdc0e0852157a4d4a86ce1d7a;hp=9e415ca339092ac0da6eb5ae8a14828f46e08217;hpb=f777bc37a485df19a4700d5c41e9e58bdfa2ef54;p=mono.git diff --git a/mono/mini/xdebug.c b/mono/mini/xdebug.c index 9e415ca3390..7d88f7da640 100644 --- a/mono/mini/xdebug.c +++ b/mono/mini/xdebug.c @@ -1,5 +1,6 @@ -/* - * xdebug.c: Support for emitting gdb debug info for JITted code. +/** + * \file + * Support for emitting gdb debug info for JITted code. * * Author: * Zoltan Varga (vargaz@gmail.com) @@ -27,7 +28,6 @@ #include #include "mini.h" -#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT) #include #ifdef HAVE_UNISTD_H #include @@ -49,8 +49,13 @@ #include #include "image-writer.h" + +#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT) && USE_BIN_WRITER + #include "dwarfwriter.h" +#include "mono/utils/mono-compiler.h" + #define USE_GDB_JIT_INTERFACE /* The recommended gdb macro is: */ @@ -95,15 +100,8 @@ struct jit_descriptor struct jit_code_entry *first_entry; }; - -#ifdef _MSC_VER -#define MONO_NOINLINE __declspec (noinline) -#else -#define MONO_NOINLINE __attribute__((noinline)) -#endif - /* GDB puts a breakpoint in this function. */ -void MONO_NOINLINE __jit_debug_register_code(void); +void MONO_NEVER_INLINE __jit_debug_register_code(void); #if !defined(MONO_LLVM_LOADED) && defined(ENABLE_LLVM) && !defined(MONO_CROSS_COMPILE) @@ -114,7 +112,7 @@ extern struct jit_descriptor __jit_debug_descriptor; #else /* gcc seems to inline/eliminate calls to noinline functions, thus the asm () */ -void MONO_NOINLINE __jit_debug_register_code(void) { +void MONO_NEVER_INLINE __jit_debug_register_code(void) { #if defined(__GNUC__) asm (""); #endif @@ -163,15 +161,15 @@ mono_xdebug_init (const char *options) unlink ("xdb.s"); xdebug_fp = fopen ("xdb.s", "w"); - w = img_writer_create (xdebug_fp, FALSE); + w = mono_img_writer_create (xdebug_fp, FALSE); - img_writer_emit_start (w); + mono_img_writer_emit_start (w); - xdebug_writer = mono_dwarf_writer_create (w, il_file, 0, TRUE, TRUE); + xdebug_writer = mono_dwarf_writer_create (w, il_file, 0, TRUE); /* Emit something so the file has a text segment */ - img_writer_emit_section_change (w, ".text", 0); - img_writer_emit_string (w, ""); + mono_img_writer_emit_section_change (w, ".text", 0); + mono_img_writer_emit_string (w, ""); mono_dwarf_writer_emit_base_info (xdebug_writer, "JITted code", mono_unwind_get_cie_program ()); } @@ -182,15 +180,15 @@ xdebug_begin_emit (MonoImageWriter **out_w, MonoDwarfWriter **out_dw) MonoImageWriter *w; MonoDwarfWriter *dw; - w = img_writer_create (NULL, TRUE); + w = mono_img_writer_create (NULL, TRUE); - img_writer_emit_start (w); + mono_img_writer_emit_start (w); /* This file will contain the IL code for methods which don't have debug info */ if (!il_file) il_file = fopen ("xdb.il", "w"); - dw = mono_dwarf_writer_create (w, il_file, il_file_line_index, FALSE, TRUE); + dw = mono_dwarf_writer_create (w, il_file, il_file_line_index, TRUE); mono_dwarf_writer_emit_base_info (dw, "JITted code", mono_unwind_get_cie_program ()); @@ -209,11 +207,11 @@ xdebug_end_emit (MonoImageWriter *w, MonoDwarfWriter *dw, MonoMethod *method) il_file_line_index = mono_dwarf_writer_get_il_file_line_index (dw); mono_dwarf_writer_close (dw); - img_writer_emit_writeout (w); + mono_img_writer_emit_writeout (w); - img = img_writer_get_output (w, &img_size); + img = mono_img_writer_get_output (w, &img_size); - img_writer_destroy (w); + mono_img_writer_destroy (w); if (FALSE) { /* Save the symbol files to help debugging */ @@ -295,7 +293,8 @@ mono_save_xdebug_info (MonoCompile *cfg) xdebug_method_count ++; dmji = mono_debug_find_method (jinfo_get_method (cfg->jit_info), mono_domain_get ());; - mono_dwarf_writer_emit_method (xdebug_writer, cfg, jinfo_get_method (cfg->jit_info), NULL, NULL, cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, dmji); + mono_dwarf_writer_emit_method (xdebug_writer, cfg, jinfo_get_method (cfg->jit_info), NULL, NULL, NULL, + cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, dmji); mono_debug_free_method_jit_info (dmji); #if 0 @@ -306,14 +305,14 @@ mono_save_xdebug_info (MonoCompile *cfg) * FIXME: This doesn't work when multiple methods are emitted into the same file. */ sym = get_debug_sym (cfg->jit_info->method, "", xdebug_syms); - img_writer_emit_section_change (w, ".text", 0); + mono_img_writer_emit_section_change (w, ".text", 0); if (!xdebug_text_addr) { xdebug_text_addr = cfg->jit_info->code_start; - img_writer_set_section_addr (w, (gssize)xdebug_text_addr); + mono_img_writer_set_section_addr (w, (gssize)xdebug_text_addr); } - img_writer_emit_global_with_size (w, sym, cfg->jit_info->code_size, TRUE); - img_writer_emit_label (w, sym); - img_writer_emit_bytes (w, cfg->jit_info->code_start, cfg->jit_info->code_size); + mono_img_writer_emit_global_with_size (w, sym, cfg->jit_info->code_size, TRUE); + mono_img_writer_emit_label (w, sym); + mono_img_writer_emit_bytes (w, cfg->jit_info->code_start, cfg->jit_info->code_size); g_free (sym); #endif @@ -324,7 +323,8 @@ mono_save_xdebug_info (MonoCompile *cfg) mono_loader_lock (); dmji = mono_debug_find_method (jinfo_get_method (cfg->jit_info), mono_domain_get ()); - mono_dwarf_writer_emit_method (xdebug_writer, cfg, jinfo_get_method (cfg->jit_info), NULL, NULL, cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, dmji); + mono_dwarf_writer_emit_method (xdebug_writer, cfg, jinfo_get_method (cfg->jit_info), NULL, NULL, NULL, + cfg->jit_info->code_start, cfg->jit_info->code_size, cfg->args, cfg->locals, cfg->unwind_ops, dmji); mono_debug_free_method_jit_info (dmji); fflush (xdebug_fp); mono_loader_unlock (); @@ -341,6 +341,10 @@ mono_save_xdebug_info (MonoCompile *cfg) void mono_save_trampoline_xdebug_info (MonoTrampInfo *info) { + const char *info_name = info->name; + if (info_name == NULL) + info_name = ""; + if (use_gdb_interface) { MonoImageWriter *w; MonoDwarfWriter *dw; @@ -350,7 +354,7 @@ mono_save_trampoline_xdebug_info (MonoTrampInfo *info) xdebug_begin_emit (&w, &dw); - mono_dwarf_writer_emit_trampoline (dw, info->name, NULL, NULL, info->code, info->code_size, info->unwind_ops); + mono_dwarf_writer_emit_trampoline (dw, info_name, NULL, NULL, info->code, info->code_size, info->unwind_ops); xdebug_end_emit (w, dw, NULL); @@ -360,7 +364,7 @@ mono_save_trampoline_xdebug_info (MonoTrampInfo *info) return; mono_loader_lock_if_inited (); - mono_dwarf_writer_emit_trampoline (xdebug_writer, info->name, NULL, NULL, info->code, info->code_size, info->unwind_ops); + mono_dwarf_writer_emit_trampoline (xdebug_writer, info_name, NULL, NULL, info->code, info->code_size, info->unwind_ops); fflush (xdebug_fp); mono_loader_unlock_if_inited (); }