Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite stack traceback printing (stacktrace()) and logging(logstacktrace()

Browse Source 
wrappers for stacktrace_subr() in assembly code to avoid prototype conflicts.
This commit is contained in:
jonathan 1997-06-15 01:08:16 +00:00
parent 49e47cbf67
commit 8e854e11d1
2 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sys/arch/mips/mips/locore.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.28 1997/05/19 23:25:09 jonathan Exp $ */
/* $NetBSD: locore.S,v 1.29 1997/06/15 01:08:16 jonathan Exp $ */
/*
* Copyright (c) 1992, 1993
@ -2011,6 +2011,50 @@ LEAF(cpu_getregs)
sw s8, 8(a0)
END(cpu_getregs)
/*
* Stacktrace support hooks which use type punnign to access
* the caller's registers.
*/
/*
* stacktrace() -- print a stack backtrace to the console.
* implicitly accesses caller's a0-a3.
*/
NON_LEAF(stacktrace, 32, ra)
subu $sp,$sp,32
la $2, _C_LABEL(printf)
sw $31,24($sp)
jal stacktrace_subr
sw $2,16($sp)
lw $31,24($sp)
addu $sp,$sp,32
j $31
.end stacktrace
END(stacktrace)
/*
* logstacktrace() -- log a stack traceback to msgbuf.
* implicitly accesses caller's a0-a3.
*/
NON_LEAF(logstacktrace, 32, ra)
subu $sp,$sp,32
la $2, _C_LABEL(addlog)
sw $31,24($sp)
jal stacktrace_subr
sw $2,16($sp)
lw $31,24($sp)
addu $sp,$sp,32
j $31
.end stacktrace
END(stacktrace)
/*
* Port-specific locore code moved to sys/arch/<port>/<port>/locore_machdep.S

28
sys/arch/mips/mips/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.55 1997/05/25 10:01:38 jonathan Exp $ */
/* $NetBSD: trap.c,v 1.56 1997/06/15 01:08:19 jonathan Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -358,8 +358,9 @@ extern void softintr __P((unsigned statusReg, unsigned pc));
#ifdef DEBUG /* stack trace code, also useful to DDB one day */
extern void stacktrace __P(()); /*XXX*/
extern void logstacktrace __P(()); /*XXX*/
int kdbpeek __P((vm_offset_t addr));
extern void stacktrace __P((void)); /*XXX*/
extern void logstacktrace __P((void)); /*XXX*/
/* extern functions printed by name in stack backtraces */
extern void idle __P((void)), cpu_switch __P(( struct proc *p));
@ -1430,9 +1431,10 @@ mips_singlestep(p)
#ifdef DEBUG
int
kdbpeek(addr)
vm_offset_t addr;
{
if (addr & 3) {
printf("kdbpeek: unaligned address %x\n", addr);
printf("kdbpeek: unaligned address %lx\n", addr);
return (-1);
}
return (*(int *)addr);
@ -1447,22 +1449,10 @@ char *fn_name(unsigned addr);
void stacktrace_subr __P((int, int, int, int, void (*)(const char*, ...)));
/*
* Print a stack backtrace.
* Do a stack backtrace.
* (*printfn)() prints the output to either the system log,
* the console, or both.
*/
void
stacktrace(a0, a1, a2, a3)
int a0, a1, a2, a3;
{
stacktrace_subr(a0, a1, a2, a3, printf);
}
void
logstacktrace(a0, a1, a2, a3)
int a0, a1, a2, a3;
{
stacktrace_subr(a0, a1, a2, a3, addlog);
}
void
stacktrace_subr(a0, a1, a2, a3, printfn)
int a0, a1, a2, a3;