X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fxdebug.c;h=0e051966e126822f7121977b87b7aed82b1a2005;hb=85988f4de7356eff9a6da00764d73ce48da07448;hp=167b2b9e2b74b4702849aa58139508437c3ccfc8;hpb=d1ffd5a7944401adfbe1cdebbc87626a5ef0408a;p=mono.git

diff --git a/mono/mini/xdebug.c b/mono/mini/xdebug.c
index 167b2b9e2b7..0e051966e12 100644
--- a/mono/mini/xdebug.c
+++ b/mono/mini/xdebug.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include "mini.h"
 
-#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT)
+#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT) && USE_BIN_WRITER
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -158,15 +158,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);
 
 	/* 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,9 +177,9 @@ 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)
@@ -204,11 +204,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 */
@@ -290,7 +290,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
@@ -301,14 +302,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
 		
@@ -319,7 +320,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 ();