13 files changed, 19 insertions(+), 18 deletions(-)

M bitsy/trap.c
M mtx/trap.c
M pc/ether8390.c
M pc/main.c
M pc/mmu.c
M pc/trap.c
M port/allocb.c
M port/devdraw.c
M port/portdat.h
M port/proc.c
M port/qio.c
M port/taslock.c
M port/xalloc.c

@@ 319,7 319,7 @@ trap(Ureg *ureg)
 		case 0xa:
 		case 0xc:
 		case 0xe:
-			panic("external abort 0x%ux pc 0x%lux addr 0x%lux\n", fsr, ureg->pc, va);
+			panic("external abort 0x%lux pc 0x%lux addr 0x%lux\n", fsr, ureg->pc, va);
 			break;
 		case 0x5:
 		case 0x7:


@@ 432,7 432,7 @@ syscall(Ureg* ureg)
 	int	i, scallnr;
 
 	if((ureg->psr & PsrMask) != PsrMusr) {
-		panic("syscall: pc 0x%lux r14 0x%lux cs 0x%ux\n", ureg->pc, ureg->r14, ureg->psr);
+		panic("syscall: pc 0x%lux r14 0x%lux cs 0x%lux\n", ureg->pc, ureg->r14, ureg->psr);
 	}
 
 	m->syscall++;

@@ 229,7 229,7 @@ trap(Ureg *ur)
 		break;
 	case CSYSCALL:
 		if(!user)
-			panic("syscall in kernel: srr1 0x%4.4uX\n", ur->srr1);
+			panic("syscall in kernel: srr1 0x%4.4luX\n", ur->srr1);
 		syscall(ur);
 		return;		/* syscall() calls notify itself, don't do it again */
 	case CFPU:

@@ 302,7 302,7 @@ dp8390write(Dp8390* ctlr, ulong to, void* from, ulong len)
 				crda = regr(ctlr, Crda0);
 				crda |= regr(ctlr, Crda1)<<8;
 				if(crda != to)
-					panic("crda write %d to %d\n", crda, to);
+					panic("crda write %lud to %lud\n", crda, to);
 	
 				break;
 			}

@@ 464,7 464,7 @@ matherror(Ureg *ur, void*)
 	mathnote();
 
 	if(ur->pc & KZERO)
-		panic("fp: status %lux fppc=0x%lux pc=0x%lux",
+		panic("fp: status %ux fppc=0x%lux pc=0x%lux",
 			up->fpsave.status, up->fpsave.pc, ur->pc);
 }
 


@@ 495,7 495,7 @@ mathemu(Ureg*, void*)
 		up->fpstate = FPactive;
 		break;
 	case FPactive:
-		panic("math emu", 0);
+		panic("math emu");
 		break;
 	}
 }

@@ 268,7 268,7 @@ mmuwalk(ulong* pdb, ulong va, int level, int create)
 
 	case 2:
 		if(*table & PTESIZE)
