X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fxdebug.c;h=167b2b9e2b74b4702849aa58139508437c3ccfc8;hb=204053720318b1d270e4e3529d742f8fcb7231f7;hp=1166d803f58cdeaa42c707bbfc7cf18c567dabc1;hpb=87f80d1139d559d7883da118f1ee2951b0e06856;p=mono.git

diff --git a/mono/mini/xdebug.c b/mono/mini/xdebug.c
index 1166d803f58..167b2b9e2b7 100644
--- a/mono/mini/xdebug.c
+++ b/mono/mini/xdebug.c
@@ -51,6 +51,8 @@
 #include "image-writer.h"
 #include "dwarfwriter.h"
 
+#include "mono/utils/mono-compiler.h"
+
 #define USE_GDB_JIT_INTERFACE
 
 /* The recommended gdb macro is: */
@@ -95,15 +97,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 +109,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
@@ -173,7 +168,7 @@ mono_xdebug_init (const char *options)
 	img_writer_emit_section_change (w, ".text", 0);
 	img_writer_emit_string (w, "");
 
-	mono_dwarf_writer_emit_base_info (xdebug_writer, mono_unwind_get_cie_program ());
+	mono_dwarf_writer_emit_base_info (xdebug_writer, "JITted code", mono_unwind_get_cie_program ());
 }
 
 static void
@@ -192,7 +187,7 @@ xdebug_begin_emit (MonoImageWriter **out_w, MonoDwarfWriter **out_dw)
 
 	dw = mono_dwarf_writer_create (w, il_file, il_file_line_index, FALSE, TRUE);
 
-	mono_dwarf_writer_emit_base_info (dw, mono_unwind_get_cie_program ());
+	mono_dwarf_writer_emit_base_info (dw, "JITted code", mono_unwind_get_cie_program ());
 
 	*out_w = w;
 	*out_dw = dw;
@@ -341,8 +336,6 @@ mono_save_xdebug_info (MonoCompile *cfg)
 void
 mono_save_trampoline_xdebug_info (MonoTrampInfo *info)
 {
-	mono_tramp_info_register (info);
-
 	if (use_gdb_interface) {
 		MonoImageWriter *w;
 		MonoDwarfWriter *dw;
@@ -383,7 +376,6 @@ mono_save_xdebug_info (MonoCompile *cfg)
 void
 mono_save_trampoline_xdebug_info (MonoTrampInfo *info)
 {
-	mono_tramp_info_register (info);
 }
 
 #endif