2007-02-20 Samuel Thibault <samuel.thibault@ens-lyon.org>

Fix ddb's trace command.
	* i386/i386/db_trace.c (db_find_trace_symbols): Drop _ prefix on ELF
	targets.
	(db_i386_stack_trace): Check that adresses of known functions were
	really found.

2 files changed, 23 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b68945c..dee58ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-20  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	Fix ddb's trace command.
+	* i386/i386/db_trace.c (db_find_trace_symbols): Drop _ prefix on ELF
+	targets.
+	(db_i386_stack_trace): Check that adresses of known functions were
+	really found.
+
 2007-02-19  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* Makefile.am (gnumach_LINKFLAGS): New variable.
diff --git a/i386/i386/db_trace.c b/i386/i386/db_trace.c
index d1c9512..aad305c 100644
--- a/i386/i386/db_trace.c
+++ b/i386/i386/db_trace.c
@@ -183,16 +183,22 @@ void
 db_find_trace_symbols(void)
 {
 	db_expr_t	value;
-	if (db_value_of_name("_user_trap", &value))
+#ifdef __ELF__
+#define P
+#else
+#define P "_"
+#endif
+	if (db_value_of_name(P"user_trap", &value))
 	    db_user_trap_symbol_value = (db_addr_t) value;
-	if (db_value_of_name("_kernel_trap", &value))
+	if (db_value_of_name(P"kernel_trap", &value))
 	    db_kernel_trap_symbol_value = (db_addr_t) value;
-	if (db_value_of_name("_interrupt", &value))
+	if (db_value_of_name(P"interrupt", &value))
 	    db_interrupt_symbol_value = (db_addr_t) value;
-	if (db_value_of_name("_return_to_iret", &value))
+	if (db_value_of_name(P"return_to_iret", &value))
 	    db_return_to_iret_symbol_value = (db_addr_t) value;
-	if (db_value_of_name("_syscall", &value))
+	if (db_value_of_name(P"syscall", &value))
 	    db_syscall_symbol_value = (db_addr_t) value;
+#undef P
 	db_trace_symbols_found = TRUE;
 }
 
@@ -450,14 +456,14 @@ db_i386_stack_trace(
 				 	DB_STGY_XTRN, (db_addr_t *)&offset,
 					TASK_NULL),
 				 &name, (db_expr_t *)&call_func);
-		if (call_func == db_user_trap_symbol_value ||
-		    call_func == db_kernel_trap_symbol_value) {
+		if ((db_user_trap_symbol_value && call_func == db_user_trap_symbol_value) ||
+		    (db_kernel_trap_symbol_value && call_func == db_kernel_trap_symbol_value)) {
 		    frame_type = TRAP;
 		    narg = 1;
-		} else if (call_func == db_interrupt_symbol_value) {
+		} else if (db_interrupt_symbol_value && call_func == db_interrupt_symbol_value) {
 		    frame_type = INTERRUPT;
 		    goto next_frame;
-		} else if (call_func == db_syscall_symbol_value) {
+		} else if (db_syscall_symbol_value && call_func == db_syscall_symbol_value) {
 		    frame_type = SYSCALL;
 		    goto next_frame;
 		} else {