Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2013-05-14 15:25:08 -0400
committerEugene Tarassov2013-05-14 15:25:08 -0400
commit4a0e27a2556faeec0cdb0dc7491feb96ebbf7bed (patch)
tree320d747f57f5103dd96ffc22442e80a6ab8bcfcb
parent28d99a19fc1866ce0c04263f74cd02605b48e5ad (diff)
downloadorg.eclipse.tcf.agent-4a0e27a2556faeec0cdb0dc7491feb96ebbf7bed.tar.gz
org.eclipse.tcf.agent-4a0e27a2556faeec0cdb0dc7491feb96ebbf7bed.tar.xz
org.eclipse.tcf.agent-4a0e27a2556faeec0cdb0dc7491feb96ebbf7bed.zip
Bug 407859 - dwarf-test executable not building anymore
-rw-r--r--agent/tcf/services/runctrl.h2
-rw-r--r--agent/tcf/services/stacktrace.c6
-rw-r--r--tests/test-dwarf/tcf/backend/backend.c2
-rw-r--r--tests/test-dwarf/tcf/config.h90
4 files changed, 52 insertions, 48 deletions
diff --git a/agent/tcf/services/runctrl.h b/agent/tcf/services/runctrl.h
index be383aa3..1a4c450c 100644
--- a/agent/tcf/services/runctrl.h
+++ b/agent/tcf/services/runctrl.h
@@ -158,6 +158,8 @@ extern void ini_run_ctrl_service(Protocol * proto, TCFBroadcastGroup * bcg);
#else
+#define run_ctrl_lock() do {} while(0)
+#define run_ctrl_unlock() do {} while(0)
#define is_intercepted(x) 0
#define is_safe_event() 0
#define post_safe_event(ctx, done, arg) ((void)ctx, post_event(done, arg))
diff --git a/agent/tcf/services/stacktrace.c b/agent/tcf/services/stacktrace.c
index eadd4fbe..c8a1c7ac 100644
--- a/agent/tcf/services/stacktrace.c
+++ b/agent/tcf/services/stacktrace.c
@@ -534,9 +534,11 @@ static void flush_stack_trace(Context * ctx, void * args) {
invalidate_stack_trace(EXT(ctx));
}
+#if SERVICE_Registers
static void flush_on_register_change(Context * ctx, int frame, RegisterDefinition * def, void * args) {
invalidate_stack_trace(EXT(ctx));
}
+#endif
static void delete_stack_trace(Context * ctx, void * args) {
invalidate_stack_trace(EXT(ctx));
@@ -569,9 +571,11 @@ void ini_stack_trace_service(Protocol * proto, TCFBroadcastGroup * bcg) {
flush_stack_trace,
delete_stack_trace
};
+#if SERVICE_Registers
static RegistersEventListener registers_listener = {
flush_on_register_change,
};
+#endif
#if SERVICE_MemoryMap
static MemoryMapEventListener map_listener = {
NULL,
@@ -581,7 +585,9 @@ void ini_stack_trace_service(Protocol * proto, TCFBroadcastGroup * bcg) {
};
#endif
add_context_event_listener(&context_listener, bcg);
+#if SERVICE_Registers
add_registers_event_listener(&registers_listener, bcg);
+#endif
#if SERVICE_MemoryMap
add_memory_map_event_listener(&map_listener, NULL);
#endif
diff --git a/tests/test-dwarf/tcf/backend/backend.c b/tests/test-dwarf/tcf/backend/backend.c
index 7e386ca4..7552fc99 100644
--- a/tests/test-dwarf/tcf/backend/backend.c
+++ b/tests/test-dwarf/tcf/backend/backend.c
@@ -130,10 +130,10 @@ int read_reg_bytes(StackFrame * frame, RegisterDefinition * reg_def, unsigned of
return context_read_reg(frame->ctx, reg_def, offs, size, buf);
}
if (frame->regs != NULL) {
- size_t i;
uint8_t * r_addr = (uint8_t *)&frame->regs->data + reg_def->offset;
#if 0
uint8_t * m_addr = (uint8_t *)&frame->regs->mask + reg_def->offset;
+ size_t i;
for (i = 0; i < size; i++) {
if (m_addr[offs + i] != 0xff) {
errno = ERR_INV_CONTEXT;
diff --git a/tests/test-dwarf/tcf/config.h b/tests/test-dwarf/tcf/config.h
index 144cec5c..c1e88c65 100644
--- a/tests/test-dwarf/tcf/config.h
+++ b/tests/test-dwarf/tcf/config.h
@@ -24,13 +24,13 @@
#include <tcf/framework/mdep.h>
#if !defined(SERVICE_Locator)
-#define SERVICE_Locator 1
+#define SERVICE_Locator 0
#endif
#if !defined(SERVICE_Registers)
-#define SERVICE_Registers 1
+#define SERVICE_Registers 0
#endif
#if !defined(SERVICE_Memory)
-#define SERVICE_Memory 1
+#define SERVICE_Memory 0
#endif
#if !defined(SERVICE_LineNumbers)
#define SERVICE_LineNumbers 1
@@ -48,51 +48,47 @@
#define SERVICE_StackTrace 1
#endif
-#if !defined(ENABLE_ZeroCopy)
-#define ENABLE_ZeroCopy 1
-#endif
-
-#if !defined(ENABLE_Trace)
-# define ENABLE_Trace 1
-#endif
-
-#if !defined(ENABLE_Discovery)
-# define ENABLE_Discovery 0
-#endif
-
-#if !defined(ENABLE_ContextProxy)
-# define ENABLE_ContextProxy 1
-#endif
-
-#if !defined(ENABLE_SymbolsProxy)
-# define ENABLE_SymbolsProxy 0
-#endif
-
-#if !defined(ENABLE_LineNumbersProxy)
-# define ENABLE_LineNumbersProxy 0
-#endif
-
-#if !defined(ENABLE_Symbols)
-# define ENABLE_Symbols (ENABLE_SymbolsProxy || SERVICE_Symbols)
-#endif
-
-#if !defined(ENABLE_LineNumbers)
-# define ENABLE_LineNumbers (ENABLE_LineNumbersProxy || SERVICE_LineNumbers)
-#endif
-
-#if !defined(ENABLE_DebugContext)
-# define ENABLE_DebugContext 1
-#endif
-
-#if !defined(ENABLE_ELF)
-# define ENABLE_ELF 1
-#endif
-
+#define SERVICE_RunControl 0
+#define SERVICE_Breakpoints 0
+#define SERVICE_PathMap 0
+#define SERVICE_Processes 0
+#define SERVICE_Terminals 0
+#define SERVICE_FileSystem 0
+#define SERVICE_SysMonitor 0
+#define SERVICE_Streams 0
+#define SERVICE_DPrintf 0
+#define SERVICE_ContextQuery 0
+#define SERVICE_Disassembly 0
+#define SERVICE_Profiler 0
+
+#define ENABLE_ZeroCopy 0
+#define ENABLE_Trace 1
+#define ENABLE_Discovery 0
+#define ENABLE_ContextProxy 1
+#define ENABLE_SymbolsProxy 0
+#define ENABLE_LineNumbersProxy 0
+#define ENABLE_Symbols 1
+#define ENABLE_LineNumbers 1
+#define ENABLE_DebugContext 1
+#define ENABLE_ELF 1
+#define ENABLE_PE 0
#define ENABLE_SSL 0
#define ENABLE_Unix_Domain 0
-
-#if !defined(ENABLE_STREAM_MACROS)
-#define ENABLE_STREAM_MACROS 1
-#endif
+#define ENABLE_AIO 0
+#define ENABLE_RCBP_TEST 0
+#define ENABLE_Splice 0
+#define ENABLE_Plugins 0
+#define ENABLE_Cmdline 0
+#define ENABLE_STREAM_MACROS 0
+
+#define ENABLE_ContextExtraProperties 0
+#define ENABLE_ContextStateProperties 0
+#define ENABLE_ContextBreakpointCapabilities 0
+#define ENABLE_ExtendedMemoryErrorReports 0
+#define ENABLE_ExtendedBreakpointStatus 0
+#define ENABLE_ExternalStackcrawl 0
+#define ENABLE_SymbolsMux 0
+#define ENABLE_LineNumbersMux 0
+#define ENABLE_ContextISA 0
#endif /* D_config */

Back to the top