Module Name: src
Committed By: ryo
Date: Sun May 29 23:43:50 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: db_trace.c
Log Message:
Display the trap type of trapframe when backtracing.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/db_trace.c
diff -u src/sys/arch/aarch64/aarch64/db_trace.c:1.15 src/sys/arch/aarch64/aarch64/db_trace.c:1.16
--- src/sys/arch/aarch64/aarch64/db_trace.c:1.15 Sun May 29 16:13:41 2022
+++ src/sys/arch/aarch64/aarch64/db_trace.c Sun May 29 23:43:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.15 2022/05/29 16:13:41 ryo Exp $ */
+/* $NetBSD: db_trace.c,v 1.16 2022/05/29 23:43:49 ryo Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.15 2022/05/29 16:13:41 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.16 2022/05/29 23:43:49 ryo Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -254,14 +254,17 @@ db_stack_trace_print(db_expr_t addr, boo
if (tf != NULL) {
#if defined(_KERNEL)
- bool is_switchframe = (tf->tf_sp == 0);
- (*pr)("---- %s %p (%zu bytes) ----\n",
- is_switchframe ? "switchframe" : "trapframe",
- tf, sizeof(*tf));
- if (is_switchframe)
+ if (tf->tf_sp == 0) {
+ (*pr)("---- switchframe %p (%zu bytes) ----\n",
+ tf, sizeof(*tf));
dump_switchframe(tf, pr);
- else
+ } else {
+ (*pr)("---- %s: trapframe %p (%zu bytes) ----\n",
+ (tf->tf_esr == -1) ? "Interrupt" :
+ eclass_trapname(__SHIFTOUT(tf->tf_esr, ESR_EC)),
+ tf, sizeof(*tf));
dump_trapframe(tf, pr);
+ }
(*pr)("------------------------"
"------------------------\n");
@@ -324,7 +327,9 @@ db_stack_trace_print(db_expr_t addr, boo
if (lr == 0)
break;
- (*pr)("---- trapframe %p (%zu bytes) ----\n",
+ (*pr)("---- %s: trapframe %p (%zu bytes) ----\n",
+ (tf->tf_esr == -1) ? "Interrupt" :
+ eclass_trapname(__SHIFTOUT(tf->tf_esr, ESR_EC)),
tf, sizeof(*tf));
dump_trapframe(tf, pr);
(*pr)("------------------------"
