From e71a7f33ef30a5bbd0047b37a95533d06c860846 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Thu, 2 Mar 2017 06:22:06 -0500 Subject: [PATCH] [runtime] Cleanup the debugger header files. (#4459) * Rename debug-mono-debugger.h to debug-internals.h. * Move the internal debug structures to debug-internals.h from debug-mono-symfile.h. --- mono/metadata/Makefile.am | 2 +- mono/metadata/appdomain.c | 1 - mono/metadata/debug-internals.h | 87 +++++++++++++++++++++++++++++ mono/metadata/debug-mono-ppdb.c | 3 +- mono/metadata/debug-mono-symfile.c | 1 - mono/metadata/debug-mono-symfile.h | 67 +--------------------- mono/metadata/domain.c | 2 +- mono/metadata/jit-info.c | 2 +- mono/metadata/mono-debug-debugger.h | 20 ------- mono/metadata/mono-debug.c | 3 +- mono/metadata/object.c | 1 - mono/metadata/profiler.c | 2 +- mono/metadata/threads.c | 2 +- mono/mini/debug-mini.c | 2 +- mono/mini/debugger-agent.c | 3 +- mono/mini/dwarfwriter.c | 2 +- mono/mini/dwarfwriter.h | 2 +- mono/mini/lldb.c | 4 +- mono/mini/method-to-ir.c | 4 +- mono/mini/mini-amd64-gsharedvt.c | 1 - mono/mini/mini-llvm.c | 4 +- mono/mini/tramp-amd64-gsharedvt.c | 3 +- mono/mini/tramp-amd64.c | 1 - mono/mini/tramp-ia64.c | 1 - mono/mini/tramp-x86.c | 2 - mono/profiler/mono-profiler-vtune.c | 2 +- 26 files changed, 106 insertions(+), 118 deletions(-) create mode 100644 mono/metadata/debug-internals.h delete mode 100644 mono/metadata/mono-debug-debugger.h diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index 751eabbb1b6..246eec3b68c 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -189,7 +189,7 @@ common_sources = \ mono-config.c \ mono-debug.h \ mono-debug.c \ - mono-debug-debugger.h \ + debug-internals.h \ mono-endian.c \ mono-endian.h \ mono-hash.h \ diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 312c66a1156..cfc917660e2 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/mono/metadata/debug-internals.h b/mono/metadata/debug-internals.h new file mode 100644 index 00000000000..1d5e33cf250 --- /dev/null +++ b/mono/metadata/debug-internals.h @@ -0,0 +1,87 @@ +#ifndef __DEBUG_INTERNALS_H__ +#define __DEBUG_INTERNALS_H__ + +#include +#include +#include +#include + +struct _MonoDebugMethodInfo { + MonoMethod *method; + MonoDebugHandle *handle; + uint32_t index; + uint32_t data_offset; + uint32_t lnt_offset; +}; + +typedef struct { + int parent; + int type; + /* IL offsets */ + int start_offset, end_offset; +} MonoDebugCodeBlock; + +typedef struct { + char *name; + int index; + /* Might be null for the main scope */ + MonoDebugCodeBlock *block; +} MonoDebugLocalVar; + +/* + * Information about local variables retrieved from a symbol file. + */ +struct _MonoDebugLocalsInfo { + int num_locals; + MonoDebugLocalVar *locals; + int num_blocks; + MonoDebugCodeBlock *code_blocks; +}; + +/* +* Information about method await yield and resume offsets retrieved from a symbol file. +*/ +struct _MonoDebugMethodAsyncInfo { + uint32_t catch_handler_offset; + int num_awaits; + uint32_t *yield_offsets; + uint32_t *resume_offsets; + uint32_t *move_next_method_token; +}; + +struct _MonoDebugLineNumberEntry { + uint32_t il_offset; + uint32_t native_offset; +}; + +/* + * Information about a source file retrieved from a symbol file. + */ +typedef struct { + char *source_file; + /* 16 byte long */ + guint8 *guid, *hash; +} MonoDebugSourceInfo; + +typedef struct { + int il_offset; + int line, column; + int end_line, end_column; +} MonoSymSeqPoint; + +void mono_debugger_lock (void); +void mono_debugger_unlock (void); + +void +mono_debug_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrArray **source_file_list, int **source_files, MonoSymSeqPoint **seq_points, int *n_seq_points); + +MONO_API void +mono_debug_free_locals (MonoDebugLocalsInfo *info); + +void +mono_debug_free_method_async_debug_info (MonoDebugMethodAsyncInfo *info); + +gboolean +mono_debug_image_has_debug_info (MonoImage *image); + +#endif /* __DEBUG_INTERNALS_H__ */ diff --git a/mono/metadata/debug-mono-ppdb.c b/mono/metadata/debug-mono-ppdb.c index b96edfdf697..ba39e5224c4 100644 --- a/mono/metadata/debug-mono-ppdb.c +++ b/mono/metadata/debug-mono-ppdb.c @@ -20,8 +20,7 @@ #include #include #include -#include -#include +#include #include #include #include diff --git a/mono/metadata/debug-mono-symfile.c b/mono/metadata/debug-mono-symfile.c index d9b5de92e8a..709c8f278d4 100644 --- a/mono/metadata/debug-mono-symfile.c +++ b/mono/metadata/debug-mono-symfile.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/mono/metadata/debug-mono-symfile.h b/mono/metadata/debug-mono-symfile.h index bd8252843e5..2f602018910 100644 --- a/mono/metadata/debug-mono-symfile.h +++ b/mono/metadata/debug-mono-symfile.h @@ -12,6 +12,7 @@ #include #include #include +#include typedef struct MonoSymbolFileOffsetTable MonoSymbolFileOffsetTable; typedef struct MonoSymbolFileLineNumberEntry MonoSymbolFileLineNumberEntry; @@ -71,69 +72,6 @@ struct MonoSymbolFileMethodAddress { uint8_t data [MONO_ZERO_LEN_ARRAY]; }; -struct _MonoDebugMethodInfo { - MonoMethod *method; - MonoDebugHandle *handle; - uint32_t index; - uint32_t data_offset; - uint32_t lnt_offset; -}; - -typedef struct { - int parent; - int type; - /* IL offsets */ - int start_offset, end_offset; -} MonoDebugCodeBlock; - -typedef struct { - char *name; - int index; - /* Might be null for the main scope */ - MonoDebugCodeBlock *block; -} MonoDebugLocalVar; - -/* - * Information about local variables retrieved from a symbol file. - */ -struct _MonoDebugLocalsInfo { - int num_locals; - MonoDebugLocalVar *locals; - int num_blocks; - MonoDebugCodeBlock *code_blocks; -}; - -/* -* Information about method await yield and resume offsets retrieved from a symbol file. -*/ -struct _MonoDebugMethodAsyncInfo { - uint32_t catch_handler_offset; - int num_awaits; - uint32_t *yield_offsets; - uint32_t *resume_offsets; - uint32_t *move_next_method_token; -}; - -struct _MonoDebugLineNumberEntry { - uint32_t il_offset; - uint32_t native_offset; -}; - -/* - * Information about a source file retrieved from a symbol file. - */ -typedef struct { - char *source_file; - /* 16 byte long */ - guint8 *guid, *hash; -} MonoDebugSourceInfo; - -typedef struct { - int il_offset; - int line, column; - int end_line, end_column; -} MonoSymSeqPoint; - #define MONO_SYMBOL_FILE_MAJOR_VERSION 50 #define MONO_SYMBOL_FILE_MINOR_VERSION 0 #define MONO_SYMBOL_FILE_MAGIC 0x45e82623fd7fa614ULL @@ -169,9 +107,6 @@ mono_debug_symfile_lookup_locals (MonoDebugMethodInfo *minfo); void mono_debug_symfile_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrArray **source_file_list, int **source_files, MonoSymSeqPoint **seq_points, int *n_seq_points); -gboolean -mono_debug_image_has_debug_info (MonoImage *image); - MONO_END_DECLS #endif /* __MONO_SYMFILE_H__ */ diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c index 0785369e0c6..db2ccd592fc 100644 --- a/mono/metadata/domain.c +++ b/mono/metadata/domain.c @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/mono/metadata/jit-info.c b/mono/metadata/jit-info.c index efbb373197f..5761a8a00e3 100644 --- a/mono/metadata/jit-info.c +++ b/mono/metadata/jit-info.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/mono/metadata/mono-debug-debugger.h b/mono/metadata/mono-debug-debugger.h deleted file mode 100644 index 740b2dbe6fb..00000000000 --- a/mono/metadata/mono-debug-debugger.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __MONO_DEBUG_DEBUGGER_H__ -#define __MONO_DEBUG_DEBUGGER_H__ - -#include -#include -#include - -void mono_debugger_lock (void); -void mono_debugger_unlock (void); - -void -mono_debug_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrArray **source_file_list, int **source_files, MonoSymSeqPoint **seq_points, int *n_seq_points); - -MONO_API void -mono_debug_free_locals (MonoDebugLocalsInfo *info); - -void -mono_debug_free_method_async_debug_info (MonoDebugMethodAsyncInfo *info); - -#endif /* __MONO_DEBUG_DEBUGGER_H__ */ diff --git a/mono/metadata/mono-debug.c b/mono/metadata/mono-debug.c index 2eba05b36fa..50b10a9280a 100644 --- a/mono/metadata/mono-debug.c +++ b/mono/metadata/mono-debug.c @@ -17,10 +17,11 @@ #include #include #include -#include +#include #include #include #include +#include #include #include #include diff --git a/mono/metadata/object.c b/mono/metadata/object.c index b3ce33d1264..418cc818ca9 100644 --- a/mono/metadata/object.c +++ b/mono/metadata/object.c @@ -36,7 +36,6 @@ #include #include "mono/metadata/profiler-private.h" #include "mono/metadata/security-manager.h" -#include "mono/metadata/mono-debug-debugger.h" #include #include #include diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c index 5902d17378a..ec29d9d45d2 100644 --- a/mono/metadata/profiler.c +++ b/mono/metadata/profiler.c @@ -16,7 +16,7 @@ #include "mono/metadata/assembly.h" #include "mono/metadata/debug-helpers.h" #include "mono/metadata/mono-debug.h" -#include "mono/metadata/debug-mono-symfile.h" +#include "mono/metadata/debug-internals.h" #include "mono/metadata/metadata-internals.h" #include "mono/metadata/class-internals.h" #include "mono/metadata/domain-internals.h" diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c index 238abb9504c..5269045c16e 100644 --- a/mono/metadata/threads.c +++ b/mono/metadata/threads.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/mono/mini/debug-mini.c b/mono/mini/debug-mini.c index 68780e5056a..4dc68f255c0 100644 --- a/mono/mini/debug-mini.c +++ b/mono/mini/debug-mini.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c index ed1b7a14a7f..088bfceea82 100644 --- a/mono/mini/debugger-agent.c +++ b/mono/mini/debugger-agent.c @@ -53,8 +53,7 @@ #endif #include -#include -#include +#include #include #include #include diff --git a/mono/mini/dwarfwriter.c b/mono/mini/dwarfwriter.c index 5aacab1c440..773ea4924b3 100644 --- a/mono/mini/dwarfwriter.c +++ b/mono/mini/dwarfwriter.c @@ -21,7 +21,7 @@ #endif #include -#include +#include #ifndef HOST_WIN32 #include diff --git a/mono/mini/dwarfwriter.h b/mono/mini/dwarfwriter.h index 83d6a1c16d5..f157e16d695 100644 --- a/mono/mini/dwarfwriter.h +++ b/mono/mini/dwarfwriter.h @@ -14,7 +14,7 @@ #include "image-writer.h" #include "mini.h" -#include +#include #include diff --git a/mono/mini/lldb.c b/mono/mini/lldb.c index 6ff4ef6cc09..360fbfbb67d 100644 --- a/mono/mini/lldb.c +++ b/mono/mini/lldb.c @@ -12,9 +12,7 @@ #include "lldb.h" #include "seq-points.h" -#include -#include -#include +#include #include #if !defined(DISABLE_JIT) && !defined(DISABLE_LLDB) diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c index 5982e0c2008..f80eb84d2b1 100644 --- a/mono/mini/method-to-ir.c +++ b/mono/mini/method-to-ir.c @@ -50,8 +50,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -59,7 +58,6 @@ #include #include #include -#include #include #include #include diff --git a/mono/mini/mini-amd64-gsharedvt.c b/mono/mini/mini-amd64-gsharedvt.c index 6a4e7af9d44..c4518da3ded 100644 --- a/mono/mini/mini-amd64-gsharedvt.c +++ b/mono/mini/mini-amd64-gsharedvt.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c index 46ddd5085bb..3fb5dfce011 100644 --- a/mono/mini/mini-llvm.c +++ b/mono/mini/mini-llvm.c @@ -9,7 +9,7 @@ #include "config.h" #include -#include +#include #include #include #include @@ -9020,7 +9020,7 @@ emit_dbg_subprogram (EmitContext *ctx, MonoCompile *cfg, LLVMValueRef method, co if (!minfo) return NULL; - mono_debug_symfile_get_seq_points (minfo, &source_file, NULL, NULL, &sym_seq_points, &n_seq_points); + mono_debug_get_seq_points (minfo, &source_file, NULL, NULL, &sym_seq_points, &n_seq_points); if (!source_file) source_file = g_strdup (""); dir = g_path_get_dirname (source_file); diff --git a/mono/mini/tramp-amd64-gsharedvt.c b/mono/mini/tramp-amd64-gsharedvt.c index 0c986f14e7b..96d1e71adad 100644 --- a/mono/mini/tramp-amd64-gsharedvt.c +++ b/mono/mini/tramp-amd64-gsharedvt.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -483,4 +482,4 @@ mono_amd64_start_gsharedvt_call (GSharedVtCallInfo *info, gpointer *caller, gpoi return NULL; } -#endif \ No newline at end of file +#endif diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c index b2b7a7fc5fd..92a3788d6ab 100644 --- a/mono/mini/tramp-amd64.c +++ b/mono/mini/tramp-amd64.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/mono/mini/tramp-ia64.c b/mono/mini/tramp-ia64.c index d21ab21e171..48338e3f757 100644 --- a/mono/mini/tramp-ia64.c +++ b/mono/mini/tramp-ia64.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include "mini.h" diff --git a/mono/mini/tramp-x86.c b/mono/mini/tramp-x86.c index d0c778421d3..eac0f314133 100644 --- a/mono/mini/tramp-x86.c +++ b/mono/mini/tramp-x86.c @@ -15,8 +15,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/mono/profiler/mono-profiler-vtune.c b/mono/profiler/mono-profiler-vtune.c index 78de58aaa08..2ed52c541fd 100644 --- a/mono/profiler/mono-profiler-vtune.c +++ b/mono/profiler/mono-profiler-vtune.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include -- 2.25.1