fix unnecessary lack of portability. Reference: /n/atom/patch/applied/386trapclean Date: Thu Jun 5 14:19:29 CES 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/9/pc/trap.c Thu Jun 5 14:19:06 2014 +++ /sys/src/9/pc/trap.c Thu Jun 5 14:19:07 2014 @@ -547,9 +547,9 @@ iprint("dumpstack\n"); x = 0; - x += iprint("ktrace /kernel/path %.8lux %.8lux <pc, ureg->sp); + x += iprint("ktrace /kernel/path %#p %#p <pc, ureg->sp); i = 0; - if(up + if(up != nil && (uintptr)&l >= (uintptr)up->kstack && (uintptr)&l <= (uintptr)up->kstack+KSTACK) estack = (uintptr)up->kstack+KSTACK; @@ -645,12 +645,12 @@ if(vmapsync(addr)) return; if(addr >= TSTKTOP) - panic("kernel fault: bad address pc=0x%.8lux addr=0x%.8lux", ureg->pc, addr); + panic("kernel fault: bad address pc=%#p addr=%#p", ureg->pc, addr); if(up == nil) - panic("kernel fault: no user process pc=0x%.8lux addr=0x%.8lux", ureg->pc, addr); + panic("kernel fault: no user process pc=%#p addr=%#p", ureg->pc, addr); } if(up == nil) - panic("user fault: up=0 pc=0x%.8lux addr=0x%.8lux", ureg->pc, addr); + panic("user fault: up=0 pc=%#p addr=%#p", ureg->pc, addr); insyscall = up->insyscall; up->insyscall = 1; @@ -662,7 +662,7 @@ } checkpages(); checkfault(addr, ureg->pc); - sprint(buf, "sys: trap: fault %s addr=0x%lux", + sprint(buf, "sys: trap: fault %s addr=%#p", read ? "read" : "write", addr); postnote(up, 1, buf, NDebug); } @@ -731,7 +731,7 @@ ret = -1; if(!waserror()){ if(scallnr >= nsyscall || systab[scallnr] == 0){ - pprint("bad sys call number %lud pc %lux\n", + pprint("bad sys call number %lud pc %#p\n", scallnr, ureg->pc); postnote(up, 1, "sys: bad sys call", NDebug); error(Ebadarg); @@ -854,7 +854,7 @@ sp = ureg->sp; sp -= 256; /* debugging: preserve context causing problem */ sp -= sizeof(Ureg); -if(0) print("%s %lud: notify %.8lux %.8lux %.8lux %s\n", +if(0) print("%s %lud: notify %#p %#p %#p %s\n", up->text, up->pid, ureg->pc, ureg->sp, sp, n->msg); if(!okaddr((ulong)up->notify, 1, 0) @@ -938,7 +938,7 @@ switch(arg0){ case NCONT: case NRSTR: -if(0) print("%s %lud: noted %.8lux %.8lux\n", +if(0) print("%s %lud: noted %#p %#p\n", up->text, up->pid, nureg->pc, nureg->sp); if(!okaddr(nureg->pc, 1, 0) || !okaddr(nureg->sp, BY2WD, 0)){ qunlock(&up->debug); @@ -973,7 +973,7 @@ qunlock(&up->debug); if(up->lastnote.flag == NDebug){ if(unk != NCONT) - pprint("unknown noted arg 0x%lux\n", arg0); + pprint("unknown noted arg %#p\n", arg0); pprint("suicide: %s\n", up->lastnote.msg); } pexit(up->lastnote.msg, up->lastnote.flag!=NDebug); --- /sys/src/9/pcpae/trap.c Thu Jun 5 14:19:09 2014 +++ /sys/src/9/pcpae/trap.c Thu Jun 5 14:19:10 2014 @@ -547,9 +547,9 @@ iprint("dumpstack\n"); x = 0; - x += iprint("ktrace /kernel/path %.8lux %.8lux <pc, ureg->sp); + x += iprint("ktrace /kernel/path %#p %#p <pc, ureg->sp); i = 0; - if(up + if(up != nil && (uintptr)&l >= (uintptr)up->kstack && (uintptr)&l <= (uintptr)up->kstack+KSTACK) estack = (uintptr)up->kstack+KSTACK; @@ -645,12 +645,12 @@ if(vmapsync(addr)) return; if(addr >= TSTKTOP) - panic("kernel fault: bad address pc=0x%.8lux addr=0x%.8lux", ureg->pc, addr); + panic("kernel fault: bad address pc=%#p addr=%#p", ureg->pc, addr); if(up == nil) - panic("kernel fault: no user process pc=0x%.8lux addr=0x%.8lux", ureg->pc, addr); + panic("kernel fault: no user process pc=%#p addr=%#p", ureg->pc, addr); } if(up == nil) - panic("user fault: up=0 pc=0x%.8lux addr=0x%.8lux", ureg->pc, addr); + panic("user fault: up=0 pc=%#p addr=%#p", ureg->pc, addr); insyscall = up->insyscall; up->insyscall = 1; @@ -662,7 +662,7 @@ } checkpages(); checkfault(addr, ureg->pc); - sprint(buf, "sys: trap: fault %s addr=0x%lux", + sprint(buf, "sys: trap: fault %s addr=%#p", read ? "read" : "write", addr); postnote(up, 1, buf, NDebug); } @@ -731,7 +731,7 @@ ret = -1; if(!waserror()){ if(scallnr >= nsyscall || systab[scallnr] == 0){ - pprint("bad sys call number %lud pc %lux\n", + pprint("bad sys call number %lud pc %#p\n", scallnr, ureg->pc); postnote(up, 1, "sys: bad sys call", NDebug); error(Ebadarg); @@ -854,7 +854,7 @@ sp = ureg->sp; sp -= 256; /* debugging: preserve context causing problem */ sp -= sizeof(Ureg); -if(0) print("%s %lud: notify %.8lux %.8lux %.8lux %s\n", +if(0) print("%s %lud: notify %#p %#p %#p %s\n", up->text, up->pid, ureg->pc, ureg->sp, sp, n->msg); if(!okaddr((ulong)up->notify, 1, 0) @@ -938,7 +938,7 @@ switch(arg0){ case NCONT: case NRSTR: -if(0) print("%s %lud: noted %.8lux %.8lux\n", +if(0) print("%s %lud: noted %#p %#p\n", up->text, up->pid, nureg->pc, nureg->sp); if(!okaddr(nureg->pc, 1, 0) || !okaddr(nureg->sp, BY2WD, 0)){ qunlock(&up->debug); @@ -973,7 +973,7 @@ qunlock(&up->debug); if(up->lastnote.flag == NDebug){ if(unk != NCONT) - pprint("unknown noted arg 0x%lux\n", arg0); + pprint("unknown noted arg %#p\n", arg0); pprint("suicide: %s\n", up->lastnote.msg); } pexit(up->lastnote.msg, up->lastnote.flag!=NDebug);