From 455b194fec9dc9cd9b2afafcd7b513d0372c2f2f Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Mon, 14 Jan 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-01-14

---
 bitsy/trap.c   | 4 ++--
 mtx/trap.c     | 2 +-
 pc/ether8390.c | 2 +-
 pc/main.c      | 4 ++--
 pc/mmu.c       | 6 +++---
 pc/trap.c      | 2 +-
 port/allocb.c  | 2 +-
 port/devdraw.c | 2 +-
 port/portdat.h | 1 +
 port/proc.c    | 2 +-
 port/qio.c     | 4 ++--
 port/taslock.c | 2 +-
 port/xalloc.c  | 4 ++--
 13 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/bitsy/trap.c b/bitsy/trap.c
index 3f09c5fa3d188474d81827c51e9b5d796875b1c7..126df3fd0c481e1530ea8a0975acca629ab12799 100644
--- a/bitsy/trap.c
+++ b/bitsy/trap.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++;
diff --git a/mtx/trap.c b/mtx/trap.c
index 42ba033e43ce9d6bdbb373c193ccf0ea600ec614..48382ef6f4ed16b09c09824e43a30ea8bc258e52 100644
--- a/mtx/trap.c
+++ b/mtx/trap.c
@@ -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:
diff --git a/pc/ether8390.c b/pc/ether8390.c
index a60d8c7d2c60f89cd7cee2520a034e934e223937..6db8ab0008a44ceba7899ec2ccd6331a84e16bb6 100644
--- a/pc/ether8390.c
+++ b/pc/ether8390.c
@@ -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;
 			}
diff --git a/pc/main.c b/pc/main.c
index a32dbf186db13f59634ef8b18d54b13b2a8f02b5..2232f3494672f74e19630d3f20a17e1001683ee4 100644
--- a/pc/main.c
+++ b/pc/main.c
@@ -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;
 	}
 }
diff --git a/pc/mmu.c b/pc/mmu.c
index ebfb224dac34983eba721c158fd97cae92fa0cb6..d72fe7e81b1f097b4888389f93d7159a57fd7e23 100644
--- a/pc/mmu.c
+++ b/pc/mmu.c
@@ -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;
diff --git a/pc/trap.c b/pc/trap.c
index efd336d0e2fb8aa70f011dcf4a9ce3da24612adc..7f47817d5ce209b92f2a81e9bdd3176a269b1f14 100644
--- a/pc/trap.c
+++ b/pc/trap.c
@@ -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;
diff --git a/port/allocb.c b/port/allocb.c
index 9cfb79f79e3c823c40a95217fe79d0c763bf91c4..cda4be662d65b08582e4087fa0625171624b508e 100644
--- a/port/allocb.c
+++ b/port/allocb.c
@@ -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();
diff --git a/port/devdraw.c b/port/devdraw.c
index 8ce6ee3c25be4d518bb06c0835b9d3a037752cd2..7bd58443b4fba7edd6c195d54d74db58fb69e090 100644
--- a/port/devdraw.c
+++ b/port/devdraw.c
@@ -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;
 	}
diff --git a/port/portdat.h b/port/portdat.h
index 5f80971e228a81e6fa311dd50f8810cefe1c7dfd..47e5edf63c2356e94551ad3b9b00b65bacda9c9c 100644
--- a/port/portdat.h
+++ b/port/portdat.h
@@ -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
diff --git a/port/proc.c b/port/proc.c
index 044e4d4c11019a67ef0fad33e99b0bab5958c32f..dc219a4640ebde5a31941f5101d6e697fea24d43 100644
--- a/port/proc.c
+++ b/port/proc.c
@@ -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;
diff --git a/port/qio.c b/port/qio.c
index c20fd3ecdf99c95538cf76b7e0a78b27cb50fb1a..3f263741565ce0b8d300918038173055b9ddda7c 100644
--- a/port/qio.c
+++ b/port/qio.c
@@ -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;
diff --git a/port/taslock.c b/port/taslock.c
index 591f3cf9987e03a88839229da9a3821318555840..04ef841131ecfe99701e9babfc9f136e4db15deb 100644
--- a/port/taslock.c
+++ b/port/taslock.c
@@ -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(;;){
diff --git a/port/xalloc.c b/port/xalloc.c
index 977a0035d93838907775b1d6fdbf11f5812447c0..26211ac04d67bb36e497f4efbfc32c02c7875168 100644
--- a/port/xalloc.c
+++ b/port/xalloc.c
@@ -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);
 }