projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 bbf90a08b64aac4af029668e370ba1778036466c..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)
*
* Author:
* Zoltan Varga (vargaz@gmail.com)
@@
-27,7
+28,6
@@
#include <glib.h>
#include "mini.h"
#include <glib.h>
#include "mini.h"
-#if !defined(DISABLE_AOT) && !defined(DISABLE_JIT) && USE_BIN_WRITER
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@
-49,6
+49,9
@@
#include <sys/stat.h>
#include "image-writer.h"
#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"
#include "dwarfwriter.h"
#include "mono/utils/mono-compiler.h"
@@
-338,6
+341,10
@@
mono_save_xdebug_info (MonoCompile *cfg)
void
mono_save_trampoline_xdebug_info (MonoTrampInfo *info)
{
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;
if (use_gdb_interface) {
MonoImageWriter *w;
MonoDwarfWriter *dw;
@@
-347,7
+354,7
@@
mono_save_trampoline_xdebug_info (MonoTrampInfo *info)
xdebug_begin_emit (&w, &dw);
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);
xdebug_end_emit (w, dw, NULL);
@@
-357,7
+364,7
@@
mono_save_trampoline_xdebug_info (MonoTrampInfo *info)
return;
mono_loader_lock_if_inited ();
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 ();
}
fflush (xdebug_fp);
mono_loader_unlock_if_inited ();
}