kernel: get rid of PTR2UINT() and UINT2PTR() macros

25 files changed, 92 insertions, 106 deletions

diff --git a/sys/src/9/bcm/arch.c b/sys/src/9/bcm/arch.c
index baedbbb27..84c442fe9 100644
--- a/sys/src/9/bcm/arch.c
+++ b/sys/src/9/bcm/arch.c
@@ -24,7 +24,7 @@ setkernur(Ureg* ureg, Proc* p)
 {
 	ureg->pc = p->sched.pc;
 	ureg->sp = p->sched.sp+4;
-	ureg->r14 = PTR2UINT(sched);
+	ureg->r14 = (uintptr)sched;
 }
 
 /*
@@ -95,8 +95,8 @@ linkproc(void)
 void
 kprocchild(Proc *p, void (*func)(void*), void *arg)
 {
-	p->sched.pc = PTR2UINT(linkproc);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK);
+	p->sched.pc = (uintptr)linkproc;
+	p->sched.sp = (uintptr)p->kstack+KSTACK;
 
 	p->kpfun = func;
 	p->kparg = arg;
diff --git a/sys/src/9/bcm/fns.h b/sys/src/9/bcm/fns.h
index 56ce4085d..474f1fc1d 100644
--- a/sys/src/9/bcm/fns.h
+++ b/sys/src/9/bcm/fns.h
@@ -131,14 +131,9 @@ extern void kexit(Ureg*);
 #define	kmapinval()
 #define countpagerefs(a, b)
 
-#define PTR2UINT(p)	((uintptr)(p))
-#define UINT2PTR(i)	((void*)(i))
-
 #define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 
-#define KADDR(pa)	UINT2PTR(KZERO    | ((uintptr)(pa) & ~KSEGM))
-#define PADDR(va)	PTR2UINT(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
-#define DMAADDR(va)	PTR2UINT(BUSDRAM  | ((uintptr)(va) & ~KSEGM))
-#define DMAIO(va)	PTR2UINT(BUSIO    | ((uintptr)(va) & ~VIRTIO))
+#define KADDR(pa)	((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
+#define PADDR(va)	(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
 
 #define MASK(v)	((1UL << (v)) - 1)	/* mask `v' bits wide */
diff --git a/sys/src/9/bcm/main.c b/sys/src/9/bcm/main.c
index 628bbef13..9fd56d8f1 100644
--- a/sys/src/9/bcm/main.c
+++ b/sys/src/9/bcm/main.c
@@ -367,7 +367,7 @@ bootargs(uintptr base)
 	 * of the argument list checked in syscall.
 	 */
 	i = oargblen+1;
-	p = UINT2PTR(STACKALIGN(base + BY2PG - sizeof(Tos) - i));
+	p = (void*)STACKALIGN(base + BY2PG - sizeof(Tos) - i);
 	memmove(p, oargb, i);
 
 	/*
@@ -379,7 +379,7 @@ bootargs(uintptr base)
 	 * not the usual (int argc, char* argv[])
 	 */
 	av = (char**)(p - (oargc+1)*sizeof(char*));
-	ssize = base + BY2PG - PTR2UINT(av);
+	ssize = base + BY2PG - (uintptr)av;
 	for(i = 0; i < oargc; i++)
 		*av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG);
 	*av = nil;
@@ -415,8 +415,8 @@ userinit(void)
 	/*
 	 * Kernel Stack
 	 */
-	p->sched.pc = PTR2UINT(init0);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr));
+	p->sched.pc = (uintptr)init0;
+	p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr);
 	p->sched.sp = STACKALIGN(p->sched.sp);
 
 	/*
@@ -445,7 +445,7 @@ userinit(void)
 	pg->txtflush = ~0;
 	segpage(s, pg);
 	k = kmap(s->map[0]->pages[0]);
-	memmove(UINT2PTR(VA(k)), initcode, sizeof initcode);
+	memmove((void*)VA(k), initcode, sizeof initcode);
 	kunmap(k);
 
 	ready(p);
@@ -485,7 +485,7 @@ confinit(void)
 		conf.mem[0].limit = conf.mem[0].base + memsize;
 
 	conf.npage = 0;
-	pa = PADDR(PGROUND(PTR2UINT(end)));
+	pa = PADDR(PGROUND((uintptr)end));
 
 	/*
 	 *  we assume that the kernel is at the beginning of one of the
diff --git a/sys/src/9/bcm/mmu.c b/sys/src/9/bcm/mmu.c
index 431c2bff9..9d2e3709c 100644
--- a/sys/src/9/bcm/mmu.c
+++ b/sys/src/9/bcm/mmu.c
@@ -91,7 +91,7 @@ mmul2empty(Proc* proc, int clear)
 	l2 = &proc->mmul2;
 	for(page = *l2; page != nil; page = page->next){
 		if(clear)
-			memset(UINT2PTR(page->va), 0, L2size);
+			memset((void*)page->va, 0, L2size);
 		l1[page->daddr] = Fault;
 		l2 = &page->next;
 	}
@@ -241,7 +241,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 				m->mmul1hi = L1hi - x;
 		}
 	}
-	pte = UINT2PTR(KADDR(PPN(*l1)));
+	pte = KADDR(PPN(*l1));
 
 	/* protection bits are
 	 *	PTERONLY|PTEVALID;
@@ -283,7 +283,7 @@ mmuuncache(void* v, usize size)
 	 * Uncache a Section, must already be
 	 * valid in the MMU.
 	 */
