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

Stablised the trace() command. Don't try and trace things that are 

obviously not a stack frame.
This commit is contained in:
mark 1997-10-14 10:12:04 +00:00
parent cb5b2b1176
commit b9beefc137
1 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sys/arch/arm32/arm32/db_trace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_trace.c,v 1.6 1997/02/04 06:53:41 mark Exp $ */ /* $NetBSD: db_trace.c,v 1.7 1997/10/14 10:12:04 mark Exp $ */
/* /*
* Copyright (c) 1996 Scott K. Stevens * Copyright (c) 1996 Scott K. Stevens
@ -36,7 +36,7 @@
#include <ddb/db_sym.h> #include <ddb/db_sym.h>
#include <ddb/db_output.h> #include <ddb/db_output.h>
#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK) #define INKERNEL(va) (((vm_offset_t)(va)) >= VM_MIN_KERNEL_ADDRESS)
void void
db_stack_trace_cmd(addr, have_addr, count, modif) db_stack_trace_cmd(addr, have_addr, count, modif)
@ -45,7 +45,7 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
db_expr_t count; db_expr_t count;
char *modif; char *modif;
{ {
struct frame *frame; struct frame *frame, *lastframe;
boolean_t kernel_only = TRUE; boolean_t kernel_only = TRUE;
{ {
@ -58,16 +58,20 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
if (count == -1) if (count == -1)
count = 65535; count = 65535;
/* /*
* The frame pointer points to the top word of the stack frame so we * The frame pointer points to the top word of the stack frame so we
* need to adjust it by sizeof(struct frame) - sizeof(u_int)) * need to adjust it by sizeof(struct frame) - sizeof(u_int))
* to get the address of the start of the frame structure. * to get the address of the start of the frame structure.
*/ */
if (!have_addr) if (!have_addr)
frame = (struct frame *)(DDB_TF->tf_r11 - (sizeof(struct frame) - sizeof(u_int))); frame = (struct frame *)(DDB_TF->tf_r11
- (sizeof(struct frame) - sizeof(u_int)));
else else
frame = (struct frame *)(addr - (sizeof(struct frame) - sizeof(u_int))); frame = (struct frame *)(addr - (sizeof(struct frame)
- sizeof(u_int)));
lastframe = NULL;
while (count--) { while (count--) {
db_expr_t offset; db_expr_t offset;
@ -80,7 +84,7 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
pc = frame->fr_pc; pc = frame->fr_pc;
/* Adjust the PC so the same address is printed no matter what CPU */ /* Adjust the PC so the same address is printed no matter what CPU */
if (cputype == ID_SA110) if (cputype == ID_SA110 || cputype == ID_ARM810)
pc += 4; pc += 4;
if (!INKERNEL(pc)) if (!INKERNEL(pc))
break; break;
@ -97,9 +101,30 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
/* /*
* Switch to next frame up * Switch to next frame up
*/ */
frame = (struct frame *)(frame->fr_fp - (sizeof(struct frame) - sizeof(u_int))); lastframe = frame;
frame = (struct frame *)(frame->fr_fp - (sizeof(struct frame)
- sizeof(u_int)));
if (frame == NULL) if (frame == NULL)
break; break;
if (INKERNEL((int)frame)) {
/* staying in kernel */
if (frame <= lastframe) {
db_printf("Bad frame pointer: %p\n", frame);
break;
}
} else if (INKERNEL((int)lastframe)) {
/* switch from user to kernel */
if (kernel_only)
break; /* kernel stack only */
} else {
/* in user */
if (frame <= lastframe) {
db_printf("Bad user frame pointer: %p\n",
frame);
break;
}
}
} }
} }