upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 00:02:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

riscv: Tidy panic messages for exceptions

Browse source 
- Remove trailing newlines

- Be consistent about the format used to print pointer values

- Print the trap value for access faults (it is the faulting address
  if non-zero) and illegal instructions (it is the first N bytes of
  the decoded instruction if non-zero)

Reviewed by:	markj
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D41786
This commit is contained in:
John Baldwin 2023-10-11 14:21:12 -07:00
parent 569f2292ca
commit ff79f35bda
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/riscv/riscv/trap.c
View file

@ -299,7 +299,7 @@ fatal:
return;
}
#endif
panic("Fatal page fault at %#lx: %#016lx", frame->tf_sepc, stval);
panic("Fatal page fault at %#lx: %#lx", frame->tf_sepc, stval);
}
void
@ -326,7 +326,7 @@ do_trap_supervisor(struct trapframe *frame)
return;
#endif
CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__,
CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%#lx, stval=%#lx", __func__,
exception, frame->tf_sepc, frame->tf_stval);
switch (exception) {
@ -334,13 +334,14 @@ do_trap_supervisor(struct trapframe *frame)
case SCAUSE_STORE_ACCESS_FAULT:
case SCAUSE_INST_ACCESS_FAULT:
dump_regs(frame);
panic("Memory access exception at 0x%016lx\n", frame->tf_sepc);
panic("Memory access exception at %#lx: %#lx",
frame->tf_sepc, frame->tf_stval);
break;
case SCAUSE_LOAD_MISALIGNED:
case SCAUSE_STORE_MISALIGNED:
case SCAUSE_INST_MISALIGNED:
dump_regs(frame);
panic("Misaligned address exception at %#016lx: %#016lx\n",
panic("Misaligned address exception at %#lx: %#lx",
frame->tf_sepc, frame->tf_stval);
break;
case SCAUSE_STORE_PAGE_FAULT:
@ -358,16 +359,18 @@ do_trap_supervisor(struct trapframe *frame)
kdb_trap(exception, 0, frame);
#else
dump_regs(frame);
panic("No debugger in kernel.\n");
panic("No debugger in kernel.");
#endif
break;
case SCAUSE_ILLEGAL_INSTRUCTION:
dump_regs(frame);
panic("Illegal instruction at 0x%016lx\n", frame->tf_sepc);
panic("Illegal instruction 0x%0*lx at %#lx",
(frame->tf_stval & 0x3) != 0x3 ? 4 : 8,
frame->tf_stval, frame->tf_sepc);
break;
default:
dump_regs(frame);
panic("Unknown kernel exception %lx trap value %lx\n",
panic("Unknown kernel exception %#lx trap value %#lx",
exception, frame->tf_stval);
}
}
@ -400,7 +403,7 @@ do_trap_user(struct trapframe *frame)
}
intr_enable();
CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%lx, stval=%lx", __func__,
CTR4(KTR_TRAP, "%s: exception=%lu, sepc=%#lx, stval=%#lx", __func__,
exception, frame->tf_sepc, frame->tf_stval);
switch (exception) {
@ -450,7 +453,7 @@ do_trap_user(struct trapframe *frame)
break;
default:
dump_regs(frame);
panic("Unknown userland exception %lx, trap value %lx\n",
panic("Unknown userland exception %#lx, trap value %#lx",
exception, frame->tf_stval);
}
}