Page MenuHomeFreeBSD
Files F150069207

D40829.id124073.diff
No OneTemporary
Actions

D40829.id124073.diff
View Options

diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
--- a/sys/riscv/riscv/trap.c
+++ b/sys/riscv/riscv/trap.c
@@ -35,6 +35,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include "opt_ddb.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -69,6 +71,11 @@
#include <sys/dtrace_bsd.h>
#endif
+#ifdef DDB
+#include <ddb/ddb.h>
+#include <ddb/db_sym.h>
+#endif
+
int (*dtrace_invop_jump_addr)(struct trapframe *);
/* Called from exception.S */
@@ -127,31 +134,57 @@
#include "../../kern/subr_syscall.c"
+static void
+resolve_symbol(const char *name, uint64_t value)
+{
+#ifdef DDB
+ c_db_sym_t sym;
+ db_expr_t sym_value;
+ db_expr_t offset;
+ const char *sym_name;
+#endif
+
+ printf("%7s: 0x%016lx", name, value);
+
+#ifdef DDB
+ if (value >= VM_MIN_KERNEL_ADDRESS) {
+ sym = db_search_symbol(value, DB_STGY_ANY, &offset);
+ if (sym != C_DB_SYM_NULL) {
+ db_symbol_values(sym, &sym_name, &sym_value);
+ printf(" (%s + 0x%lx)", sym_name, offset);
+ }
+ }
+#endif
+ printf("\n");
+}
+
static void
dump_regs(struct trapframe *frame)
{
- int n;
+ char name[6];
int i;
- n = nitems(frame->tf_t);
- for (i = 0; i < n; i++)
- printf("t[%d] == 0x%016lx\n", i, frame->tf_t[i]);
-
- n = nitems(frame->tf_s);
- for (i = 0; i < n; i++)
- printf("s[%d] == 0x%016lx\n", i, frame->tf_s[i]);
+ for (i = 0; i < nitems(frame->tf_t); i++) {
+ snprintf(name, sizeof(name), "t[%d]", i);
+ resolve_symbol(name, frame->tf_t[i]);
+ }
- n = nitems(frame->tf_a);
- for (i = 0; i < n; i++)
- printf("a[%d] == 0x%016lx\n", i, frame->tf_a[i]);
+ for (i = 0; i < nitems(frame->tf_s); i++) {
+ snprintf(name, sizeof(name), "s[%d]", i);
+ resolve_symbol(name, frame->tf_s[i]);
+ }
- printf("ra == 0x%016lx\n", frame->tf_ra);
- printf("sp == 0x%016lx\n", frame->tf_sp);
- printf("gp == 0x%016lx\n", frame->tf_gp);
- printf("tp == 0x%016lx\n", frame->tf_tp);
+ for (i = 0; i < nitems(frame->tf_a); i++) {
+ snprintf(name, sizeof(name), "a[%d]", i);
+ resolve_symbol(name, frame->tf_a[i]);
+ }
- printf("sepc == 0x%016lx\n", frame->tf_sepc);
- printf("sstatus == 0x%016lx\n", frame->tf_sstatus);
+ resolve_symbol("ra", frame->tf_ra);
+ resolve_symbol("sp", frame->tf_sp);
+ resolve_symbol("gp", frame->tf_gp);
+ resolve_symbol("tp", frame->tf_tp);
+ resolve_symbol("sepc", frame->tf_sepc);
+ printf("sstatus: 0x%016lx\n", frame->tf_sstatus);
}
static void

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 3:34 AM (21 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30571181
Default Alt Text
D40829.id124073.diff (2 KB)

Event Timeline