From 38c0dfacabb9b4e4ba4f8d6cd96166d355708f7e Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 16 Mar 2014 02:28:04 +0100 Subject: pc64: fix swaped error/flags in dumpregs(), remove misleading comment in apbootstrap --- sys/src/9/pc64/apbootstrap.s | 1 - sys/src/9/pc64/trap.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/src/9/pc64/apbootstrap.s b/sys/src/9/pc64/apbootstrap.s index 460ae0738..951abd5f3 100644 --- a/sys/src/9/pc64/apbootstrap.s +++ b/sys/src/9/pc64/apbootstrap.s @@ -99,7 +99,6 @@ TEXT _ap32(SB), 1, $-4 * Long mode. Welcome to 2003. * Jump out of the identity map space; * load a proper long mode GDT; - * zap the identity map; * initialise the stack and call the * C startup code in m->splpc. */ diff --git a/sys/src/9/pc64/trap.c b/sys/src/9/pc64/trap.c index 9a3a1e108..65271cec2 100644 --- a/sys/src/9/pc64/trap.c +++ b/sys/src/9/pc64/trap.c @@ -491,7 +491,7 @@ dumpregs(Ureg* ureg) ureg->cs & 0xffff, ureg->pc, ureg->sp); iprint("TYPE %.2lluX ERROR %.4lluX FLAGS %.8lluX\n", - ureg->type & 0xff, ureg->flags & 0xffffffff, ureg->error & 0xffff); + ureg->type & 0xff, ureg->error & 0xffff, ureg->flags & 0xffffffff); /* * Processor control registers. -- cgit v1.2.3