Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / mini / xdebug.c

diff --git a/mono/mini/xdebug.c b/mono/mini/xdebug.c
index 10f73decb3863798827d05d44d27240e835fde05..7d88f7da640f9ed10b62d915ac05ed5a81b6a4f2 100644 (file)
--- 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 <glib.h>
 #include "mini.h"
 
-#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT)
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -49,6 +49,9 @@
 #include <sys/stat.h>
 
 #include "image-writer.h"
+
+#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT) && USE_BIN_WRITER
+
 #include "dwarfwriter.h"
 
 #include "mono/utils/mono-compiler.h"
@@ -158,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 ());
 }
@@ -177,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 ());
 
@@ -204,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 */
@@ -302,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
                
@@ -338,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;
@@ -347,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);
                
@@ -357,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 ();
        }