Module Name: src
Committed By: skrll
Date: Tue Apr 25 09:02:05 UTC 2017
Modified Files:
src/sys/arch/arm/arm: db_trace.c
Log Message:
Report trapframe where possible
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/arm/db_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/db_trace.c
diff -u src/sys/arch/arm/arm/db_trace.c:1.31 src/sys/arch/arm/arm/db_trace.c:1.32
--- src/sys/arch/arm/arm/db_trace.c:1.31 Sat Jan 24 15:44:32 2015
+++ src/sys/arch/arm/arm/db_trace.c Tue Apr 25 09:02:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.31 2015/01/24 15:44:32 skrll Exp $ */
+/* $NetBSD: db_trace.c,v 1.32 2017/04/25 09:02:04 skrll Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.31 2015/01/24 15:44:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.32 2017/04/25 09:02:04 skrll Exp $");
#include <sys/proc.h>
#include <arm/armreg.h>
@@ -86,6 +86,7 @@ db_stack_trace_print(db_expr_t addr, boo
db_expr_t count, const char *modif,
void (*pr)(const char *, ...))
{
+ struct trapframe *tf = NULL;
uint32_t *frame, *lastframe;
const char *cp = modif;
char c;
@@ -140,6 +141,7 @@ db_stack_trace_print(db_expr_t addr, boo
}
(*pr)("lid %d ", l.l_lid);
pcb = lwp_getpcb(&l);
+ tf = lwp_trapframe(&l);
#ifndef _KERNEL
struct pcb pcbb;
db_read_bytes((db_addr_t)pcb, sizeof(*pcb),
@@ -258,6 +260,9 @@ db_stack_trace_print(db_expr_t addr, boo
break;
}
} else if (INKERNEL((int)lastframe)) {
+ if (trace_thread) {
+ (*pr)("--- tf %p ---\n", tf);
+ }
/* switch from user to kernel */
if (kernel_only)
break; /* kernel stack only */