-	va = PTR2UINT(v);
+	va = (uintptr)v;
 	assert(!(va & (1*MiB-1)) && size == 1*MiB);
 
 	x = L1X(va);
diff --git a/sys/src/9/bcm/trap.c b/sys/src/9/bcm/trap.c
index dcab22a6d..6b15b577d 100644
--- a/sys/src/9/bcm/trap.c
+++ b/sys/src/9/bcm/trap.c
@@ -405,7 +405,7 @@ callwithureg(void (*fn)(Ureg*))
 	Ureg ureg;
 
 	ureg.pc = getcallerpc(&fn);
-	ureg.sp = PTR2UINT(&fn);
+	ureg.sp = (uintptr)&fn;
 	fn(&ureg);
 }
 
diff --git a/sys/src/9/bcm/vcore.c b/sys/src/9/bcm/vcore.c
index f939787b4..7c3f525e2 100644
--- a/sys/src/9/bcm/vcore.c
+++ b/sys/src/9/bcm/vcore.c
@@ -149,7 +149,7 @@ vcreq(int tag, void *buf, int vallen, int rsplen)
 		memmove(prop->data, buf, vallen);
 	cachedwbinvse(prop, prop->len);
 	for(;;){
-		aprop = busaddr? dmaaddr(prop) : PTR2UINT(prop);
+		aprop = busaddr? dmaaddr(prop) : (uintptr)prop;
 		vcwrite(ChanProps, aprop);
 		r = vcread(ChanProps);
 		if(r == aprop)
diff --git a/sys/src/9/kw/arch.c b/sys/src/9/kw/arch.c
index d59c5794c..cb6d0e904 100644
--- a/sys/src/9/kw/arch.c
+++ b/sys/src/9/kw/arch.c
@@ -24,7 +24,7 @@ setkernur(Ureg* ureg, Proc* p)
 {
 	ureg->pc = p->sched.pc;
 	ureg->sp = p->sched.sp+4;
-	ureg->r14 = PTR2UINT(sched);
+	ureg->r14 = (uintptr)sched;
 }
 
 /*
@@ -95,8 +95,8 @@ linkproc(void)
 void
 kprocchild(Proc *p, void (*func)(void*), void *arg)
 {
-	p->sched.pc = PTR2UINT(linkproc);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK);
+	p->sched.pc = (uintptr)linkproc;
+	p->sched.sp = (uintptr)p->kstack+KSTACK;
 
 	p->kpfun = func;
 	p->kparg = arg;
diff --git a/sys/src/9/kw/fns.h b/sys/src/9/kw/fns.h
index b862dd835..6fcc3878f 100644
--- a/sys/src/9/kw/fns.h
+++ b/sys/src/9/kw/fns.h
@@ -174,9 +174,6 @@ extern void kexit(Ureg*);
 #define	getpgcolor(a)	0
 #define	kmapinval()
 
-#define PTR2UINT(p)	((uintptr)(p))
-#define UINT2PTR(i)	((void*)(i))
-
 #define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 
 /*
@@ -195,7 +192,7 @@ extern void kexit(Ureg*);
 /*
  * These are not good enough.
  */
-#define KADDR(pa)	UINT2PTR(KZERO|((uintptr)(pa)))
-#define PADDR(va)	PTR2UINT(((uintptr)(va)) & ~KSEGM)
+#define KADDR(pa)	((void*)(KZERO|((uintptr)(pa))))
+#define PADDR(va)	(((uintptr)(va)) & ~KSEGM)
 
 #define MASK(v)	((1UL << (v)) - 1)	/* mask `v' bits wide */
diff --git a/sys/src/9/kw/main.c b/sys/src/9/kw/main.c
index ff9a7ee34..c0665ec77 100644
--- a/sys/src/9/kw/main.c
+++ b/sys/src/9/kw/main.c
@@ -460,7 +460,7 @@ bootargs(uintptr base)
 	 * of the argument list checked in syscall.
 	 */
 	i = oargblen+1;
-	p = UINT2PTR(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i));
+	p = (void*)(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i));
 	memmove(p, oargb, i);
 
 	/*
@@ -473,7 +473,7 @@ bootargs(uintptr base)
 	 * unused so it doesn't matter (at the moment...).
 	 */
 	av = (char**)(p - (oargc+2)*sizeof(char*));
