From 40889627ba50db29a64bc6a1553c2b21e6a99b78 Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Fri, 2 Jul 2010 14:51:53 -0400 Subject: Initial version of single-cpu xv6 with page tables --- trap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'trap.c') diff --git a/trap.c b/trap.c index 86ce052..1f35708 100644 --- a/trap.c +++ b/trap.c @@ -78,13 +78,14 @@ trap(struct trapframe *tf) default: if(proc == 0 || (tf->cs&3) == 0){ // In kernel, it must be our mistake. - cprintf("unexpected trap %d from cpu %d eip %x\n", - tf->trapno, cpu->id, tf->eip); + cprintf("unexpected trap %d from cpu %d eip %x (cr2=0x%x)\n", + tf->trapno, cpu->id, tf->eip, rcr2()); panic("trap"); } // In user space, assume process misbehaved. - cprintf("pid %d %s: trap %d err %d on cpu %d eip %x -- kill proc\n", - proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip); + cprintf("pid %d %s: trap %d err %d on cpu %d eip 0x%x addr 0x%x--kill proc\n", + proc->pid, proc->name, tf->trapno, tf->err, cpu->id, tf->eip, + rcr2()); proc->killed = 1; } -- cgit v1.2.3