D41786.id127127.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41786.id127127.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
	@@ -334,13 +334,14 @@
	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 %#016lx: %#016lx",
	+ 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 %#016lx: %#016lx",
	frame->tf_sepc, frame->tf_stval);
	break;
	case SCAUSE_STORE_PAGE_FAULT:
	@@ -358,16 +359,17 @@
	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 %lx at %#016lx", 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);
	}
	}
	@@ -450,7 +452,7 @@
	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);
	}
	}