-	ssize = base + BY2PG - PTR2UINT(av);
+	ssize = base + BY2PG - (uintptr)av;
 	*av++ = (char*)oargc;
 	for(i = 0; i < oargc; i++)
 		*av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG);
@@ -515,8 +515,8 @@ userinit(void)
 	/*
 	 * Kernel Stack
 	 */
-	p->sched.pc = PTR2UINT(init0);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr));
+	p->sched.pc = (uintptr)init0;
+	p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr);
 	p->sched.sp = STACKALIGN(p->sched.sp);
 
 	/*
@@ -545,7 +545,7 @@ userinit(void)
 	pg->txtflush = ~0;
 	segpage(s, pg);
 	k = kmap(s->map[0]->pages[0]);
-	memmove(UINT2PTR(VA(k)), initcode, sizeof initcode);
+	memmove((void*)VA(k), initcode, sizeof initcode);
 	kunmap(k);
 
 	ready(p);
@@ -578,7 +578,7 @@ confinit(void)
 	memmove(conf.mem, sheevamem, sizeof(sheevamem));
 
 	conf.npage = 0;
-	pa = PADDR(PGROUND(PTR2UINT(end)));
+	pa = PADDR(PGROUND((uintptr)end));
 
 	/*
 	 *  we assume that the kernel is at the beginning of one of the
diff --git a/sys/src/9/kw/mmu.c b/sys/src/9/kw/mmu.c
index 72db1fb65..bab4238fd 100644
--- a/sys/src/9/kw/mmu.c
+++ b/sys/src/9/kw/mmu.c
@@ -154,7 +154,7 @@ mmul2empty(Proc* proc, int clear)
 	l2 = &proc->mmul2;
 	for(page = *l2; page != nil; page = page->next){
 		if(clear)
-			memset(UINT2PTR(page->va), 0, BY2PG);
+			memset((void*)page->va, 0, BY2PG);
 		l1[page->daddr] = Fault;
 		l2 = &page->next;
 	}
@@ -301,7 +301,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 		else{
 			pg = up->mmul2cache;
 			up->mmul2cache = pg->next;
-			memset(UINT2PTR(pg->va), 0, BY2PG);
+			memset((void*)pg->va, 0, BY2PG);
 		}
 		pg->daddr = x;
 		pg->next = up->mmul2;
@@ -323,7 +323,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 				m->mmul1hi = x;
 		}
 	}
-	pte = UINT2PTR(KADDR(PPN(*l1)));
+	pte = (void*)KADDR(PPN(*l1));
 	//print("pte %#p index %ld %#ux\n", pte, L2X(va), *(pte+L2X(va)));
 
 	/* protection bits are
@@ -372,7 +372,7 @@ mmuuncache(void* v, usize size)
 	 * Uncache a Section, must already be
 	 * valid in the MMU.
 	 */
-	va = PTR2UINT(v);
+	va = (uintptr)v;
 	assert(!(va & (1*MiB-1)) && size == 1*MiB);
 
 	x = L1X(va);
@@ -459,7 +459,7 @@ vmap(uintptr pa, usize size)
 	 * will fail.
 	 */
 	if(pa+size < 4*MiB)
-		return UINT2PTR(kseg0|pa);
+		return (void*)(kseg0|pa);
 
 	osize = size;
 	o = pa & (BY2PG-1);
@@ -473,7 +473,7 @@ vmap(uintptr pa, usize size)
 		panic("vmap(%#p, %ld) called from %#p: mmukmap fails %#p",
 			pa+o, osize, getcallerpc(&pa), pae);
 
-	return UINT2PTR(va+o);
+	return (void*)(va+o);
 }
 
 /* from 386 */
