diff options
author | Frans Kaashoek <[email protected]> | 2018-10-03 18:13:51 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2018-10-03 18:13:51 -0400 |
commit | eb72653bd7a1dec89a79af3c377c3abf8df2064a (patch) | |
tree | 007d7be05f735de83c47d8ba9cfe66d563c63914 /trap.c | |
parent | 23a58370a4fa441fd0ee152a3e1e7619e5d8bd6b (diff) | |
download | xv6-labs-eb72653bd7a1dec89a79af3c377c3abf8df2064a.tar.gz xv6-labs-eb72653bd7a1dec89a79af3c377c3abf8df2064a.tar.bz2 xv6-labs-eb72653bd7a1dec89a79af3c377c3abf8df2064a.zip |
use x86-64 names
Diffstat (limited to 'trap.c')
-rw-r--r-- | trap.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -87,13 +87,13 @@ trap(struct trapframe *tf) default: if(myproc() == 0 || (tf->cs&3) == 0){ // In kernel, it must be our mistake. - cprintf("unexpected trap %d from cpu %d eip %x (cr2=0x%x)\n", + cprintf("unexpected trap %d from cpu %d rip %x (cr2=0x%x)\n", tf->trapno, cpuid(), tf->rip, rcr2()); 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", + "rip 0x%x addr 0x%x--kill proc\n", myproc()->pid, myproc()->name, tf->trapno, tf->err, cpuid(), tf->rip, rcr2()); myproc()->killed = 1; |