-			panic("mmuwalk2: va %uX entry %uX\n", va, *table);
+			panic("mmuwalk2: va %luX entry %luX\n", va, *table);
 		if(!(*table & PTEVALID)){
 			pa = PADDR(xspanalloc(BY2PG, BY2PG, 0));
 			*table = pa|PTEWRITE|PTEVALID;


@@ 355,7 355,7 @@ mmukmap(ulong pa, ulong va, int size)
 				 */
 				x = PPN(*table);
 				if(x != pa)
-					panic("mmukmap1: pa %uX  entry %uX\n",
+					panic("mmukmap1: pa %luX  entry %luX\n",
 						pa, *table);
 				x += 4*MB;
 				if(pae <= x){


@@ 378,7 378,7 @@ mmukmap(ulong pa, ulong va, int size)
 				if(pte && *pte & PTEVALID){
 					x = PPN(*pte);
 					if(x != pa)
-						panic("mmukmap2: pa %uX entry %uX\n",
+						panic("mmukmap2: pa %luX entry %luX\n",
 							pa, *pte);
 					pgsz = BY2PG;
 					pa += pgsz;

@@ 506,7 506,7 @@ syscall(Ureg* ureg)
 	int	i, scallnr;
 
 	if((ureg->cs & 0xFFFF) != UESEL)
-		panic("syscall: cs 0x%4.4uX\n", ureg->cs);
+		panic("syscall: cs 0x%4.4luX\n", ureg->cs);
 
 	m->syscall++;
 	up->insyscall = 1;

@@ 61,7 61,7 @@ allocb(int size)
 	 * Can still error out of here, though.
 	 */
 	if(up == nil)
-		panic("allocb without up: %uX\n", getcallerpc(&size));
+		panic("allocb without up: %luX\n", getcallerpc(&size));
 	if((b = _allocb(size)) == nil){
 		xsummary();
 		mallocsummary();

@@ 210,7 210,7 @@ drawgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
 			devdir(c, q, up->genbuf, 0, eve, 0500, dp);
 			break;
 		default:
-			panic("drawwalk %lux", c->qid.path);
+			panic("drawwalk %llux", c->qid.path);
 		}
 		return 1;
 	}

@@ 817,6 817,7 @@ struct Uart
 #pragma	varargck	argpos	snprint	3
 #pragma	varargck	argpos	sprint	2
 #pragma	varargck	argpos	fprint	2
+#pragma varargck	argpos	panic	1
 
 #pragma	varargck	type	"lld"	vlong
 #pragma	varargck	type	"llx"	vlong

@@ 402,7 402,7 @@ procinit0(void)		/* bad planning - clashes with devproc.c */
 
 	procalloc.free = xalloc(conf.nproc*sizeof(Proc));
 	if(procalloc.free == nil)
-		panic("cannot allocate %d procs\n", conf.nproc);
+		panic("cannot allocate %lud procs\n", conf.nproc);
 	procalloc.arena = procalloc.free;
 
 	p = procalloc.free;

@@ 105,7 105,7 @@ padblock(Block *bp, int size)
 		}
 
 		if(bp->next)
-			panic("padblock 0x%uX", getcallerpc(&bp));
+			panic("padblock 0x%luX", getcallerpc(&bp));
 		n = BLEN(bp);
 		padblockcnt++;
 		nbp = allocb(size+n);


@@ 119,7 119,7 @@ padblock(Block *bp, int size)
 		size = -size;
 
 		if(bp->next)
-			panic("padblock 0x%uX", getcallerpc(&bp));
+			panic("padblock 0x%luX", getcallerpc(&bp));
 
 		if(bp->lim - bp->wp >= size)
 			return bp;

@@ 127,7 127,7 @@ ilock(Lock *l)
 	if(conf.nmach < 2)
 {
 dumplockmem("ilock:", l);
-		panic("ilock: no way out: pc %uX\n", pc);
+		panic("ilock: no way out: pc %luX\n", pc);
 }
 
 	for(;;){

@@ 90,7 90,7 @@ xspanalloc(ulong size, int align, ulong span)
 
 	a = (ulong)xalloc(size+align+span);
 	if(a == 0)
-		panic("xspanalloc: %d %d %lux\n", size, align, span);
+		panic("xspanalloc: %lud %d %lux\n", size, align, span);
 
 	if(span > 2) {
 		v = (a + span) & ~(span-1);


@@ 159,7 159,7 @@ xfree(void *p)
 	x = (Xhdr*)((ulong)p - datoff);
 	if(x->magix != Magichole) {
 		xsummary();
-		panic("xfree(0x%lux) 0x%lux!=0x%lux", p, Magichole, x->magix);
+		panic("xfree(0x%lux) 0x%lux!=0x%lux", p, (ulong)Magichole, x->magix);
 	}
 	xhole(PADDR(x), x->size);
 }