diff --git a/sys/src/9/kw/syscall.c b/sys/src/9/kw/syscall.c
index 30cc29c40..79ea7642e 100644
--- a/sys/src/9/kw/syscall.c
+++ b/sys/src/9/kw/syscall.c
@@ -41,7 +41,7 @@ noted(Ureg* cur, uintptr arg0)
 	nf = up->ureg;
 
 	/* sanity clause */
-	if(!okaddr(PTR2UINT(nf), sizeof(NFrame), 0)){
+	if(!okaddr((uintptr)nf, sizeof(NFrame), 0)){
 		qunlock(&up->debug);
 		pprint("bad ureg in noted %#p\n", nf);
 		pexit("Suicide", 0);
@@ -77,8 +77,8 @@ noted(Ureg* cur, uintptr arg0)
 		nf->arg1 = nf->msg;
 		nf->arg0 = &nf->ureg;
 		nf->ip = 0;
-		cur->sp = PTR2UINT(nf);
-		cur->r0 = PTR2UINT(nf->arg0);
+		cur->sp = (uintptr)nf;
+		cur->r0 = (uintptr)nf->arg0;
 		break;
 	default:
 		up->lastnote.flag = NDebug;
@@ -140,7 +140,7 @@ notify(Ureg* ureg)
 		qunlock(&up->debug);
 		pexit(n->msg, n->flag != NDebug);
 	}
-	if(!okaddr(PTR2UINT(up->notify), 1, 0)){
+	if(!okaddr((uintptr)up->notify, 1, 0)){
 		qunlock(&up->debug);
 		pprint("suicide: notify function address %#p\n", up->notify);
 		pexit("Suicide", 0);
@@ -153,7 +153,7 @@ notify(Ureg* ureg)
 		pexit("Suicide", 0);
 	}
 
-	nf = UINT2PTR(sp);
+	nf = (void*)sp;
 	memmove(&nf->ureg, ureg, sizeof(Ureg));
 	nf->old = up->ureg;
 	up->ureg = nf;
@@ -163,8 +163,8 @@ notify(Ureg* ureg)
 	nf->ip = 0;
 
 	ureg->sp = sp;
-	ureg->pc = PTR2UINT(up->notify);
-	ureg->r0 = PTR2UINT(nf->arg0);
+	ureg->pc = (uintptr)up->notify;
+	ureg->r0 = (uintptr)nf->arg0;
 
 	up->notified = 1;
 	up->nnote--;
diff --git a/sys/src/9/kw/trap.c b/sys/src/9/kw/trap.c
index ebd98db6f..131413c11 100644
--- a/sys/src/9/kw/trap.c
+++ b/sys/src/9/kw/trap.c
@@ -602,7 +602,7 @@ callwithureg(void (*fn)(Ureg*))
 	Ureg ureg;
 
 	ureg.pc = getcallerpc(&fn);
-	ureg.sp = PTR2UINT(&fn);
+	ureg.sp = (uintptr)&fn;
 	fn(&ureg);
 }
 
diff --git a/sys/src/9/omap/arch.c b/sys/src/9/omap/arch.c
index 007c18b01..19588b3e8 100644
--- a/sys/src/9/omap/arch.c
+++ b/sys/src/9/omap/arch.c
@@ -24,7 +24,7 @@ setkernur(Ureg* ureg, Proc* p)
 {
 	ureg->pc = p->sched.pc;
 	ureg->sp = p->sched.sp+4;
-	ureg->r14 = PTR2UINT(sched);
+	ureg->r14 = (uintptr)sched;
 }
 
 /*
@@ -95,8 +95,8 @@ linkproc(void)
 void
 kprocchild(Proc *p, void (*func)(void*), void *arg)
 {
-	p->sched.pc = PTR2UINT(linkproc);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK);
+	p->sched.pc = (uintptr)linkproc;
+	p->sched.sp = (uintptr)p->kstack+KSTACK;
 
 	p->kpfun = func;
 	p->kparg = arg;
diff --git a/sys/src/9/omap/fns.h b/sys/src/9/omap/fns.h
index 6735ae2d8..39e0adbda 100644
--- a/sys/src/9/omap/fns.h
+++ b/sys/src/9/omap/fns.h
@@ -165,13 +165,10 @@ extern void kexit(Ureg*);
 #define	getpgcolor(a)	0
 #define	kmapinval()
 
-#define PTR2UINT(p)	((uintptr)(p))
-#define UINT2PTR(i)	((void*)(i))
-
 #define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 
-#define KADDR(pa)	UINT2PTR(KZERO    | ((uintptr)(pa) & ~KSEGM))
-#define PADDR(va)	PTR2UINT(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
+#define KADDR(pa)	((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
+#define PADDR(va)	(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
 
 #define wave(c) *(ulong *)PHYSCONS = (c)
 
diff --git a/sys/src/9/omap/main.c b/sys/src/9/omap/main.c
index f39105f36..ab27d0f2b 100644
--- a/sys/src/9/omap/main.c
+++ b/sys/src/9/omap/main.c
@@ -447,7 +447,7 @@ bootargs(uintptr base)
 	 * of the argument list checked in syscall.
 	 */
 	i = oargblen+1;
-	p = UINT2PTR(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i));
+	p = (void*)(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i));
 	memmove(p, oargb, i);
 
 	/*
@@ -460,7 +460,7 @@ bootargs(uintptr base)
 	 * unused so it doesn't matter (at the moment...).
 	 */
 	av = (char**)(p - (oargc+2)*sizeof(char*));
