aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFranck Bui-Huu <vagabon.xyz@gmail.com>2006-08-03 09:29:17 +0200
committerRalf Baechle <ralf@linux-mips.org>2006-09-27 13:37:26 +0100
commit87151ae39bf5556abe83d69af0be9580c32c501b (patch)
tree5e5a39ef8b8f75d4980791b0bffb7413ed199e6e /arch
parentcf495a333093a1c0eca90c7d8d98313a3b7f01a1 (diff)
[MIPS] Miscellaneous cleanup in prologue analysis code
We usually use backtrace term for dumping a call tree during debug. Therefore this patch renames show_frametrace() into show_backtrace() and show_trace() into show_raw_backtrace(). It also uses the new function print_ip_sym(). Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/traps.c33
1 files changed, 14 insertions, 19 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 4a11a3d8447..549cbb8209a 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -74,21 +74,18 @@ void (*board_ejtag_handler_setup)(void);
void (*board_bind_eic_interrupt)(int irq, int regset);
-static void show_trace(unsigned long *stack)
+static void show_raw_backtrace(unsigned long *sp)
{
- const int field = 2 * sizeof(unsigned long);
unsigned long addr;
printk("Call Trace:");
#ifdef CONFIG_KALLSYMS
printk("\n");
#endif
- while (!kstack_end(stack)) {
- addr = *stack++;
- if (__kernel_text_address(addr)) {
- printk(" [<%0*lx>] ", field, addr);
- print_symbol("%s\n", addr);
- }
+ while (!kstack_end(sp)) {
+ addr = *sp++;
+ if (__kernel_text_address(addr))
+ print_ip_sym(addr);
}
printk("\n");
}
@@ -104,22 +101,20 @@ __setup("raw_show_trace", set_raw_show_trace);
extern unsigned long unwind_stack(struct task_struct *task,
unsigned long **sp, unsigned long pc);
-static void show_frametrace(struct task_struct *task, struct pt_regs *regs)
+static void show_backtrace(struct task_struct *task, struct pt_regs *regs)
{
- const int field = 2 * sizeof(unsigned long);
- unsigned long *stack = (long *)regs->regs[29];
+ unsigned long *sp = (long *)regs->regs[29];
unsigned long pc = regs->cp0_epc;
int top = 1;
if (raw_show_trace || !__kernel_text_address(pc)) {
- show_trace(stack);
+ show_raw_backtrace(sp);
return;
}
printk("Call Trace:\n");
while (__kernel_text_address(pc)) {
- printk(" [<%0*lx>] ", field, pc);
- print_symbol("%s\n", pc);
- pc = unwind_stack(task, &stack, pc);
+ print_ip_sym(pc);
+ pc = unwind_stack(task, &sp, pc);
if (top && pc == 0)
pc = regs->regs[31]; /* leaf? */
top = 0;
@@ -127,7 +122,7 @@ static void show_frametrace(struct task_struct *task, struct pt_regs *regs)
printk("\n");
}
#else
-#define show_frametrace(task, r) show_trace((long *)(r)->regs[29]);
+#define show_backtrace(task, r) show_raw_backtrace((long *)(r)->regs[29]);
#endif
/*
@@ -160,7 +155,7 @@ static void show_stacktrace(struct task_struct *task, struct pt_regs *regs)
i++;
}
printk("\n");
- show_frametrace(task, regs);
+ show_backtrace(task, regs);
}
static noinline void prepare_frametrace(struct pt_regs *regs)
@@ -211,11 +206,11 @@ void dump_stack(void)
if (!raw_show_trace) {
struct pt_regs regs;
prepare_frametrace(&regs);
- show_frametrace(current, &regs);
+ show_backtrace(current, &regs);
return;
}
#endif
- show_trace(&stack);
+ show_raw_backtrace(&stack);
}
EXPORT_SYMBOL(dump_stack);