From 5838f9fcf9445cb6aa4fcf8f180654bd751b8457 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sat, 7 Nov 2015 00:39:54 -0500 Subject: [PATCH] Tweak default trap messages --- trap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trap.c b/trap.c index ae36a2e..4fed7db 100644 --- a/trap.c +++ b/trap.c @@ -89,15 +89,15 @@ trap(struct trapframe *tf) if(proc == 0 || (tf->cs&3) == 0){ prepanic(); // In kernel, it must be our mistake. - cprintf("unexpected trap %d from cpu %d eip %x (cr2=0x%x)\n", - tf->trapno, cpu->id, tf->eip, rcr2()); + cprintf("unexpected trap %d err %d on cpu %d eip %x addr 0x%x eflags 0x%x\n", + tf->trapno, tf->err, cpu->id, tf->eip, rcr2(), tf->eflags); panic("trap"); } // In user space, assume process misbehaved. cprintf("pid %d %s: trap %d err %d on cpu %d " - "eip 0x%x addr 0x%x--kill proc\n", + "eip 0x%x addr 0x%x eflags 0x%x -- kill proc\n", proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip, - rcr2()); + rcr2(), tf->eflags); proc->killed = 1; } -- 2.50.1