-	ssize = base + BY2PG - PTR2UINT(av);
+	ssize = base + BY2PG - (uintptr)av;
 	*av++ = (char*)oargc;
 	for(i = 0; i < oargc; i++)
 		*av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG);
@@ -502,8 +502,8 @@ userinit(void)
 	/*
 	 * Kernel Stack
 	 */
-	p->sched.pc = PTR2UINT(init0);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr));
+	p->sched.pc = (uintptr)init0;
+	p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr);
 	p->sched.sp = STACKALIGN(p->sched.sp);
 
 	/*
@@ -532,7 +532,7 @@ userinit(void)
 	pg->txtflush = ~0;
 	segpage(s, pg);
 	k = kmap(s->map[0]->pages[0]);
-	memmove(UINT2PTR(VA(k)), initcode, sizeof initcode);
+	memmove((void*)VA(k), initcode, sizeof initcode);
 	kunmap(k);
 
 	ready(p);
@@ -596,7 +596,7 @@ confinit(void)
 	memmove(conf.mem, omapmem, sizeof(omapmem));
 
 	conf.npage = 0;
-	pa = PADDR(PGROUND(PTR2UINT(end)));
+	pa = PADDR(PGROUND((uintptr)end));
 
 	/*
 	 *  we assume that the kernel is at the beginning of one of the
diff --git a/sys/src/9/omap/mmu.c b/sys/src/9/omap/mmu.c
index 9b2084caf..d427f1d76 100644
--- a/sys/src/9/omap/mmu.c
+++ b/sys/src/9/omap/mmu.c
@@ -138,7 +138,7 @@ mmul2empty(Proc* proc, int clear)
 	l2 = &proc->mmul2;
 	for(page = *l2; page != nil; page = page->next){
 		if(clear)
-			memset(UINT2PTR(page->va), 0, BY2PG);
+			memset((void*)page->va, 0, BY2PG);
 		l1[page->daddr] = Fault;
 		l2 = &page->next;
 	}
@@ -282,7 +282,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 		else{
 			pg = up->mmul2cache;
 			up->mmul2cache = pg->next;
-			memset(UINT2PTR(pg->va), 0, BY2PG);
+			memset((void*)pg->va, 0, BY2PG);
 		}
 		pg->daddr = x;
 		pg->next = up->mmul2;
@@ -302,7 +302,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 				m->mmul1hi = x;
 		}
 	}
-	pte = UINT2PTR(KADDR(PPN(*l1)));
+	pte = KADDR(PPN(*l1));
 	//print("pte %#p index %ld was %#ux\n", pte, L2X(va), *(pte+L2X(va)));
 
 	/* protection bits are
@@ -349,7 +349,7 @@ mmuuncache(void* v, usize size)
 	 * Uncache a Section, must already be
 	 * valid in the MMU.
 	 */
-	va = PTR2UINT(v);
+	va = (uintptr)v;
 	assert(!(va & (1*MiB-1)) && size == 1*MiB);
 
 	x = L1X(va);
@@ -433,7 +433,7 @@ vmap(uintptr pa, usize size)
 	 * will fail.
 	 */
 	if(pa+size < 4*MiB)
-		return UINT2PTR(kseg0|pa);
+		return (void*)(kseg0|pa);
 
 	osize = size;
 	o = pa & (BY2PG-1);
@@ -447,7 +447,7 @@ vmap(uintptr pa, usize size)
 		panic("vmap(%#p, %ld) called from %#p: mmukmap fails %#p",
 			pa+o, osize, getcallerpc(&pa), pae);
 
