The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a959c68c97f05c019bf2c0675b687c027c5248a
commit 6a959c68c97f05c019bf2c0675b687c027c5248a Author: Konstantin Belousov <[email protected]> AuthorDate: 2022-08-21 01:47:11 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2022-08-31 01:20:28 +0000 x86: improve machdep.uprintf_signal (cherry picked from commit ff32a055542f0bbe835205a261350d9c0b6c553a) --- sys/amd64/amd64/trap.c | 6 +++--- sys/i386/i386/trap.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 6b4f7df9d174..888ecf5d0255 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -626,11 +626,11 @@ trap(struct trapframe *frame) ksi.ksi_trapno = type; ksi.ksi_addr = (void *)addr; if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %lx code %d type %d " - "addr 0x%lx rsp 0x%lx rip 0x%lx " + uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " + "addr %#lx rsp %#lx rip %#lx rax %#lx" "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, - addr, frame->tf_rsp, frame->tf_rip, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, fubyte((void *)(frame->tf_rip + 0)), fubyte((void *)(frame->tf_rip + 1)), fubyte((void *)(frame->tf_rip + 2)), diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 271ef2c3118f..5a09de409d26 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -693,12 +693,12 @@ kernel_trctrap: ksi.ksi_addr = (void *)addr; ksi.ksi_trapno = type; if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %x code %d type %d " - "addr 0x%x ss 0x%04x esp 0x%08x cs 0x%04x eip 0x%08x " + uprintf("pid %d comm %s: signal %d err %#x code %d type %d " + "addr %#x ss %#04x esp %#08x cs %#04x eip %#08x eax %#08x" "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, addr, frame->tf_ss, frame->tf_esp, frame->tf_cs, - frame->tf_eip, + frame->tf_eip, frame->tf_eax, fubyte((void *)(frame->tf_eip + 0)), fubyte((void *)(frame->tf_eip + 1)), fubyte((void *)(frame->tf_eip + 2)),