-	return UINT2PTR(va+o);
+	return (void*)(va+o);
 }
 
 /* from 386 */
diff --git a/sys/src/9/omap/syscall.c b/sys/src/9/omap/syscall.c
index 882aef2cc..08089093c 100644
--- a/sys/src/9/omap/syscall.c
+++ b/sys/src/9/omap/syscall.c
@@ -41,7 +41,7 @@ noted(Ureg* cur, uintptr arg0)
 	nf = up->ureg;
 
 	/* sanity clause */
-	if(!okaddr(PTR2UINT(nf), sizeof(NFrame), 0)){
+	if(!okaddr((uintptr)nf, sizeof(NFrame), 0)){
 		qunlock(&up->debug);
 		pprint("bad ureg in noted %#p\n", nf);
 		pexit("Suicide", 0);
@@ -77,8 +77,8 @@ noted(Ureg* cur, uintptr arg0)
 		nf->arg1 = nf->msg;
 		nf->arg0 = &nf->ureg;
 		nf->ip = 0;
-		cur->sp = PTR2UINT(nf);
-		cur->r0 = PTR2UINT(nf->arg0);
+		cur->sp = (uintptr)nf;
+		cur->r0 = (uintptr)nf->arg0;
 		break;
 	default:
 		up->lastnote.flag = NDebug;
@@ -140,7 +140,7 @@ notify(Ureg* ureg)
 		qunlock(&up->debug);
 		pexit(n->msg, n->flag != NDebug);
 	}
-	if(!okaddr(PTR2UINT(up->notify), 1, 0)){
+	if(!okaddr((uintptr)up->notify, 1, 0)){
 		qunlock(&up->debug);
 		pprint("suicide: notify function address %#p\n", up->notify);
 		pexit("Suicide", 0);
@@ -153,7 +153,7 @@ notify(Ureg* ureg)
 		pexit("Suicide", 0);
 	}
 
-	nf = UINT2PTR(sp);
+	nf = (void*)sp;
 	memmove(&nf->ureg, ureg, sizeof(Ureg));
 	nf->old = up->ureg;
 	up->ureg = nf;
@@ -163,8 +163,8 @@ notify(Ureg* ureg)
 	nf->ip = 0;
 
 	ureg->sp = sp;
-	ureg->pc = PTR2UINT(up->notify);
-	ureg->r0 = PTR2UINT(nf->arg0);
+	ureg->pc = (uintptr)up->notify;
+	ureg->r0 = (uintptr)nf->arg0;
 
 	up->notified = 1;
 	up->nnote--;
diff --git a/sys/src/9/omap/trap.c b/sys/src/9/omap/trap.c
index d7f1a592b..3e27f08b4 100644
--- a/sys/src/9/omap/trap.c
+++ b/sys/src/9/omap/trap.c
@@ -644,7 +644,7 @@ callwithureg(void (*fn)(Ureg*))
 	Ureg ureg;
 
 	ureg.pc = getcallerpc(&fn);
-	ureg.sp = PTR2UINT(&fn);
+	ureg.sp = (uintptr)&fn;
 	fn(&ureg);
 }
 
diff --git a/sys/src/9/port/syscallfmt.c b/sys/src/9/port/syscallfmt.c
index 5ae5b31ab..26f2fd245 100644
--- a/sys/src/9/port/syscallfmt.c
+++ b/sys/src/9/port/syscallfmt.c
@@ -114,7 +114,7 @@ syscallfmt(ulong syscallno, uintptr pc, va_list list)
 		a = va_arg(list, char*);
 		fmtuserstring(&fmt, a, "");
 		argv = va_arg(list, char**);
-		evenaddr(PTR2UINT(argv));
+		evenaddr((uintptr)argv);
 		for(;;){
 			validaddr((uintptr)argv, sizeof(char**), 0);
 			a = *(char **)argv;
diff --git a/sys/src/9/teg2/arch.c b/sys/src/9/teg2/arch.c
index ffac56382..11c5437bf 100644
--- a/sys/src/9/teg2/arch.c
+++ b/sys/src/9/teg2/arch.c
@@ -24,7 +24,7 @@ setkernur(Ureg* ureg, Proc* p)
 {
 	ureg->pc = p->sched.pc;
 	ureg->sp = p->sched.sp+4;
-	ureg->r14 = PTR2UINT(sched);
+	ureg->r14 = (uintptr)sched;
 }
 
 /*
@@ -95,8 +95,8 @@ linkproc(void)
 void
 kprocchild(Proc *p, void (*func)(void*), void *arg)
 {
-	p->sched.pc = PTR2UINT(linkproc);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK);
+	p->sched.pc = (uintptr)linkproc;
+	p->sched.sp = (uintptr)p->kstack+KSTACK;
 
 	p->kpfun = func;
 	p->kparg = arg;
diff --git a/sys/src/9/teg2/fns.h b/sys/src/9/teg2/fns.h
index a01f6278d..d4bf7e919 100644
--- a/sys/src/9/teg2/fns.h
+++ b/sys/src/9/teg2/fns.h
@@ -217,12 +217,9 @@ extern void kexit(Ureg*);
 #define	getpgcolor(a)	0
 #define	kmapinval()
 
-#define PTR2UINT(p)	((uintptr)(p))
-#define UINT2PTR(i)	((void*)(i))
-
 #define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 
-#define KADDR(pa)	UINT2PTR(KZERO    | ((uintptr)(pa) & ~KSEGM))
-#define PADDR(va)	PTR2UINT(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
+#define KADDR(pa)	((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
+#define PADDR(va)	(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
 
 #define MASK(v)	((1UL << (v)) - 1)	/* mask `v' bits wide */
diff --git a/sys/src/9/teg2/main.c b/sys/src/9/teg2/main.c
index 892224132..53c5ed456 100644
--- a/sys/src/9/teg2/main.c
+++ b/sys/src/9/teg2/main.c
@@ -643,7 +643,7 @@ bootargs(uintptr base)
 	 * of the argument list checked in syscall.
 	 */
 	i = oargblen+1;
-	p = UINT2PTR(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i));
+	p = (void*)(STACKALIGN(base + BY2PG - sizeof(up->s.args) - i));
 	memmove(p, oargb, i);
 
 	/*
@@ -656,7 +656,7 @@ bootargs(uintptr base)
 	 * unused so it doesn't matter (at the moment...).
 	 */
 	av = (char**)(p - (oargc+2)*sizeof(char*));
-	ssize = base + BY2PG - PTR2UINT(av);
+	ssize = base + BY2PG - (uintptr)av;
 	*av++ = (char*)oargc;
 	for(i = 0; i < oargc; i++)
 		*av++ = (oargv[i] - oargb) + (p - base) + (USTKTOP - BY2PG);
@@ -698,8 +698,8 @@ userinit(void)
 	/*
 	 * Kernel Stack
 	 */
-	p->sched.pc = PTR2UINT(init0);
-	p->sched.sp = PTR2UINT(p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr));
+	p->sched.pc = (uintptr)init0;
+	p->sched.sp = (uintptr)p->kstack+KSTACK-sizeof(up->s.args)-sizeof(uintptr);
 	p->sched.sp = STACKALIGN(p->sched.sp);
 
 	/*
@@ -728,7 +728,7 @@ userinit(void)
 	pg->txtflush = ~0;
 	segpage(s, pg);
 	k = kmap(s->map[0]->pages[0]);
-	memmove(UINT2PTR(VA(k)), initcode, sizeof initcode);
+	memmove((void*)VA(k), initcode, sizeof initcode);
 	kunmap(k);
 
 	ready(p);
@@ -797,7 +797,7 @@ confinit(void)
 	memmove(conf.mem, tsmem, sizeof(tsmem));
 
 	conf.npage = 0;
-	pa = PADDR(PGROUND(PTR2UINT(end)));
+	pa = PADDR(PGROUND((uintptr)end));
 
 	/*
 	 *  we assume that the kernel is at the beginning of one of the
diff --git a/sys/src/9/teg2/mmu.c b/sys/src/9/teg2/mmu.c
index eabaaa896..871e1c1c3 100644
--- a/sys/src/9/teg2/mmu.c
+++ b/sys/src/9/teg2/mmu.c
@@ -375,7 +375,7 @@ mmul2empty(Proc* proc, int clear)
 	l2 = &proc->mmul2;
 	for(page = *l2; page != nil; page = page->next){
 		if(clear)
-			memset(UINT2PTR(page->va), 0, BY2PG);
+			memset((void*)page->va, 0, BY2PG);
 		l1[page->daddr] = Fault;
 		allcache->wbse(l1, sizeof *l1);
 		l2 = &page->next;
@@ -527,7 +527,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 		else{
 			pg = up->mmul2cache;
 			up->mmul2cache = pg->next;
-			memset(UINT2PTR(pg->va), 0, BY2PG);
+			memset((void*)pg->va, 0, BY2PG);
 		}
 		pg->daddr = x;
 		pg->next = up->mmul2;
@@ -549,7 +549,7 @@ putmmu(uintptr va, uintptr pa, Page* page)
 				m->mmul1hi = x;
 		}
 	}
-	pte = UINT2PTR(KADDR(PPN(*l1)));
+	pte = KADDR(PPN(*l1));
 	if (Debug) {
 		iprint("pte %#p index %ld was %#ux\n", pte, L2X(va), *(pte+L2X(va)));
 		if (*(pte+L2X(va)))
@@ -602,7 +602,7 @@ mmuuncache(void* v, usize size)
 	 * Uncache a Section, must already be
 	 * valid in the MMU.
 	 */
-	va = PTR2UINT(v);
+	va = (uintptr)v;
 	assert(!(va & (1*MiB-1)) && size == 1*MiB);
 
 	x = L1X(va);
@@ -687,7 +687,7 @@ vmap(uintptr pa, usize size)
 	 * will fail.
 	 */
 	if(pa+size < 4*MiB)
-		return UINT2PTR(kseg0|pa);
+		return (void*)(kseg0|pa);
 
 	osize = size;
 	o = pa & (BY2PG-1);
@@ -701,7 +701,7 @@ vmap(uintptr pa, usize size)
 		panic("vmap(%#p, %ld) called from %#p: mmukmap fails %#p",
 			pa+o, osize, getcallerpc(&pa), pae);
 
-	return UINT2PTR(va+o);
+	return (void*)(va+o);
 }
 
 /* from 386 */
diff --git a/sys/src/9/teg2/syscall.c b/sys/src/9/teg2/syscall.c
index be24849b2..4a5ec8559 100644
--- a/sys/src/9/teg2/syscall.c
+++ b/sys/src/9/teg2/syscall.c
@@ -47,7 +47,7 @@ noted(Ureg* cur, uintptr arg0)
 	nf = up->ureg;
 
 	/* sanity clause */
-	if(!okaddr(PTR2UINT(nf), sizeof(NFrame), 0)){
+	if(!okaddr((uintptr)nf, sizeof(NFrame), 0)){
 		qunlock(&up->debug);
 		pprint("bad ureg in noted %#p\n", nf);
 		pexit("Suicide", 0);
@@ -83,8 +83,8 @@ noted(Ureg* cur, uintptr arg0)
 		nf->arg1 = nf->msg;
 		nf->arg0 = &nf->ureg;
 		nf->ip = 0;
-		cur->sp = PTR2UINT(nf);
-		cur->r0 = PTR2UINT(nf->arg0);
+		cur->sp = (uintptr)nf;
+		cur->r0 = (uintptr)nf->arg0;
 		break;
 	default:
 		up->lastnote.flag = NDebug;
@@ -146,7 +146,7 @@ notify(Ureg* ureg)
 		qunlock(&up->debug);
 		pexit(n->msg, n->flag != NDebug);
 	}
-	if(!okaddr(PTR2UINT(up->notify), 1, 0)){
+	if(!okaddr((uintptr)up->notify, 1, 0)){
 		qunlock(&up->debug);
 		pprint("suicide: notify function address %#p\n", up->notify);
 		pexit("Suicide", 0);
@@ -159,7 +159,7 @@ notify(Ureg* ureg)
 		pexit("Suicide", 0);
 	}
 
-	nf = UINT2PTR(sp);
+	nf = (void*)sp;
 	memmove(&nf->ureg, ureg, sizeof(Ureg));
 	nf->old = up->ureg;
 	up->ureg = nf;
@@ -169,8 +169,8 @@ notify(Ureg* ureg)
 	nf->ip = 0;
 
 	ureg->sp = sp;
-	ureg->pc = PTR2UINT(up->notify);
-	ureg->r0 = PTR2UINT(nf->arg0);
+	ureg->pc = (uintptr)up->notify;
+	ureg->r0 = (uintptr)nf->arg0;
 
 	up->notified = 1;
 	up->nnote--;
diff --git a/sys/src/9/teg2/trap.c b/sys/src/9/teg2/trap.c
index 35ab7dc04..a956666ec 100644
--- a/sys/src/9/teg2/trap.c
+++ b/sys/src/9/teg2/trap.c
@@ -937,7 +937,7 @@ callwithureg(void (*fn)(Ureg*))
 
 	memset(&ureg, 0, sizeof ureg);
 	ureg.pc = getcallerpc(&fn);
-	ureg.sp = PTR2UINT(&fn);
+	ureg.sp = (uintptr)&fn;
 	fn(&ureg);
 }