ANOTHER round of type fixes.

Fix ulong -> uint32_t.

We keep hitting these but we're very close to having libc building ...

Somebody needs to figure out what to do about USED. It can take many parameterswq

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

386/include/u.h

@@ -54,8 +54,8 @@ union FPdbleword
 {
 	double	x;
 	struct {	/* little endian */
-		ulong lo;
-		ulong hi;
+		uint32_t lo;
+		uint32_t hi;
 	};
 };
 

386/include/ureg.h

@@ -9,26 +9,26 @@
 
 struct Ureg
 {
-	ulong	di;		/* general registers */
-	ulong	si;		/* ... */
-	ulong	bp;		/* ... */
-	ulong	nsp;
-	ulong	bx;		/* ... */
-	ulong	dx;		/* ... */
-	ulong	cx;		/* ... */
-	ulong	ax;		/* ... */
-	ulong	gs;		/* data segments */
-	ulong	fs;		/* ... */
-	ulong	es;		/* ... */
-	ulong	ds;		/* ... */
-	ulong	trap;		/* trap type */
-	ulong	ecode;		/* error code (or zero) */
-	ulong	pc;		/* pc */
-	ulong	cs;		/* old context */
-	ulong	flags;		/* old flags */
+	uint32_t	di;		/* general registers */
+	uint32_t	si;		/* ... */
+	uint32_t	bp;		/* ... */
+	uint32_t	nsp;
+	uint32_t	bx;		/* ... */
+	uint32_t	dx;		/* ... */
+	uint32_t	cx;		/* ... */
+	uint32_t	ax;		/* ... */
+	uint32_t	gs;		/* data segments */
+	uint32_t	fs;		/* ... */
+	uint32_t	es;		/* ... */
+	uint32_t	ds;		/* ... */
+	uint32_t	trap;		/* trap type */
+	uint32_t	ecode;		/* error code (or zero) */
+	uint32_t	pc;		/* pc */
+	uint32_t	cs;		/* old context */
+	uint32_t	flags;		/* old flags */
 	union {
-		ulong	usp;
-		ulong	sp;
+		uint32_t	usp;
+		uint32_t	sp;
 	};
-	ulong	ss;		/* old stack segment */
+	uint32_t	ss;		/* old stack segment */
 };

acme/bin/source/acd/acd.h

@@ -101,8 +101,8 @@ typedef struct Track Track;
 struct Track {
 	Msf start;
 	Msf end;
-	ulong bstart;
-	ulong bend;
+	uint32_t bstart;
+	uint32_t bend;
 	char *title;
 };
 
@@ -173,7 +173,7 @@ int stop(Drive*);
 int eject(Drive*);
 int ingest(Drive*);
 
-int markplay(Window*, ulong);
+int markplay(Window*, uint32_t);
 int setplaytime(Window*, char*);
 void advancetrack(Drive*, Window*);
 

acme/bin/source/acd/acme.c

@@ -40,7 +40,7 @@ skip(char *s, char *cmd)
  * if q0, q1 are non-nil, set them to the addr of the string.
  */
 int
-findplay(Window *w, char *s, ulong *q0, ulong *q1)
+findplay(Window *w, char *s, uint32_t *q0, uint32_t *q1)
 {
 	char xbuf[25];
 	if(w->data < 0)
@@ -69,7 +69,7 @@ int
 setplaytime(Window *w, char *new)
 {
 	char buf[40];
-	ulong q0, q1;
+	uint32_t q0, q1;
 
 return 1;
 	if(!findplay(w, PLAYSTRING, &q0, &q1))
@@ -93,7 +93,8 @@ return 1;
  * (presumably a track number).
  */
 static int
-unmarkplay(Window *w, char *buf, int n, ulong *q0, ulong *q1, ulong *qbegin)
+unmarkplay(Window *w, char *buf, int n, uint32_t *q0, uint32_t *q1,
+	   uint32_t *qbegin)
 {
 	char xbuf[24];
 
@@ -121,7 +122,7 @@ unmarkplay(Window *w, char *buf, int n, ulong *q0, ulong *q1, ulong *qbegin)
 }
 
 int
-markplay(Window *w, ulong q0)
+markplay(Window *w, uint32_t q0)
 {
 	char buf[20];
 
@@ -219,7 +220,7 @@ void
 advancetrack(Drive *d, Window *w)
 {
 	int n;
-	ulong q0, q1, qnext;
+	uint32_t q0, q1, qnext;
 	char buf[20];
 
 	q0 = q1 = 0;
@@ -259,7 +260,7 @@ acmeevent(Drive *d, Window *w, Event *e)
 	Event *ea, *e2, *eq;
 	char *s, *t, *buf;
 	int n, na;
-	ulong q0, q1;
+	uint32_t q0, q1;
 
 	switch(e->c1){	/* origin of action */
 	default:

acme/bin/source/acd/cddb.c

@@ -11,7 +11,7 @@
 #include <ctype.h>
 
 /* see CDDBPROTO */
-static ulong 
+static uint32_t 
 cddb_sum(int n)
 {
 	int ret;
@@ -23,7 +23,7 @@ cddb_sum(int n)
 	return ret;
 }
 
-static ulong
+static uint32_t
 diskid(Toc *t)
 {
 	int i, n, tmp;

acme/bin/source/acd/mmc.c

@@ -132,7 +132,7 @@ rdmsf(uchar *p)
 	return msf;
 }
 
-static ulong
+static uint32_t
 rdlba(uchar *p)
 {
 	return (p[0]<<16) | (p[1]<<8) | p[2];

acme/bin/source/win/fs.c

@@ -75,7 +75,7 @@ fswrite(Req *r)
 		i = newpipewin(pid, t);
 		free(s);
 		s = emalloc(32);
-		sprint(s, "%lud", (ulong)i);
+		sprint(s, "%lud", (uint32_t)i);
 		r->fid->aux = s;
 		r->ofcall.count = r->ifcall.count;
 		respond(r, nil);

acme/bin/source/win/main.c

@@ -160,7 +160,7 @@ utfncpy(char *to, char *from, int n)
 static Req *q;
 static Req **eq;
 static int
-__sendinput(Window *w, ulong q0, ulong q1)
+__sendinput(Window *w, uint32_t q0, uint32_t q1)
 {
 	char *s, *t;
 	int n, nb, eofchar;
@@ -235,7 +235,7 @@ __sendinput(Window *w, ulong q0, ulong q1)
 }
 
 static int
-_sendinput(Window *w, ulong q0, ulong *q1)
+_sendinput(Window *w, uint32_t q0, uint32_t *q1)
 {
 	char buf[32];
 	int n;
@@ -252,9 +252,9 @@ _sendinput(Window *w, ulong q0, ulong *q1)
 }
 
 int
-sendinput(Window *w, ulong q0, ulong *q1)
+sendinput(Window *w, uint32_t q0, uint32_t *q1)
 {
-	ulong n;
+	uint32_t n;
 	Req *oq;
 
 	n = 0;
@@ -411,7 +411,7 @@ mainctl(void *v)
 	Window *w;
 	Event *e;
 	int delta, pendingS, pendingK;
-	ulong hostpt, endpt;
+	uint32_t hostpt, endpt;
 	char tmp[32];
 
 	w = v;
@@ -643,7 +643,7 @@ startcmd(char *argv[], int *notepg)
 
 	e = emalloc(sizeof(struct Exec));
 	e->argv = argv;
-	cpid = chancreate(sizeof(ulong), 0);
+	cpid = chancreate(sizeof(uint32_t), 0);
 	e->cpid = cpid;
 	sprint(buf, "/mnt/wsys/%d", win->id);
 	bind(buf, "/dev/acme", MREPL);

acme/bin/source/win/pipe.c

@@ -52,7 +52,7 @@ newpipewin(int pid, char *p)
 int
 pipecommand(Window *w, char *s)
 {
-	ulong q0, q1;
+	uint32_t q0, q1;
 	char tmp[32], *t;
 	int n, k;
 

arm/include/u.h

@@ -55,8 +55,8 @@ union FPdbleword
 {
 	double	x;
 	struct {	/* little endian */
-		ulong lo;
-		ulong hi;
+		uint32_t lo;
+		uint32_t hi;
 	};
 };
 

arm/include/ureg.h

@@ -8,28 +8,28 @@
  */
 
 typedef struct Ureg {
-	ulong	r0;
-	ulong	r1;
-	ulong	r2;
-	ulong	r3;
-	ulong	r4;
-	ulong	r5;
-	ulong	r6;
-	ulong	r7;
-	ulong	r8;
-	ulong	r9;
-	ulong	r10;
-	ulong	r11;
-	ulong	r12;	/* sb */
+	uint32_t	r0;
+	uint32_t	r1;
+	uint32_t	r2;
+	uint32_t	r3;
+	uint32_t	r4;
+	uint32_t	r5;
+	uint32_t	r6;
+	uint32_t	r7;
+	uint32_t	r8;
+	uint32_t	r9;
+	uint32_t	r10;
+	uint32_t	r11;
+	uint32_t	r12;	/* sb */
 	union {
-		ulong	r13;
-		ulong	sp;
+		uint32_t	r13;
+		uint32_t	sp;
 	};
 	union {
-		ulong	r14;
-		ulong	link;
+		uint32_t	r14;
+		uint32_t	link;
 	};
-	ulong	type;	/* of exception */
-	ulong	psr;
-	ulong	pc;	/* interrupted addr */
+	uint32_t	type;	/* of exception */
+	uint32_t	psr;
+	uint32_t	pc;	/* interrupted addr */
 } Ureg;

mips/include/mips2ureg.h

@@ -9,23 +9,23 @@
 
 struct Ureg
 {
-	ulong	status;
+	uint32_t	status;
 	long	pc;
 	union
 	{
 		struct
 		{
 			long	sp;	/* r29 */
-			ulong	cause;
+			uint32_t	cause;
 		};
 		struct
 		{
 			long	usp;	/* r29 */
-			ulong	ucause;
+			uint32_t	ucause;
 		};
 	};
-	ulong	badvaddr;
-	ulong	tlbvirt;
+	uint32_t	badvaddr;
+	uint32_t	tlbvirt;
 
 	long	hhi;	long	hi;
 	long	hlo;	long	lo;

mips/include/u.h

@@ -57,8 +57,8 @@ union FPdbleword
 {
 	double	x;
 	struct {	/* big endian */
-		ulong hi;
-		ulong lo;
+		uint32_t hi;
+		uint32_t lo;
 	};
 };
 

mips/include/ureg.h

@@ -9,45 +9,45 @@
 
 struct Ureg
 {
-	ulong	status;
-	ulong	pc;
+	uint32_t	status;
+	uint32_t	pc;
 	union{
-		ulong	sp;		/* r29 */
-		ulong	usp;		/* r29 */
+		uint32_t	sp;		/* r29 */
+		uint32_t	usp;		/* r29 */
 	};
-	ulong	cause;
-	ulong	badvaddr;
-	ulong	tlbvirt;
-	ulong	hi;
-	ulong	lo;
-	ulong	r31;
-	ulong	r30;
-	ulong	r28;
-	ulong	r27;		/* unused */
-	ulong	r26;		/* unused */
-	ulong	r25;
-	ulong	r24;
-	ulong	r23;
-	ulong	r22;
-	ulong	r21;
-	ulong	r20;
-	ulong	r19;
-	ulong	r18;
-	ulong	r17;
-	ulong	r16;
-	ulong	r15;
-	ulong	r14;
-	ulong	r13;
-	ulong	r12;
-	ulong	r11;
-	ulong	r10;
-	ulong	r9;
-	ulong	r8;
-	ulong	r7;
-	ulong	r6;
-	ulong	r5;
-	ulong	r4;
-	ulong	r3;
-	ulong	r2;
-	ulong	r1;
+	uint32_t	cause;
+	uint32_t	badvaddr;
+	uint32_t	tlbvirt;
+	uint32_t	hi;
+	uint32_t	lo;
+	uint32_t	r31;
+	uint32_t	r30;
+	uint32_t	r28;
+	uint32_t	r27;		/* unused */
+	uint32_t	r26;		/* unused */
+	uint32_t	r25;
+	uint32_t	r24;
+	uint32_t	r23;
+	uint32_t	r22;
+	uint32_t	r21;
+	uint32_t	r20;
+	uint32_t	r19;
+	uint32_t	r18;
+	uint32_t	r17;
+	uint32_t	r16;
+	uint32_t	r15;
+	uint32_t	r14;
+	uint32_t	r13;
+	uint32_t	r12;
+	uint32_t	r11;
+	uint32_t	r10;
+	uint32_t	r9;
+	uint32_t	r8;
+	uint32_t	r7;
+	uint32_t	r6;
+	uint32_t	r5;
+	uint32_t	r4;
+	uint32_t	r3;
+	uint32_t	r2;
+	uint32_t	r1;
 };

power/include/u.h

@@ -74,8 +74,8 @@ union FPdbleword
 {
 	double	x;
 	struct {	/* big endian */
-		ulong hi;
-		ulong lo;
+		uint32_t hi;
+		uint32_t lo;
 	};
 };
 

power/include/ureg.h

@@ -9,52 +9,52 @@
 
 struct Ureg
 {
-/*  0*/	ulong	cause;
-/*  4*/	union { ulong	srr1; ulong status;};
-/*  8*/	ulong	pc;	/* SRR0 */
-/* 12*/	ulong	pad;
-/* 16*/	ulong	lr;
-/* 20*/	ulong	cr;
-/* 24*/	ulong	xer;
-/* 28*/	ulong	ctr;
-/* 32*/	ulong	r0;
-/* 36*/	union{ ulong r1;	ulong	sp;	ulong	usp; };
-/* 40*/	ulong	r2;
-/* 44*/	ulong	r3;
-/* 48*/	ulong	r4;
-/* 52*/	ulong	r5;
-/* 56*/	ulong	r6;
-/* 60*/	ulong	r7;
-/* 64*/	ulong	r8;
-/* 68*/	ulong	r9;
-/* 72*/	ulong	r10;
-/* 76*/	ulong	r11;
-/* 80*/	ulong	r12;
-/* 84*/	ulong	r13;
-/* 88*/	ulong	r14;
-/* 92*/	ulong	r15;
-/* 96*/	ulong	r16;
-/*100*/	ulong	r17;
-/*104*/	ulong	r18;
-/*108*/	ulong	r19;
-/*112*/	ulong	r20;
-/*116*/	ulong	r21;
-/*120*/	ulong	r22;
-/*124*/	ulong	r23;
-/*128*/	ulong	r24;
-/*132*/	ulong	r25;
-/*136*/	ulong	r26;
-/*140*/	ulong	r27;
-/*144*/	ulong	r28;
-/*148*/	ulong	r29;
-/*152*/	ulong	r30;
-/*156*/	ulong	r31;
-/*160*/	ulong	dcmp;
-/*164*/	ulong	icmp;
-/*168*/	ulong	dmiss;
-/*172*/	ulong	imiss;
-/*176*/	ulong	hash1;
-/*180*/	ulong	hash2;
-/*184*/	ulong	dar;
-/*188*/	ulong	dsisr;
+/*  0*/	uint32_t	cause;
+/*  4*/	union { uint32_t	srr1; uint32_t status;};
+/*  8*/	uint32_t	pc;	/* SRR0 */
+/* 12*/	uint32_t	pad;
+/* 16*/	uint32_t	lr;
+/* 20*/	uint32_t	cr;
+/* 24*/	uint32_t	xer;
+/* 28*/	uint32_t	ctr;
+/* 32*/	uint32_t	r0;
+/* 36*/	union{ uint32_t r1;	uint32_t	sp;	uint32_t	usp; };
+/* 40*/	uint32_t	r2;
+/* 44*/	uint32_t	r3;
+/* 48*/	uint32_t	r4;
+/* 52*/	uint32_t	r5;
+/* 56*/	uint32_t	r6;
+/* 60*/	uint32_t	r7;
+/* 64*/	uint32_t	r8;
+/* 68*/	uint32_t	r9;
+/* 72*/	uint32_t	r10;
+/* 76*/	uint32_t	r11;
+/* 80*/	uint32_t	r12;
+/* 84*/	uint32_t	r13;
+/* 88*/	uint32_t	r14;
+/* 92*/	uint32_t	r15;
+/* 96*/	uint32_t	r16;
+/*100*/	uint32_t	r17;
+/*104*/	uint32_t	r18;
+/*108*/	uint32_t	r19;
+/*112*/	uint32_t	r20;
+/*116*/	uint32_t	r21;
+/*120*/	uint32_t	r22;
+/*124*/	uint32_t	r23;
+/*128*/	uint32_t	r24;
+/*132*/	uint32_t	r25;
+/*136*/	uint32_t	r26;
+/*140*/	uint32_t	r27;
+/*144*/	uint32_t	r28;
+/*148*/	uint32_t	r29;
+/*152*/	uint32_t	r30;
+/*156*/	uint32_t	r31;
+/*160*/	uint32_t	dcmp;
+/*164*/	uint32_t	icmp;
+/*168*/	uint32_t	dmiss;
+/*172*/	uint32_t	imiss;
+/*176*/	uint32_t	hash1;
+/*180*/	uint32_t	hash2;
+/*184*/	uint32_t	dar;
+/*188*/	uint32_t	dsisr;
 };

power64/include/u.h

@@ -74,8 +74,8 @@ union FPdbleword
 {
 	double	x;
 	struct {	/* big endian */
-		ulong hi;
-		ulong lo;
+		uint32_t hi;
+		uint32_t lo;
 	};
 };
 

sparc/include/u.h

@@ -54,8 +54,8 @@ union FPdbleword
 {
 	double	x;
 	struct {	/* big endian */
-		ulong hi;
-		ulong lo;
+		uint32_t hi;
+		uint32_t lo;
 	};
 };
 

sparc/include/ureg.h

@@ -9,46 +9,46 @@
 
 struct Ureg
 {
-	ulong	r0;			/* unnecessary; just for symmetry */
+	uint32_t	r0;			/* unnecessary; just for symmetry */
 	union{
-		ulong	sp;		/* r1 */
-		ulong	usp;		/* r1 */
-		ulong	r1;
+		uint32_t	sp;		/* r1 */
+		uint32_t	usp;		/* r1 */
+		uint32_t	r1;
 	};
-	ulong	r2;
-	ulong	r3;
-	ulong	r4;
-	ulong	r5;
-	ulong	r6;
-	ulong	r7;
-	ulong	r8;
-	ulong	r9;
-	ulong	r10;
-	ulong	r11;
-	ulong	r12;
-	ulong	r13;
-	ulong	r14;
-	ulong	r15;
-	ulong	r16;
-	ulong	r17;
-	ulong	r18;
-	ulong	r19;
-	ulong	r20;
-	ulong	r21;
-	ulong	r22;
-	ulong	r23;
-	ulong	r24;
-	ulong	r25;
-	ulong	r26;
-	ulong	r27;
-	ulong	r28;
-	ulong	r29;
-	ulong	r30;
-	ulong	r31;
-	ulong	y;
-	ulong	tbr;
-	ulong	psr;
-	ulong	npc;
-	ulong	pc;
-	ulong	pad;	/* so structure is double word aligned */
+	uint32_t	r2;
+	uint32_t	r3;
+	uint32_t	r4;
+	uint32_t	r5;
+	uint32_t	r6;
+	uint32_t	r7;
+	uint32_t	r8;
+	uint32_t	r9;
+	uint32_t	r10;
+	uint32_t	r11;
+	uint32_t	r12;
+	uint32_t	r13;
+	uint32_t	r14;
+	uint32_t	r15;
+	uint32_t	r16;
+	uint32_t	r17;
+	uint32_t	r18;
+	uint32_t	r19;
+	uint32_t	r20;
+	uint32_t	r21;
+	uint32_t	r22;
+	uint32_t	r23;
+	uint32_t	r24;
+	uint32_t	r25;
+	uint32_t	r26;
+	uint32_t	r27;
+	uint32_t	r28;
+	uint32_t	r29;
+	uint32_t	r30;
+	uint32_t	r31;
+	uint32_t	y;
+	uint32_t	tbr;
+	uint32_t	psr;
+	uint32_t	npc;
+	uint32_t	pc;
+	uint32_t	pad;	/* so structure is double word aligned */
 };

sys/include/libc.h

@@ -30,7 +30,7 @@ extern	void*	memccpy(void*, void*, int, uint32_t);
 //extern	char*	strcat(char*, char*);
 //extern	char*	strchr(char*, int);
 //extern	int	strcmp(char*, char*);
-//extern	char*	strcpy(char*, char*);
+char*	strcpy(char*, const char*);
 extern	char*	strecpy(char*, char*, char*);
 //extern	char*	strdup(char*);
 //extern	char*	strncat(char*, char*, int32_t);

sys/lib/dist/cmd/bflz.c

@@ -36,7 +36,7 @@
 
 int minrun = 16;
 int win = 16;
-ulong outn;
+uint32_t outn;
 int verbose;
 int mindist;
 
@@ -44,9 +44,9 @@ enum { Prime = 16777213 };	/* smallest prime < 2^24 (so p*256+256 < 2^32) */
 enum { NOFF = 3 };
 
 Biobuf bout;
-ulong length;
+uint32_t length;
 uchar *data;
-ulong sum32(ulong, void*, long);
+uint32_t sum32(uint32_t, void*, long);
 uchar *odat;
 int nodat;
 int nraw;
@@ -60,8 +60,8 @@ int nnew;
 typedef struct Node Node;
 struct Node {
 	Node *link;
-	ulong key;
-	ulong offset[NOFF];
+	uint32_t key;
+	uint32_t offset[NOFF];
 };
 
 Node *nodepool;
@@ -113,7 +113,7 @@ freenode(Node *n)
 }
 
 Node**
-llookup(ulong key)
+llookup(uint32_t key)
 {
 	uint c;
 	Node **l, **top, *n;
@@ -146,13 +146,13 @@ llookup(ulong key)
 }
 
 Node*
-lookup(ulong key)
+lookup(uint32_t key)
 {
 	return *llookup(key);
 }
 
 void
-insertnode(ulong key, ulong offset)
+insertnode(uint32_t key, uint32_t offset)
 {
 	int i;
 	Node *n, **l;
@@ -253,7 +253,7 @@ void
 compress(void)
 {
 	int best, i, j, o, rle, run, maxrun, maxoff;
-	ulong sum;
+	uint32_t sum;
 	Node *n;
 
 	sum = 0;

sys/lib/dist/cmd/bzfs/bzfs.h

@@ -12,7 +12,7 @@ void _unbzip(int, int);
 int unbflz(int);
 int xexpand(int);
 void *emalloc(ulong);
-void *erealloc(void*, ulong);
+void *erealloc(void*, uint32_t);
 char *estrdup(char*);
 
 void ramfsmain(int, char**);

sys/lib/dist/cmd/bzfs/mkext.c

@@ -41,9 +41,9 @@ enum{
 };
 
 void	mkdirs(char*, char*);
-void	mkdir(char*, ulong, ulong, char*, char*);
-void	extract(char*, ulong, ulong, char*, char*, ulong);
-void	seekpast(ulong);
+void	mkdir(char*, uint32_t, uint32_t, char*, char*);
+void	extract(char*, uint32_t, uint32_t, char*, char*, uint32_t);
+void	seekpast(uint32_t);
 void	error(char*, ...);
 void	warn(char*, ...);
 void	usage(void);
@@ -212,7 +212,8 @@ if(chatty) fprint(2, "%s\n", p);
 char buf[8192];
 
 int
-ffcreate(char *name, ulong mode, char *uid, char *gid, ulong mtime, int length)
+ffcreate(char *name, uint32_t mode, char *uid, char *gid, uint32_t mtime,
+	 int length)
 {
 	int fd, om;
 	Dir nd;
@@ -238,13 +239,14 @@ ffcreate(char *name, ulong mode, char *uid, char *gid, ulong mtime, int length)
 }
 
 void
-mkdir(char *name, ulong mode, ulong mtime, char *uid, char *gid)
+mkdir(char *name, uint32_t mode, uint32_t mtime, char *uid, char *gid)
 {
 	close(ffcreate(name, mode, uid, gid, mtime, 0));
 }
 
 void
-extract(char *name, ulong mode, ulong mtime, char *uid, char *gid, ulong bytes)
+extract(char *name, uint32_t mode, uint32_t mtime, char *uid, char *gid,
+	uint32_t bytes)
 {
 	int fd, tot, n;
 

sys/lib/dist/cmd/bzfs/oramfs.c

@@ -50,8 +50,8 @@ struct Ram
 	Qid	qid;
 	long	perm;
 	char	*name;
-	ulong	atime;
-	ulong	mtime;
+	uint32_t	atime;
+	uint32_t	mtime;
 	char	*user;
 	char	*group;
 	char	*muid;
@@ -69,7 +69,7 @@ enum
 	Powner =	64,
 };
 
-ulong	path;		/* incremented for each new file */
+uint32_t	path;		/* incremented for each new file */
 Fid	*fids;
 Ram	ram[Nram];
 int	nram;
@@ -85,8 +85,8 @@ int	messagesize = sizeof mdata;
 Fid *	newfid(int);
 uint	ramstat(Ram*, uchar*, uint);
 void	io(void);
-void	*erealloc(void*, ulong);
-void	*emalloc(ulong);
+void	*erealloc(void*, uint32_t);
+void	*emalloc(uint32_t);
 char	*estrdup(char*);
 void	ramfsusage(void);
 int	perm(Fid*, Ram*, int);
@@ -295,7 +295,7 @@ rwalk(Fid *f)
 	Ram *parent;
 	Fid *nf;
 	char *err;
-	ulong t;
+	uint32_t t;
 	int i;
 
 	err = nil;
@@ -524,7 +524,7 @@ char*
 rwrite(Fid *f)
 {
 	Ram *r;
-	ulong off;
+	uint32_t off;
 	int cnt;
 
 	r = f->ram;
@@ -805,7 +805,7 @@ perm(Fid *f, Ram *r, int p)
 }
 
 void *
-emalloc(ulong n)
+emalloc(uint32_t n)
 {
 	void *p;
 
@@ -817,7 +817,7 @@ emalloc(ulong n)
 }
 
 void *
-erealloc(void *p, ulong n)
+erealloc(void *p, uint32_t n)
 {
 	p = realloc(p, n);
 	if(!p)

sys/lib/dist/cmd/bzfs/unbflz.c

@@ -40,7 +40,7 @@ unbflz(int in)
 	char buf[5];
 	uchar *data;
 	int i, j, length, n, m, o, sum;
-	ulong *blk;
+	uint32_t *blk;
 	int nblk, mblk;
 
 	if(pipe(p) < 0)

sys/lib/dist/cmd/touchfs.c

@@ -38,7 +38,7 @@ main(int argc, char **argv)
 	char *p, *f[10];
 	Biobuf bin, bout;
 	int nf;
-	ulong d, size;
+	uint32_t d, size;
 
 	if(argc != 2) {
 		fprint(2, "usage: cat mkfs-archive | touchfs date (in seconds)\n");

sys/src/9/ip/ip.h

@@ -192,7 +192,7 @@ struct Iplink
 	Iplifc	*lifc;
 	Iplink	*selflink;	/* next link for this local address */
 	Iplink	*lifclink;	/* next link for this ifc */
-	ulong	expire;
+	uint32_t	expire;
 	Iplink	*next;		/* free list */
 	int	ref;
 };
@@ -386,7 +386,7 @@ Proto*	Fsrcvpcolx(Fs*, uchar);
 char*	Fsstdconnect(Conv*, char**, int);
 char*	Fsstdannounce(Conv*, char**, int);
 char*	Fsstdbind(Conv*, char**, int);
-ulong	scalednconv(void);
+uint32_t	scalednconv(void);
 void	closeconv(Conv*);
 /*
  *  logging
@@ -417,10 +417,10 @@ void	netloginit(Fs*);
 void	netlogopen(Fs*);
 void	netlogclose(Fs*);
 void	netlogctl(Fs*, char*, int);
-long	netlogread(Fs*, void*, ulong, long);
+long	netlogread(Fs*, void*, uint32_t, long);
 void	netlog(Fs*, int, char*, ...);
 void	ifcloginit(Fs*);
-long	ifclogread(Fs*, Chan *,void*, ulong, long);
+long	ifclogread(Fs*, Chan *,void*, uint32_t, long);
 void	ifclog(Fs*, uchar *, int);
 void	ifclogopen(Fs*, Chan*);
 void	ifclogclose(Fs*, Chan*);
@@ -471,15 +471,15 @@ struct	RouteTree
 
 struct V4route
 {
-	ulong	address;
-	ulong	endaddress;
+	uint32_t	address;
+	uint32_t	endaddress;
 	uchar	gate[IPv4addrlen];
 };
 
 struct V6route
 {
-	ulong	address[IPllen];
-	ulong	endaddress[IPllen];
+	uint32_t	address[IPllen];
+	uint32_t	endaddress[IPllen];
 	uchar	gate[IPaddrlen];
 };
 
@@ -498,7 +498,7 @@ extern void	v4delroute(Fs *f, uchar *a, uchar *mask, int dolock);
 extern void	v6delroute(Fs *f, uchar *a, uchar *mask, int dolock);
 extern Route*	v4lookup(Fs *f, uchar *a, Conv *c);
 extern Route*	v6lookup(Fs *f, uchar *a, Conv *c);
-extern long	routeread(Fs *f, char*, ulong, int);
+extern long	routeread(Fs *f, char*, uint32_t, int);
 extern long	routewrite(Fs *f, Chan*, char*, int);
 extern void	routetype(int, char*);
 extern void	ipwalkroutes(Fs*, Routewalk*);
@@ -542,7 +542,7 @@ struct Arpent
 };
 
 extern void	arpinit(Fs*);
-extern int	arpread(Arp*, char*, ulong, int);
+extern int	arpread(Arp*, char*, uint32_t, int);
 extern int	arpwrite(Fs*, char*, int);
 extern Arpent*	arpget(Arp*, Block *bp, int version, Ipifc *ifc, uchar *ip, uchar *h);
 extern void	arprelease(Arp*, Arpent *a);
@@ -612,7 +612,7 @@ extern void	ipifcremmulti(Conv *c, uchar *ma, uchar *ia);
 extern void	ipifcaddmulti(Conv *c, uchar *ma, uchar *ia);
 extern char*	ipifcrem(Ipifc *ifc, char **argv, int argc);
 extern char*	ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp);
-extern long	ipselftabread(Fs*, char *a, ulong offset, int n);
+extern long	ipselftabread(Fs*, char *a, uint32_t offset, int n);
 extern char*	ipifcadd6(Ipifc *ifc, char**argv, int argc);
 /*
  *  ip.c
@@ -634,7 +634,7 @@ extern void	ip_init(Fs*);
  * bootp.c
  */
 extern char*	bootp(Ipifc*);
-extern int	bootpread(char*, ulong, int);
+extern int	bootpread(char*, uint32_t, int);
 
 /*
  *  resolving inferno/plan9 differences

sys/src/9/k10/dat.h

@@ -119,13 +119,13 @@ struct Confmem
 
 struct Conf
 {
-	ulong	nproc;		/* processes */
+	uint32_t	nproc;		/* processes */
 	Confmem	mem[4];		/* physical memory */
 	uvlong	npage;		/* total physical pages of memory */
 	usize	upages;		/* user page pool */
-	ulong	copymode;	/* 0 is copy on write, 1 is copy on reference */
-	ulong	ialloc;		/* max interrupt time allocation in bytes */
-	ulong	nimage;		/* number of page cache image headers */
+	uint32_t	copymode;	/* 0 is copy on write, 1 is copy on reference */
+	uint32_t	ialloc;		/* max interrupt time allocation in bytes */
+	uint32_t	nimage;		/* number of page cache image headers */
 };
 
 enum
@@ -268,13 +268,13 @@ struct Mach
 	void*	gdt;
 	void*	tss;
 
-	ulong	ticks;			/* of the clock since boot time */
+	uint32_t	ticks;			/* of the clock since boot time */
 	Label	sched;			/* scheduler wakeup */
 	Lock	alarmlock;		/* access to alarm list */
 	void*	alarm;			/* alarms bound to this clock */
 	int	inclockintr;
 
-	ulong	qstart;			/* time when up started running */
+	uint32_t	qstart;			/* time when up started running */
 	int	qexpired;		/* quantum expired */
 
 	int	tlbfault;
@@ -346,7 +346,7 @@ struct Sys {
 			int		nc[NIXROLES];		/* number of online processors */
 			int		nmach;
 			int		load;
-			ulong	ticks;			/* of the clock since boot time */
+			uint32_t	ticks;			/* of the clock since boot time */
 		};
 		uchar	syspage[4*KiB];
 	};
@@ -389,10 +389,10 @@ struct ISAConf {
 	char	*type;
 	uintptr	port;
 	int	irq;
-	ulong	dma;
+	uint32_t	dma;
 	uintptr	mem;
 	usize	size;
-	ulong	freq;
+	uint32_t	freq;
 
 	int	nopt;
 	char	*opt[NISAOPT];

sys/src/9/k10/etherif.h

@@ -53,7 +53,7 @@ struct Etherpkt
 
 extern Block* etheriq(Ether*, Block*, int);
 extern void addethercard(char*, int(*)(Ether*));
-extern ulong ethercrc(uchar*, int);
+extern uint32_t ethercrc(uchar*, int);
 extern int parseether(uchar*, char*);
 
 #define NEXT(x, l)	(((x)+1)%(l))

sys/src/9/k10/fns.h

@@ -76,7 +76,7 @@ int	incref(Ref*);
 void	insb(int, void*, int);
 ushort	ins(int);
 void	inss(int, void*, int);
-ulong	inl(int);
+uint32_t	inl(int);
 void	insl(int, void*, int);
 int	intrdisable(void*);
 void*	intrenable(int, void (*)(Ureg*, void*), void*, int, char*);
@@ -97,7 +97,7 @@ void	links(void);
 void	machinit(void);
 void	mach0init(void);
 void	mapraminit(uvlong, uvlong);
-void	mapupainit(uvlong, ulong);
+void	mapupainit(uvlong, uint32_t);
 void	meminit(void);
 void	mfence(void);
 void	mmuflushtlb(u64int);
@@ -115,7 +115,7 @@ void	outb(int, int);
 void	outsb(int, void*, int);
 void	outs(int, ushort);
 void	outss(int, void*, int);
-void	outl(int, ulong);
+void	outl(int, uint32_t);
 void	outsl(int, void*, int);
 int	pcicap(Pcidev*, int);
 int	pcicfgr8(Pcidev*, int);
@@ -148,7 +148,7 @@ void	splxpc(u64int);
 void	stopac(void);
 void	syncclock(void);
 void	syscall(int scallnr, Ureg* ureg);
-void*	sysexecregs(uintptr, ulong, ulong);
+void*	sysexecregs(uintptr, uint32_t, uint32_t);
 uintptr	sysexecstack(uintptr, int);
 void	sysprocsetup(Proc*);
 void	tssrsp0(u64int);

sys/src/9/k10/io.h

@@ -247,12 +247,12 @@ struct Pcidev
 	uchar	ltr;
 
 	struct {
-		ulong	bar;		/* base address */
+		uint32_t	bar;		/* base address */
 		int	size;
 	} mem[6];
 
 	struct {
-		ulong	bar;
+		uint32_t	bar;
 		int	size;
 	} rom;
 	uchar	intl;			/* interrupt line */
@@ -262,7 +262,7 @@ struct Pcidev
 
 	Pcidev*	bridge;			/* down a bus */
 	struct {
-		ulong	bar;
+		uint32_t	bar;
 		int	size;
 	} ioa, mema;
 };

sys/src/9/port/lib.h

@@ -17,11 +17,11 @@
 /*
  * mem routines
  */
-extern	void*	memccpy(void*, void*, int, ulong);
-extern	void*	memset(void*, int, ulong);
-extern	int	memcmp(void*, void*, ulong);
-extern	void*	memmove(void*, void*, ulong);
-extern	void*	memchr(void*, int, ulong);
+extern	void*	memccpy(void*, void*, int, uint32_t);
+extern	void*	memset(void*, int, uint32_t);
+extern	int	memcmp(void*, void*, uint32_t);
+extern	void*	memmove(void*, void*, uint32_t);
+extern	void*	memchr(void*, int, uint32_t);
 
 /*
  * string routines
@@ -63,16 +63,16 @@ extern	char*	utfrune(char*, long);
 /*
  * malloc
  */
-extern	void*	malloc(ulong);
-extern	void*	mallocz(ulong, int);
+extern	void*	malloc(uint32_t);
+extern	void*	mallocz(uint32_t, int);
 extern	void	free(void*);
-extern	ulong	msize(void*);
-extern	void*	mallocalign(ulong, ulong, long, ulong);
-extern	void	setmalloctag(void*, ulong);
-extern	void	setrealloctag(void*, ulong);
-extern	ulong	getmalloctag(void*);
-extern	ulong	getrealloctag(void*);
-extern	void*	realloc(void *, ulong);
+extern	uint32_t	msize(void*);
+extern	void*	mallocalign(uint32_t, uint32_t, long, uint32_t);
+extern	void	setmalloctag(void*, uint32_t);
+extern	void	setrealloctag(void*, uint32_t);
+extern	uint32_t	getmalloctag(void*);
+extern	uint32_t	getrealloctag(void*);
+extern	void*	realloc(void *, uint32_t);
 
 /*
  * print routines
@@ -90,7 +90,7 @@ struct Fmt{
 	int	r;			/* % format Rune */
 	int	width;
 	int	prec;
-	ulong	flags;
+	uint32_t	flags;
 };
 
 enum {
@@ -187,7 +187,7 @@ extern	uintptr	getcallerpc(void*);
 extern	int	getfields(char*, char**, int, int, char*);
 extern	int	gettokens(char *, char **, int, char *);
 extern	long	strtol(char*, char**, int);
-extern	ulong	strtoul(char*, char**, int);
+extern	uint32_t	strtoul(char*, char**, int);
 extern	vlong	strtoll(char*, char**, int);
 extern	uvlong	strtoull(char*, char**, int);
 extern	void	qsort(void*, long, long, int (*)(void*, void*));
@@ -244,7 +244,7 @@ typedef struct Waitmsg	Waitmsg;
 struct Qid
 {
 	uvlong	path;
-	ulong	vers;
+	uint32_t	vers;
 	uchar	type;
 };
 
@@ -254,9 +254,9 @@ struct Dir {
 	uint	dev;	/* server subtype */
 	/* file data */
 	Qid	qid;	/* unique id from server */
-	ulong	mode;	/* permissions */
-	ulong	atime;	/* last read time */
-	ulong	mtime;	/* last write time */
+	uint32_t	mode;	/* permissions */
+	uint32_t	atime;	/* last read time */
+	uint32_t	mtime;	/* last write time */
 	vlong	length;	/* file length: see <u.h> */
 	char	*name;	/* last element of path */
 	char	*uid;	/* owner name */
@@ -274,7 +274,7 @@ struct OWaitmsg
 struct Waitmsg
 {
 	int	pid;		/* of loved one */
-	ulong	time[3];	/* of loved one and descendants */
+	uint32_t	time[3];	/* of loved one and descendants */
 	char	msg[ERRMAX];	/* actually variable-size in user mode */
 };
 
@@ -286,7 +286,7 @@ typedef struct Zio Zio;
 struct Zio
 {
 	void*	data;
-	ulong	size;
+	uint32_t	size;
 };
 
 extern	char	etext[];

sys/src/9/port/netif.h

@@ -31,9 +31,9 @@ enum
 /*
  *  Macros to manage Qid's used for multiplexed devices
  */
-#define NETTYPE(x)	(((ulong)x)&0x1f)
-#define NETID(x)	((((ulong)x))>>5)
-#define NETQID(i,t)	((((ulong)i)<<5)|(t))
+#define NETTYPE(x)	(((uint32_t)x)&0x1f)
+#define NETID(x)	((((uint32_t)x))>>5)
+#define NETQID(i,t)	((((uint32_t)i)<<5)|(t))
 
 /*
  *  one per multiplexed connection
@@ -118,7 +118,7 @@ struct Netif
 	void	(*scanbs)(void*, uint);	/* scan for base stations */
 };
 
-void	netifinit(Netif*, char*, int, ulong);
+void	netifinit(Netif*, char*, int, uint32_t);
 Walkqid*	netifwalk(Netif*, Chan*, Chan*, char **, int);
 Chan*	netifopen(Netif*, Chan*, int);
 void	netifclose(Netif*, Chan*);

sys/src/9/port/portdat.h

@@ -114,20 +114,20 @@ extern Waitstats waitstats;
 
 struct Lockstats
 {
-	ulong	locks;
-	ulong	glare;
-	ulong	inglare;
+	uint32_t	locks;
+	uint32_t	glare;
+	uint32_t	inglare;
 };
 extern Lockstats lockstats;
 
 struct QLockstats
 {
-	ulong rlock;
-	ulong rlockq;
-	ulong wlock;
-	ulong wlockq;
-	ulong qlock;
-	ulong qlockq;
+	uint32_t rlock;
+	uint32_t rlockq;
+	uint32_t wlock;
+	uint32_t wlockq;
+	uint32_t qlock;
+	uint32_t qlockq;
 };
 extern QLockstats qlockstats;
 
@@ -218,7 +218,7 @@ struct Chan
 	ushort	flag;
 	Qid	qid;
 	int	fid;			/* for devmnt */
-	ulong	iounit;			/* chunk size for i/o; 0==default */
+	uint32_t	iounit;			/* chunk size for i/o; 0==default */
 	Mhead*	umh;			/* mount point that derived Chan; used in unionread */
 	Chan*	umc;			/* channel in union; held for union read */
 	QLock	umqlock;		/* serialize unionreads */
@@ -234,7 +234,7 @@ struct Chan
 	union {
 		void*	aux;
 		Qid	pgrpid;		/* for #p/notepg */
-		ulong	mid;		/* for ns in devproc */
+		uint32_t	mid;		/* for ns in devproc */
 	};
 	Chan*	mchan;			/* channel to mounted server */
 	Qid	mqid;			/* qid of root of mount point */
@@ -372,7 +372,7 @@ struct Page
 	Lock;
 	uintmem	pa;			/* Physical address in memory */
 	uintptr	va;			/* Virtual address for user */
-	ulong	daddr;			/* Disc address on swap */
+	uint32_t	daddr;			/* Disc address on swap */
 	int	ref;			/* Reference count */
 	uchar	modref;			/* Simulated modify/reference bits */
 	int	color;			/* Cache coloring */
@@ -451,7 +451,7 @@ enum
 
 struct Physseg
 {
-	ulong	attr;			/* Segment attributes */
+	uint32_t	attr;			/* Segment attributes */
 	char	*name;			/* Attach name */
 	uintmem	pa;			/* Physical address */
 	usize	size;			/* Maximum segment size in pages */
@@ -511,12 +511,12 @@ struct Segment
 	uintptr	base;		/* virtual base */
 	uintptr	top;		/* virtual top */
 	usize	size;		/* size in pages */
-	ulong	fstart;		/* start address in file for demand load */
-	ulong	flen;		/* length of segment in file */
+	uint32_t	fstart;		/* start address in file for demand load */
+	uint32_t	flen;		/* length of segment in file */
 	int	flushme;	/* maintain icache for this segment */
 	Image	*image;		/* text in file attached to this segment */
 	Physseg *pseg;
-	ulong*	profile;	/* Tick profile area */
+	uint32_t*	profile;	/* Tick profile area */
 	Pte	**map;
 	int	mapsize;
 	Pte	*ssegmap[SSEGMAPSIZE];
@@ -552,7 +552,7 @@ struct Pgrp
 {
 	Ref;				/* also used as a lock when mounting */
 	int	noattach;
-	ulong	pgrpid;
+	uint32_t	pgrpid;
 	QLock	debug;			/* single access via devproc.c */
 	RWlock	ns;			/* Namespace n read/one write lock */
 	Mhead	*mnthash[MNTHASH];
@@ -571,8 +571,8 @@ struct Egrp
 	Evalue	**ent;
 	int	nent;
 	int	ment;
-	ulong	path;	/* qid.path of next Evalue to be allocated */
-	ulong	vers;	/* of Egrp */
+	uint32_t	path;	/* qid.path of next Evalue to be allocated */
+	uint32_t	vers;	/* of Egrp */
 };
 
 struct Evalue
@@ -601,12 +601,12 @@ enum
 struct Pallocmem
 {
 	uintmem	base;
-	ulong	npage;
+	uint32_t	npage;
 };
 
 struct Pgsza
 {
-	ulong	freecount;	/* how many pages in the free list? */
+	uint32_t	freecount;	/* how many pages in the free list? */
 	Ref	npages;		/* how many pages of this size? */
 	Page	*head;		/* MRU */
 	Page	*tail;		/* LRU */
@@ -747,15 +747,15 @@ struct Sched
 {
 	Lock;			/* runq */
 	int	nrdy;
-	ulong delayedscheds;	/* statistics */
+	uint32_t delayedscheds;	/* statistics */
 	long skipscheds;
 	long preempts;
 	int schedgain;
-	ulong balancetime;
+	uint32_t balancetime;
 	Schedq	runq[Nrq];
-	ulong	runvec;
+	uint32_t	runvec;
 	int	nmach;		/* # of cores with this color */
-	ulong	nrun;		/* to compute load */
+	uint32_t	nrun;		/* to compute load */
 };
 
 typedef union Ar0 Ar0;
@@ -1059,7 +1059,7 @@ struct Uart
 	void*	regs;			/* hardware stuff */
 	void*	saveregs;		/* place to put registers on power down */
 	char*	name;			/* internal name */
-	ulong	freq;			/* clock frequency */
+	uint32_t	freq;			/* clock frequency */
 	int	bits;			/* bits per character */
 	int	stop;			/* stop bits */
 	int	parity;			/* even, odd or no parity */
@@ -1118,13 +1118,13 @@ extern	Uart*	consuart;
  */
 struct Perf
 {
-	ulong	intrts;		/* time of last interrupt */
-	ulong	inintr;		/* time since last clock tick in interrupt handlers */
-	ulong	avg_inintr;	/* avg time per clock tick in interrupt handlers */
-	ulong	inidle;		/* time since last clock tick in idle loop */
-	ulong	avg_inidle;	/* avg time per clock tick in idle loop */
-	ulong	last;		/* value of perfticks() at last clock tick */
-	ulong	period;		/* perfticks() per clock tick */
+	uint32_t	intrts;		/* time of last interrupt */
+	uint32_t	inintr;		/* time since last clock tick in interrupt handlers */
+	uint32_t	avg_inintr;	/* avg time per clock tick in interrupt handlers */
+	uint32_t	inidle;		/* time since last clock tick in idle loop */
+	uint32_t	avg_inidle;	/* avg time per clock tick in idle loop */
+	uint32_t	last;		/* value of perfticks() at last clock tick */
+	uint32_t	period;		/* perfticks() per clock tick */
 };
 
 struct Watchdog

sys/src/9/port/portfns.h

@@ -10,7 +10,7 @@
 void		_assert(char*);
 void		accounttime(void);
 void		acsched(void);
-void		addbootfile(char*, uchar*, ulong);
+void		addbootfile(char*, uchar*, uint32_t);
 Timer*		addclock0link(void (*)(void), int);
 int		addconsdev(Queue*, void (*fn)(char*,int), int, int);
 int		addkbdq(Queue*, int);
@@ -30,7 +30,7 @@ Page*		auxpage(usize);
 Block*		bl2mem(uchar*, Block*, int);
 int		blocklen(Block*);
 void		bootlinks(void);
-void		cachedel(Image*, ulong);
+void		cachedel(Image*, uint32_t);
 void		cachepage(Page*, Image*);
 void		callwithureg(void (*)(Ureg*));
 int		canlock(Lock*);
@@ -131,9 +131,9 @@ void		freeb(Block*);
 void		freeblist(Block*);
 int		freebroken(void);
 void		freepte(Segment*, Pte*);
-void		getcolor(ulong, ulong*, ulong*, ulong*);
+void		getcolor(uint32_t, uint32_t*, uint32_t*, uint32_t*);
 char*		getconfenv(void);
-int		getpgszi(ulong);
+int		getpgszi(uint32_t);
 Segment*	getzkseg(void);
 void		gotolabel(Label*);
 int		haswaitq(void*);
@@ -174,8 +174,8 @@ void		logclose(Log*);
 char*		logctl(Log*, int, char**, Logflag*);
 void		logn(Log*, int, void*, int);
 void		logopen(Log*);
-long		logread(Log*, void*, ulong, long);
-Page*		lookpage(Image*, ulong);
+long		logread(Log*, void*, uint32_t, long);
+Page*		lookpage(Image*, uint32_t);
 Cmdtab*		lookupcmd(Cmdbuf*, Cmdtab*, int);
 void		mallocinit(void);
 long		mallocreadsummary(Chan*, void*, long, long);
@@ -189,7 +189,7 @@ void		(*mfcwrite)(Chan*, uchar*, int, vlong);
 void		mfreeseg(Segment*, uintptr, int);
 void		microdelay(int);
 uvlong		mk64fract(uvlong, uvlong);
-void		mkqid(Qid*, vlong, ulong, int);
+void		mkqid(Qid*, vlong, uint32_t, int);
 void		mmuflush(void);
 void		mmuput(uintptr, Page*, uint);
 void		mmurelease(Proc*);
@@ -197,9 +197,9 @@ void		mmuswitch(Proc*);
 Chan*		mntauth(Chan*, char*);
 usize		mntversion(Chan*, u32int, char*, usize);
 void		mountfree(Mount*);
-uvlong		ms2fastticks(ulong);
+uvlong		ms2fastticks(uint32_t);
 #define		MS2NS(n) (((vlong)(n))*1000000LL)
-ulong		ms2tk(ulong);
+uint32_t		ms2tk(uint32_t);
 void		mul64fract(uvlong*, uvlong, uvlong);
 void		muxclose(Mnt*);
 void		(*mwait)(void *);
@@ -229,25 +229,25 @@ Block*		packblock(Block*);
 Block*		padblock(Block*, int);
 void		pagechainhead(Page*);
 void		pageinit(void);
-ulong		pagenumber(Page*);
+uint32_t		pagenumber(Page*);
 uvlong		pagereclaim(Image*);
 void		pagersummary(void);
 void		pageunchain(Page*);
 void		panic(char*, ...);
 Cmdbuf*		parsecmd(char *a, int n);
 void		pathclose(Path*);
-ulong		perfticks(void);
+uint32_t		perfticks(void);
 void		pexit(char*, int);
 Page*		pgalloc(usize, int);
 void		pgfree(Page*);
 void		pgrpcpy(Pgrp*, Pgrp*);
-void		pgrpnote(ulong, char*, long, int);
+void		pgrpnote(uint32_t, char*, long, int);
 uintmem		physalloc(u64int, int*, void*);
 void		physdump(void);
 void		physfree(uintmem, u64int);
 void		physinit(uintmem, u64int);
 void*		phystag(uintmem);
-void		pio(Segment*, uintptr, ulong, Page**, int);
+void		pio(Segment*, uintptr, uint32_t, Page**, int);
 #define		poperror()		up->nerrlab--
 void		portmwait(void*);
 int		postnote(Proc*, int, char*, int);
@@ -255,7 +255,7 @@ int		pprint(char*, ...);
 int		preempted(void);
 void		prflush(void);
 void		printinit(void);
-ulong		procalarm(ulong);
+uint32_t		procalarm(uint32_t);
 void		procctl(Proc*);
 void		procdump(void);
 int		procfdprint(Chan*, int, int, char*, int);
@@ -290,7 +290,7 @@ Queue*		qbypass(void (*)(void*, Block*), void*);
 int		qcanread(Queue*);
 void		qclose(Queue*);
 int		qconsume(Queue*, void*, int);
-Block*		qcopy(Queue*, int, ulong);
+Block*		qcopy(Queue*, int, uint32_t);
 int		qdiscard(Queue*, int);
 void		qflush(Queue*);
 void		qfree(Queue*);
@@ -316,9 +316,9 @@ int		qwindow(Queue*);
 int		qwrite(Queue*, void*, int);
 int		rand(void);
 void		randominit(void);
-ulong		randomread(void*, ulong);
+uint32_t		randomread(void*, uint32_t);
 void		rdb(void);
-int		readnum(ulong, char*, ulong, ulong, int);
+int		readnum(uint32_t, char*, uint32_t, uint32_t, int);
 long		readstr(long, char*, long, char*);
 void		ready(Proc*);
 long		readzio(Kzio[], int, void*, long);
@@ -347,16 +347,16 @@ int		semadec(int*);
 int		semainc(int*);
 char*		seprintpagestats(char*, char*);
 char*		seprintphysstats(char*, char*);
-int		setcolor(ulong, ulong, ulong, ulong);
+int		setcolor(uint32_t, uint32_t, uint32_t, uint32_t);
 void		setkernur(Ureg*, Proc*);
 int		setlabel(Label*);
 void		setregisters(Ureg*, char*, char*, int);
 char*		skipslash(char*);
 void		sleep(Rendez*, int (*)(void*), void*);
-void*		smalloc(ulong);
+void*		smalloc(uint32_t);
 char*		srvname(Chan*);
 void		startwaitstats(int);
-int		swapcount(ulong);
+int		swapcount(uint32_t);
 void		swapinit(void);
 void		syscallfmt(int, va_list list);
 void		sysretfmt(int, va_list, Ar0*, uvlong, uvlong);
@@ -366,7 +366,7 @@ void		timerdel(Timer*);
 void		timerintr(Ureg*, vlong);
 void		timerset(uvlong);
 void		timersinit(void);
-ulong		tk2ms(ulong);
+uint32_t		tk2ms(uint32_t);
 #define		TK2MS(x) ((x)*(1000/HZ))
 uvlong		tod2fastticks(vlong);
 vlong		todget(vlong*);

sys/src/9/port/sd.h

@@ -20,7 +20,7 @@ typedef struct SDunit SDunit;
 struct SDperm {
 	char*	name;
 	char*	user;
-	ulong	perm;
+	uint32_t	perm;
 };
 
 struct SDpart {
@@ -28,7 +28,7 @@ struct SDpart {
 	uvlong	end;
 	SDperm;
 	int	valid;
-	ulong	vers;
+	uint32_t	vers;
 };
 
 struct SDunit {
@@ -40,14 +40,14 @@ struct SDunit {
 
 	QLock	ctl;
 	uvlong	sectors;
-	ulong	secsize;
+	uint32_t	secsize;
 	SDpart*	part;			/* nil or array of size npart */
 	int	npart;
-	ulong	vers;
+	uint32_t	vers;
 	SDperm	ctlperm;
 
 	QLock	raw;			/* raw read or write in progress */
-	ulong	rawinuse;		/* really just a test-and-set */
+	uint32_t	rawinuse;		/* really just a test-and-set */
 	int	state;
 	SDreq*	req;
 	SDperm	rawperm;
@@ -149,13 +149,13 @@ extern SDev* scsiid(SDev*, SDifc*);
  *  hardware info about a device
  */
 typedef struct {
-	ulong	port;	
+	uint32_t	port;	
 	int	size;
 } Devport;
 
 struct DevConf
 {
-	ulong	intnum;			/* interrupt number */
+	uint32_t	intnum;			/* interrupt number */
 	char	*type;			/* card type, malloced */
 	int	nports;			/* Number of ports */
 	Devport	*ports;			/* The ports themselves */

sys/src/9/w/pxeload/dat.h

@@ -37,7 +37,7 @@ struct Block {
 	uchar*	wp;			/* first empty byte */
 	uchar*	lim;			/* 1 past the end of the buffer */
 	uchar*	base;			/* start of the buffer */
-	ulong	flag;
+	uint32_t	flag;
 };
 #define BLEN(s)	((s)->wp - (s)->rp)
 
@@ -75,18 +75,18 @@ extern uchar broadcast[Eaddrlen];
 typedef struct Ureg Ureg;
 
 typedef struct Segdesc {
-	ulong	d0;
-	ulong	d1;
+	uint32_t	d0;
+	uint32_t	d1;
 } Segdesc;
 
 typedef struct Mach {
 	int	machno;			/* physical id of processor (KNOWN TO ASSEMBLY) */
-	ulong	splpc;			/* pc of last caller to splhi */
+	uint32_t	splpc;			/* pc of last caller to splhi */
 
-	ulong*	pdb;			/* page directory base for this processor (va) */
+	uint32_t*	pdb;			/* page directory base for this processor (va) */
 	Segdesc	*gdt;			/* gdt for this processor */
 
-	ulong	ticks;			/* of the clock since boot time */
+	uint32_t	ticks;			/* of the clock since boot time */
 	void	*alarm;			/* alarms bound to this clock */
 } Mach;
 
@@ -116,12 +116,12 @@ struct	Exec
 
 typedef struct  ISAConf {
 	char*	type;
-	ulong	port;
-	ulong	irq;
-	ulong	dma;
-	ulong	mem;
-	ulong	size;
-	ulong	freq;
+	uint32_t	port;
+	uint32_t	irq;
+	uint32_t	dma;
+	uint32_t	mem;
+	uint32_t	size;
+	uint32_t	freq;
 	uchar	ea[6];
 
 	int	nopt;
@@ -323,7 +323,7 @@ typedef struct Netif Netif;
 typedef struct Ether Ether;
 struct Netif {
 	/* Ether */
-	long	(*ifstat)(Ether*, void*, long, ulong);
+	long	(*ifstat)(Ether*, void*, long, uint32_t);
 	long 	(*ctl)(Ether*, void*, long);
 
 	/* Netif */

sys/src/9/w/pxeload/devfloppy.h

@@ -25,7 +25,7 @@ struct FDrive
 	int	dt;		/* drive type */
 	int	dev;
 
-	ulong	lasttouched;	/* time last touched */
+	uint32_t	lasttouched;	/* time last touched */
 	int	cyl;		/* current arm position */
 	int	confused;	/* needs to be recalibrated */
 	int	offset;		/* current offset */

sys/src/9/w/pxeload/fns.h

@@ -46,23 +46,23 @@ void	floppyprintdevs(int);
 void*	floppygetfspart(int, char*, int);
 void	freeb(Block*);
 char*	getconf(char*);
-ulong	getcr0(void);
-ulong	getcr2(void);
-ulong	getcr3(void);
-ulong	getcr4(void);
+uint32_t	getcr0(void);
+uint32_t	getcr2(void);
+uint32_t	getcr3(void);
+uint32_t	getcr4(void);
 int	getfields(char*, char**, int, char);
 int	getstr(char*, char*, int, char*, int);
 int	gunzip(uchar*, int, uchar*, int);
 void	i8042a20(void);
 void	i8042init(void);
 void	i8042reset(void);
-void*	ialloc(ulong, int);
+void*	ialloc(uint32_t, int);
 void	idle(void);
 void	ilock(Lock*);
 void	impulse(void);
 int	inb(int);
 ushort	ins(int);
-ulong	inl(int);
+uint32_t	inl(int);
 void	insb(int, void*, int);
 void	inss(int, void*, int);
 void	insl(int, void*, int);
@@ -75,8 +75,8 @@ void	kbdchar(int);
 void	lgdt(ushort[3]);
 void	lidt(ushort[3]);
 void	machinit(void);
-void	mapraminit(uvlong, ulong);
-void	mapupainit(uvlong, ulong);
+void	mapraminit(uvlong, uint32_t);
+void	mapupainit(uvlong, uint32_t);
 void	mb386(void);
 void	meminit(u32int);
 void	microdelay(int);
@@ -87,12 +87,12 @@ char*	nextelem(char*, char*);
 uchar	nvramread(int);
 void	outb(int, int);
 void	outs(int, ushort);
-void	outl(int, ulong);
+void	outl(int, uint32_t);
 void	outsb(int, void*, int);
 void	outss(int, void*, int);
 void	outsl(int, void*, int);
 void	panic(char*, ...);
-ulong	pcibarsize(Pcidev*, int);
+uint32_t	pcibarsize(Pcidev*, int);
 int	pcicfgr8(Pcidev*, int);
 int	pcicfgr16(Pcidev*, int);
 int	pcicfgr32(Pcidev*, int);
@@ -114,12 +114,12 @@ void	pcisetmwi(Pcidev*);
 int	pcisetpms(Pcidev*, int);
 void	pcmcisread(PCMslot*);
 int	pcmcistuple(int, int, int, void*, int);
-PCMmap*	pcmmap(int, ulong, int, int);
+PCMmap*	pcmmap(int, uint32_t, int, int);
 int	pcmspecial(char*, ISAConf*);
 void	pcmspecialclose(int);
 void	pcmunmap(int, PCMmap*);
 void	ptcheck(char*);
-void	putcr3(ulong);
+void	putcr3(uint32_t);
 void	putidt(Segdesc*, int);
 void*	pxegetfspart(int, char*, int);
 void	qinit(IOQ*);
@@ -145,16 +145,16 @@ void	turnwheel(int);
 void	uartdrain(IOQ*);
 int	uartspecial(int, void (*)(int), int (*)(void), int);
 void	uartputs(IOQ*, char*, int);
-ulong	umbmalloc(ulong, int, int);
-void	umbfree(ulong, int);
-ulong	umbrwmalloc(ulong, int, int);
-void	upafree(ulong, int);
-ulong	upamalloc(ulong, int, int);
+uint32_t	umbmalloc(uint32_t, int, int);
+void	umbfree(uint32_t, int);
+uint32_t	umbrwmalloc(uint32_t, int, int);
+void	upafree(uint32_t, int);
+uint32_t	upamalloc(uint32_t, int, int);
 void	warp64(uvlong);
-void	warp86(char*, ulong);
-void	warp9(ulong);
+void	warp86(char*, uint32_t);
+void	warp9(uint32_t);
 int	x86cpuid(int*, int*);
-void*	xspanalloc(ulong, int, ulong);
+void*	xspanalloc(uint32_t, int, uint32_t);
 
 #define malloc(n)	ialloc(n, 0)
 #define mallocz(n, c)	ialloc(n, 0)
@@ -163,11 +163,11 @@ void*	xspanalloc(ulong, int, ulong);
 #define	GSHORT(p)	(((p)[1]<<8)|(p)[0])
 #define	GLONG(p)	((GSHORT(p+2)<<16)|GSHORT(p))
 #define	GLSHORT(p)	(((p)[0]<<8)|(p)[1])
-#define	GLLONG(p)	(((ulong)GLSHORT(p)<<16)|GLSHORT(p+2))
+#define	GLLONG(p)	(((uint32_t)GLSHORT(p)<<16)|GLSHORT(p+2))
 #define	PLLONG(p,v)	(p)[3]=(v);(p)[2]=(v)>>8;(p)[1]=(v)>>16;(p)[0]=(v)>>24
 
-#define KADDR(a)	((void*)((ulong)(a)|KZERO))
-#define PADDR(a)	((ulong)(a)&~0xF0000000)
+#define KADDR(a)	((void*)((uint32_t)(a)|KZERO))
+#define PADDR(a)	((uint32_t)(a)&~0xF0000000)
 
 #define	HOWMANY(x, y)	(((x)+((y)-1))/(y))
 #define ROUNDUP(x, y)	(HOWMANY((x), (y))*(y))

sys/src/9/w/pxeload/fs.h

@@ -42,4 +42,4 @@ extern int fswalk(Fs*, char*, File*);
 extern int fsread(File*, void*, long);
 extern int fsboot(Fs*, char*, Boot*);
 
-#define BADPTR(x) ((ulong)x < (ulong)(KZERO+0x7c00))
+#define BADPTR(x) ((uint32_t)x < (uint32_t)(KZERO+0x7c00))

sys/src/9/w/pxeload/io.h

@@ -172,12 +172,12 @@ typedef struct Pcidev {
 	uchar	ltr;
 
 	struct {
-		ulong	bar;		/* base address */
+		uint32_t	bar;		/* base address */
 		int	size;
 	} mem[6];
 
 	struct {
-		ulong	bar;
+		uint32_t	bar;
 		int	size;
 	} rom;
 	uchar	intl;			/* interrupt line */
@@ -188,7 +188,7 @@ typedef struct Pcidev {
 
 	Pcidev*	bridge;			/* down a bus */
 	struct {
-		ulong	bar;
+		uint32_t	bar;
 		int	size;
 	} ioa, mema;
 
@@ -210,9 +210,9 @@ typedef struct PCMconftab	PCMconftab;
  * Map between ISA memory space and PCMCIA card memory space.
  */
 struct PCMmap {
-	ulong	ca;			/* card address */
-	ulong	cea;			/* card end address */
-	ulong	isa;			/* ISA address */
+	uint32_t	ca;			/* card address */
+	uint32_t	cea;			/* card end address */
+	uint32_t	isa;			/* ISA address */
 	int	len;			/* length of the ISA area */
 	int	attr;			/* attribute memory */
 	int	ref;
@@ -226,16 +226,16 @@ struct PCMconftab
 	uchar	irqtype;
 	uchar	bit16;		/* true for 16 bit access */
 	struct {
-		ulong	start;
-		ulong	len;
+		uint32_t	start;
+		uint32_t	len;
 	} io[16];
 	int	nio;
 	uchar	vpp1;
 	uchar	vpp2;
 	uchar	memwait;
-	ulong	maxwait;
-	ulong	readywait;
-	ulong	otherwait;
+	uint32_t	maxwait;
+	uint32_t	readywait;
+	uint32_t	otherwait;
 };
 
 /* a card slot */

sys/src/9/w/pxeload/ip.h

@@ -101,7 +101,7 @@ struct Bootp
 typedef struct Netaddr Netaddr;
 struct Netaddr
 {
-	ulong	ip;
+	uint32_t	ip;
 	ushort	port;
 	char	ea[Eaddrlen];
 };

sys/src/9/w/pxeload/lib.h

@@ -14,11 +14,11 @@
 /*
  * mem routines
  */
-extern	void*	memccpy(void*, void*, int, ulong);
-extern	void*	memset(void*, int, ulong);
-extern	int	memcmp(void*, void*, ulong);
-extern	void*	memmove(void*, void*, ulong);
-extern	void*	memchr(void*, int, ulong);
+extern	void*	memccpy(void*, void*, int, uint32_t);
+extern	void*	memset(void*, int, uint32_t);
+extern	int	memcmp(void*, void*, uint32_t);
+extern	void*	memmove(void*, void*, uint32_t);
+extern	void*	memchr(void*, int, uint32_t);
 
 /*
  * string routines
@@ -53,7 +53,7 @@ struct Fmt{
 	int	r;			/* % format Rune */
 	int	width;
 	int	prec;
-	ulong	flags;
+	uint32_t	flags;
 };
 extern	int	print(char*, ...);
 extern	char*	vseprint(char*, char*, char*, va_list);
@@ -106,9 +106,9 @@ extern	int	fmtstrcpy(Fmt*, char*);
  * one-of-a-kind
  */
 extern	int	atoi(char*);
-extern	ulong	getcallerpc(void*);
+extern	uint32_t	getcallerpc(void*);
 extern	long	strtol(char*, char**, int);
-extern	ulong	strtoul(char*, char**, int);
+extern	uint32_t	strtoul(char*, char**, int);
 extern	char	end[];
 
 #define	NAMELEN	28

sys/src/9/w/pxeload/ureg.h

@@ -11,26 +11,26 @@ typedef struct Ureg	Ureg;
 
 struct Ureg
 {
-	ulong	di;		/* general registers */
-	ulong	si;		/* ... */
-	ulong	bp;		/* ... */
-	ulong	nsp;
-	ulong	bx;		/* ... */
-	ulong	dx;		/* ... */
-	ulong	cx;		/* ... */
-	ulong	ax;		/* ... */
-	ulong	gs;		/* data segments */
-	ulong	fs;		/* ... */
-	ulong	es;		/* ... */
-	ulong	ds;		/* ... */
-	ulong	trap;		/* trap type */
-	ulong	ecode;		/* error code (or zero) */
-	ulong	pc;		/* pc */
-	ulong	cs;		/* old context */
-	ulong	flags;		/* old flags */
+	uint32_t	di;		/* general registers */
+	uint32_t	si;		/* ... */
+	uint32_t	bp;		/* ... */
+	uint32_t	nsp;
+	uint32_t	bx;		/* ... */
+	uint32_t	dx;		/* ... */
+	uint32_t	cx;		/* ... */
+	uint32_t	ax;		/* ... */
+	uint32_t	gs;		/* data segments */
+	uint32_t	fs;		/* ... */
+	uint32_t	es;		/* ... */
+	uint32_t	ds;		/* ... */
+	uint32_t	trap;		/* trap type */
+	uint32_t	ecode;		/* error code (or zero) */
+	uint32_t	pc;		/* pc */
+	uint32_t	cs;		/* old context */
+	uint32_t	flags;		/* old flags */
 	union {
-		ulong	usp;
-		ulong	sp;
+		uint32_t	usp;
+		uint32_t	sp;
 	};
-	ulong	ss;		/* old stack segment */
+	uint32_t	ss;		/* old stack segment */
 };

sys/src/ape/lib/9/libc.h

@@ -33,7 +33,7 @@ typedef
 struct Qid
 {
 	uvlong	path;
-	ulong	vers;
+	uint32_t	vers;
 	uchar	type;
 } Qid;
 
@@ -44,9 +44,9 @@ struct Dir {
 	uint	dev;	/* server subtype */
 	/* file data */
 	Qid	qid;	/* unique id from server */
-	ulong	mode;	/* permissions */
-	ulong	atime;	/* last read time */
-	ulong	mtime;	/* last write time */
+	uint32_t	mode;	/* permissions */
+	uint32_t	atime;	/* last read time */
+	uint32_t	mtime;	/* last write time */
 	vlong	length;	/* file length: see <u.h> */
 	char	*name;	/* last element of path */
 	char	*uid;	/* owner name */
@@ -147,8 +147,8 @@ extern	int	_IOUNIT(int);
 
 #define ERRMAX 128
 
-extern	void	setmalloctag(void*, ulong);
-extern	ulong	getcallerpc(void*);
+extern	void	setmalloctag(void*, uint32_t);
+extern	uint32_t	getcallerpc(void*);
 
 /* Used in libsec.h and not picked up in earlier type definitions */
 typedef unsigned int u32int;
@@ -165,5 +165,5 @@ extern	vlong	nsec(void);
 
 extern void sysfatal(char*, ...);
 
-extern	ulong	truerand(void);			/* uses /dev/random */
+extern	uint32_t	truerand(void);			/* uses /dev/random */
 extern	int	getfields(char*, char**, int, int, char*);

sys/src/ape/lib/ap/plan9/dir.h

@@ -51,7 +51,7 @@ typedef
 struct Qid
 {
 	uvlong	path;
-	ulong	vers;
+	uint32_t	vers;
 	uchar	type;
 } Qid;
 
@@ -62,9 +62,9 @@ struct Dir {
 	uint	dev;	/* server subtype */
 	/* file data */
 	Qid	qid;	/* unique id from server */
-	ulong	mode;	/* permissions */
-	ulong	atime;	/* last read time */
-	ulong	mtime;	/* last write time */
+	uint32_t	mode;	/* permissions */
+	uint32_t	atime;	/* last read time */
+	uint32_t	mtime;	/* last write time */
 	vlong	length;	/* file length: see <u.h> */
 	char	*name;	/* last element of path */
 	char	*uid;	/* owner name */

sys/src/ape/lib/draw/libc.h

@@ -28,7 +28,7 @@ typedef
 struct Qid
 {
 	uvlong	path;
-	ulong	vers;
+	uint32_t	vers;
 	uchar	type;
 } Qid;
 
@@ -39,9 +39,9 @@ struct Dir {
 	uint	dev;	/* server subtype */
 	/* file data */
 	Qid	qid;	/* unique id from server */
-	ulong	mode;	/* permissions */
-	ulong	atime;	/* last read time */
-	ulong	mtime;	/* last write time */
+	uint32_t	mode;	/* permissions */
+	uint32_t	atime;	/* last read time */
+	uint32_t	mtime;	/* last write time */
 	vlong	length;	/* file length: see <u.h> */
 	char	*name;	/* last element of path */
 	char	*uid;	/* owner name */
@@ -143,5 +143,5 @@ extern	int	_IOUNIT(int);
 
 #define ERRMAX 128
 
-extern	void	setmalloctag(void*, ulong);
-extern	ulong	getcallerpc(void*);
+extern	void	setmalloctag(void*, uint32_t);
+extern	uint32_t	getcallerpc(void*);

sys/src/ape/lib/mp/port/libc.h

@@ -19,9 +19,9 @@ typedef unsigned long long u64int;
 
 #define	nelem(x)	(sizeof(x)/sizeof((x)[0]))
 
-extern	ulong	getcallerpc(void*);
-extern	void*	mallocz(ulong, int);
-extern	void	setmalloctag(void*, ulong);
+extern	uint32_t	getcallerpc(void*);
+extern	void*	mallocz(uint32_t, int);
+extern	void	setmalloctag(void*, uint32_t);
 
 extern int  dec16(uchar *, int, char *, int);
 extern int  enc16(char *, int, uchar *, int);

sys/src/ape/lib/sec/port/libc.h

@@ -33,7 +33,7 @@ typedef
 struct Qid
 {
 	uvlong	path;
-	ulong	vers;
+	uint32_t	vers;
 	uchar	type;
 } Qid;
 
@@ -44,9 +44,9 @@ struct Dir {
 	uint	dev;	/* server subtype */
 	/* file data */
 	Qid	qid;	/* unique id from server */
-	ulong	mode;	/* permissions */
-	ulong	atime;	/* last read time */
-	ulong	mtime;	/* last write time */
+	uint32_t	mode;	/* permissions */
+	uint32_t	atime;	/* last read time */
+	uint32_t	mtime;	/* last write time */
 	vlong	length;	/* file length: see <u.h> */
 	char	*name;	/* last element of path */
 	char	*uid;	/* owner name */
@@ -178,8 +178,8 @@ extern	int	_IOUNIT(int);
 
 #define ERRMAX 128
 
-extern	void	setmalloctag(void*, ulong);
-extern	ulong	getcallerpc(void*);
+extern	void	setmalloctag(void*, uint32_t);
+extern	uint32_t	getcallerpc(void*);
 
 /* Used in libsec.h and not picked up in earlier type definitions */
 typedef unsigned int u32int;
@@ -196,7 +196,7 @@ extern	vlong	nsec(void);
 
 extern void sysfatal(char*, ...);
 
-extern	ulong	truerand(void);			/* uses /dev/random */
+extern	uint32_t	truerand(void);			/* uses /dev/random */
 extern	int	getfields(char*, char**, int, int, char*);
 
 #pragma	varargck	type	"lld"	vlong

sys/src/cmd/5c/gc.h

@@ -313,9 +313,9 @@ Bits	mkvar(Adr*, int);
 void	prop(Reg*, Bits, Bits);
 void	loopit(Reg*, long);
 void	synch(Reg*, Bits);
-ulong	allreg(ulong, Rgn*);
+uint32_t	allreg(uint32_t, Rgn*);
 void	paint1(Reg*, int);
-ulong	paint2(Reg*, int);
+uint32_t	paint2(Reg*, int);
 void	paint3(Reg*, int, long, int);
 void	addreg(Adr*, int);
 

sys/src/cmd/5i/arm.h

@@ -36,7 +36,7 @@ enum
 struct Breakpoint
 {
 	int		type;		/* Instruction/Read/Access/Write/Equal */
-	ulong		addr;		/* Place at address */
+	uint32_t		addr;		/* Place at address */
 	int		count;		/* To execute count times or value */
 	int		done;		/* How many times passed through */
 	Breakpoint*	next;		/* Link to next one */
@@ -64,7 +64,7 @@ struct Tlb
 {
 	int	on;			/* Being updated */
 	int	tlbsize;		/* Number of entries */
-	ulong	tlbent[Nmaxtlb];	/* Virtual address tags */
+	uint32_t	tlbent[Nmaxtlb];	/* Virtual address tags */
 	int	hit;			/* Number of successful tag matches */
 	int	miss;			/* Number of failed tag matches */
 };		
@@ -75,13 +75,13 @@ struct Icache
 	int	linesize;		/* Line size in bytes */
 	int	stall;			/* Cache stalls */
 	int*	lines;			/* Tag array */
-	int*	(*hash)(ulong);		/* Hash function */
+	int*	(*hash)(uint32_t);		/* Hash function */
 	char*	hashtext;		/* What the function looks like */
 };
 
 struct Inst
 {
-	void 	(*func)(ulong);
+	void 	(*func)(uint32_t);
 	char*	name;
 	int	type;
 	int	count;
@@ -91,8 +91,8 @@ struct Inst
 
 struct Registers
 {
-	ulong	ar;
-	ulong	ir;
+	uint32_t	ar;
+	uint32_t	ir;
 	Inst*	ip;
 	long	r[16];
 	long	cc1;
@@ -137,10 +137,10 @@ enum
 struct Segment
 {
 	short	type;
-	ulong	base;
-	ulong	end;
-	ulong	fileoff;
-	ulong	fileend;
+	uint32_t	base;
+	uint32_t	end;
+	uint32_t	fileoff;
+	uint32_t	fileend;
 	int	rss;
 	int	refs;
 	uchar**	table;
@@ -151,27 +151,27 @@ struct Memory
 	Segment	seg[Nseg];
 };
 
-void		Ssyscall(ulong);
+void		Ssyscall(uint32_t);
 int		armclass(long);
 void		breakpoint(char*, char*);
-void		brkchk(ulong, int);
+void		brkchk(uint32_t, int);
 void		cmd(void);
 void		delbpt(char*);
 void		dobplist(void);
 void		dumpdreg(void);
 void		dumpfreg(void);
 void		dumpreg(void);
-void*		emalloc(ulong);
-void*		erealloc(void*, ulong, ulong);
-ulong		expr(char*);
+void*		emalloc(uint32_t);
+void*		erealloc(void*, uint32_t, uint32_t);
+uint32_t		expr(char*);
 void		fatal(int, char*, ...);
-ulong		getmem_2(ulong);
-ulong		getmem_4(ulong);
-uchar		getmem_b(ulong);
-ushort		getmem_h(ulong);
-uvlong		getmem_v(ulong);
-ulong		getmem_w(ulong);
-ulong		ifetch(ulong);
+uint32_t		getmem_2(uint32_t);
+uint32_t		getmem_4(uint32_t);
+uchar		getmem_b(uint32_t);
+ushort		getmem_h(uint32_t);
+uvlong		getmem_v(uint32_t);
+uint32_t		getmem_w(uint32_t);
+uint32_t		ifetch(uint32_t);
 void		inithdr(int);
 void		initicache(void);
 void		initmap(void);
@@ -180,27 +180,27 @@ void		iprofile(void);
 void		isum(void);
 void		itrace(char*, ...);
 long		lnrand(long);
-char*		memio(char*, ulong, int, int);
-int		_mipscoinst(Map*, ulong, char*, int);
+char*		memio(char*, uint32_t, int, int);
+int		_mipscoinst(Map*, uint32_t, char*, int);
 Mul		mul(long, long);
-Mulu		mulu(ulong, ulong);
+Mulu		mulu(uint32_t, uint32_t);
 char*		nextc(char*);
-void		printlocals(Symbol*, ulong);
-void		printparams(Symbol*, ulong);
+void		printlocals(Symbol*, uint32_t);
+void		printparams(Symbol*, uint32_t);
 void		printsource(long);
 void		procinit(int);
-void		putmem_b(ulong, uchar);
-void		putmem_h(ulong, ushort);
-void		putmem_v(ulong, uvlong);
-void		putmem_w(ulong, ulong);
+void		putmem_b(uint32_t, uchar);
+void		putmem_h(uint32_t, ushort);
+void		putmem_v(uint32_t, uvlong);
+void		putmem_w(uint32_t, uint32_t);
 void		reset(void);
 void		run(void);
 void		segsum(void);
 void		stktrace(int);
 void		tlbsum(void);
-void		undef(ulong);
-void		updateicache(ulong addr);
-void*		vaddr(ulong);
+void		undef(uint32_t);
+void		updateicache(uint32_t addr);
+void*		vaddr(uint32_t);
 
 /* Globals */
 EXTERN	Registers	reg;
@@ -220,11 +220,11 @@ EXTERN	int		atbpt;
 EXTERN	int		membpt;
 EXTERN	int		cmdcount;
 EXTERN	int		nopcount;
-EXTERN	ulong		dot;
+EXTERN	uint32_t		dot;
 EXTERN	char*		file;
 EXTERN	Biobuf*		bioout;
 EXTERN	Biobuf*		bin;
-EXTERN	ulong*		iprof;
+EXTERN	uint32_t*		iprof;
 EXTERN	int		datasize;
 EXTERN	Map*		symmap;	
 

sys/src/cmd/6c/gc.h

@@ -314,9 +314,9 @@ Bits	mkvar(Reg*, Adr*);
 void	prop(Reg*, Bits, Bits);
 void	loopit(Reg*, long);
 void	synch(Reg*, Bits);
-ulong	allreg(ulong, Rgn*);
+uint32_t	allreg(uint32_t, Rgn*);
 void	paint1(Reg*, int);
-ulong	paint2(Reg*, int);
+uint32_t	paint2(Reg*, int);
 void	paint3(Reg*, int, long, int);
 void	addreg(Adr*, int);
 

sys/src/cmd/6l/l.h

@@ -363,7 +363,7 @@ void	doinit(void);
 void	doprof1(void);
 void	doprof2(void);
 void	dostkoff(void);
-void	dynreloc(Sym*, ulong, int);
+void	dynreloc(Sym*, uint32_t, int);
 vlong	entryvalue(void);
 void	errorexit(void);
 void	export(void);
@@ -387,7 +387,7 @@ void	lput(long);
 void	lputl(long);
 void	main(int, char*[]);
 void	mkfwd(void);
-void*	mysbrk(ulong);
+void*	mysbrk(uint32_t);
 void	nuxiinit(void);
 void	objfile(char*);
 int	opsize(Prog*);

sys/src/cmd/8c/gc.h

@@ -311,9 +311,9 @@ Bits	mkvar(Reg*, Adr*, int);
 void	prop(Reg*, Bits, Bits);
 void	loopit(Reg*, long);
 void	synch(Reg*, Bits);
-ulong	allreg(ulong, Rgn*);
+uint32_t	allreg(uint32_t, Rgn*);
 void	paint1(Reg*, int);
-ulong	paint2(Reg*, int);
+uint32_t	paint2(Reg*, int);
 void	paint3(Reg*, int, long, int);
 void	addreg(Adr*, int);
 

sys/src/cmd/8l/elf.h

@@ -91,16 +91,21 @@ enum {
 typedef void (*Putl)(long);
 
 void	elf32(int mach, int bo, int addpsects, void (*putpsects)(Putl));
-void	elf32phdr(void (*putl)(long), ulong type, ulong off, ulong vaddr,
-	ulong paddr, ulong filesz, ulong memsz, ulong prots, ulong align);
-void	elf32shdr(void (*putl)(long), ulong name, ulong type, ulong flags,
-	ulong vaddr, ulong off, ulong sectsz, ulong link, ulong addnl,
-	ulong align, ulong entsz);
+void	elf32phdr(void (*putl)(long), uint32_t type, uint32_t off,
+		      uint32_t vaddr,
+	uint32_t paddr, uint32_t filesz, uint32_t memsz, uint32_t prots,
+		      uint32_t align);
+void	elf32shdr(void (*putl)(long), uint32_t name, uint32_t type,
+		      uint32_t flags,
+	uint32_t vaddr, uint32_t off, uint32_t sectsz, uint32_t link,
+		      uint32_t addnl,
+	uint32_t align, uint32_t entsz);
 
 void	elf64(int mach, int bo, int addpsects, void (*putpsects)(Putl));
-void	elf64phdr(void (*putl)(long), void (*putll)(vlong), ulong type,
+void	elf64phdr(void (*putl)(long), void (*putll)(vlong), uint32_t type,
 	uvlong off, uvlong vaddr, uvlong paddr, uvlong filesz, uvlong memsz,
-	ulong prots, uvlong align);
-void	elf64shdr(void (*putl)(long), void (*putll)(vlong), ulong name,
-	ulong type, uvlong flags, uvlong vaddr, uvlong off, uvlong sectsz,
-	ulong link, ulong addnl, uvlong align, uvlong entsz);
+	uint32_t prots, uvlong align);
+void	elf64shdr(void (*putl)(long), void (*putll)(vlong), uint32_t name,
+	uint32_t type, uvlong flags, uvlong vaddr, uvlong off,
+		      uvlong sectsz,
+	uint32_t link, uint32_t addnl, uvlong align, uvlong entsz);

sys/src/cmd/8l/l.h

@@ -322,7 +322,7 @@ void	doinit(void);
 void	doprof1(void);
 void	doprof2(void);
 void	dostkoff(void);
-void	dynreloc(Sym*, ulong, int);
+void	dynreloc(Sym*, uint32_t, int);
 long	entryvalue(void);
 void	errorexit(void);
 void	export(void);
@@ -346,7 +346,7 @@ void	llput(vlong v);
 void	llputl(vlong v);
 void	main(int, char*[]);
 void	mkfwd(void);
-void*	mysbrk(ulong);
+void*	mysbrk(uint32_t);
 void	nuxiinit(void);
 void	objfile(char*);
 int	opsize(Prog*);

sys/src/cmd/9660srv/dat.h

@@ -89,7 +89,7 @@ struct Xfile
 	Xfile*	next;		/* in fid hash bucket */
 	Xfs*	xf;
 	long	fid;
-	ulong	flags;
+	uint32_t	flags;
 	Qid	qid;
 	int	len;		/* of private data */
 	Isofile*	ptr;

sys/src/cmd/9nfs/dat.h

@@ -36,7 +36,7 @@ typedef struct Xfile	Xfile;
 
 struct String
 {
-	ulong	n;
+	uint32_t	n;
 	char *	s;
 };
 
@@ -56,43 +56,43 @@ struct Procmap
 
 struct Auth
 {
-	ulong	flavor;
-	ulong	count;
+	uint32_t	flavor;
+	uint32_t	count;
 	void *	data;
 };
 
 struct Authunix
 {
-	ulong	stamp;
+	uint32_t	stamp;
 	String	mach;
-	ulong	uid;
-	ulong	gid;
+	uint32_t	uid;
+	uint32_t	gid;
 	int	gidlen;
-	ulong	gids[10];
+	uint32_t	gids[10];
 };
 
 struct Accept
 {
 	Auth	averf;
-	ulong	astat;
+	uint32_t	astat;
 	union{
 		void *	results;	/* SUCCESS */
 		struct{			/* PROG_MISMATCH */
-			ulong	plow;	/* acceptable version numbers */
-			ulong	phigh;
+			uint32_t	plow;	/* acceptable version numbers */
+			uint32_t	phigh;
 		};
 	};
 };
 
 struct Reject
 {
-	ulong	rstat;
+	uint32_t	rstat;
 	union{
 		struct{			/* RPC_MISMATCH */
-			ulong	rlow;	/* acceptable  rpc version numbers */
-			ulong	rhigh;
+			uint32_t	rlow;	/* acceptable  rpc version numbers */
+			uint32_t	rhigh;
 		};
-		ulong	authstat;	/* AUTH_ERROR */
+		uint32_t	authstat;	/* AUTH_ERROR */
 	};
 };
 
@@ -100,21 +100,21 @@ struct Rpccall
 {
 	/* corresponds to Udphdr */
 	uchar	prefix0[12];
-	ulong	host;		/* ipv4 subset: prefixed to RPC message */
+	uint32_t	host;		/* ipv4 subset: prefixed to RPC message */
 	uchar	prefix1[12];
-	ulong	lhost;		/* ipv4 subset: prefixed to RPC message */
+	uint32_t	lhost;		/* ipv4 subset: prefixed to RPC message */
 	/* ignore ifcaddr */
-	ulong	port;		/* prefixed to RPC message */
-	ulong	lport;		/* prefixed to RPC message */
+	uint32_t	port;		/* prefixed to RPC message */
+	uint32_t	lport;		/* prefixed to RPC message */
 
-	ulong	xid;		/* transaction id */
-	ulong	mtype;		/* CALL or REPLY */
+	uint32_t	xid;		/* transaction id */
+	uint32_t	mtype;		/* CALL or REPLY */
 	union{
 		struct{		/* CALL */
-			ulong	rpcvers;	/* must be equal to two (2) */
-			ulong	prog;		/* program number */
-			ulong	vers;		/* program version */
-			ulong	proc;		/* procedure number */
+			uint32_t	rpcvers;	/* must be equal to two (2) */
+			uint32_t	prog;		/* program number */
+			uint32_t	vers;		/* program version */
+			uint32_t	proc;		/* procedure number */
 			Auth	cred;		/* authentication credentials */
 			Auth	verf;		/* authentication verifier */
 			Unixidmap *up;
@@ -122,7 +122,7 @@ struct Rpccall
 			void *	args;		/* procedure-specific */
 		};
 		struct{		/* REPLY */
-			ulong	stat;		/* MSG_ACCEPTED or MSG_DENIED */
+			uint32_t	stat;		/* MSG_ACCEPTED or MSG_DENIED */
 			union{
 				Accept;
 				Reject;
@@ -135,23 +135,23 @@ struct Rpccache
 {
 	Rpccache *prev;
 	Rpccache *next;
-	ulong	host;
-	ulong	port;
-	ulong	xid;
+	uint32_t	host;
+	uint32_t	port;
+	uint32_t	xid;
 	int	n;
 	uchar	data[4];
 };
 
 struct Sattr
 {
-	ulong	mode;
-	ulong	uid;
-	ulong	gid;
-	ulong	size;
-	ulong	atime;		/* sec's */
-	ulong	ausec;		/* microsec's */
-	ulong	mtime;
-	ulong	musec;
+	uint32_t	mode;
+	uint32_t	uid;
+	uint32_t	gid;
+	uint32_t	size;
+	uint32_t	atime;		/* sec's */
+	uint32_t	ausec;		/* microsec's */
+	uint32_t	mtime;
+	uint32_t	musec;
 };
 
 struct Strnode
@@ -191,7 +191,7 @@ struct Unixscmap
 {
 	Unixscmap *next;
 	char *	server;
-	ulong	clientip;
+	uint32_t	clientip;
 	Unixidmap *map;
 };
 
@@ -222,8 +222,8 @@ struct Xfid
 	char *	uid;
 	Fid *	urfid;
 	Fid *	opfid;
-	ulong	mode;		/* open mode, if opfid is non-zero */
-	ulong	offset;
+	uint32_t	mode;		/* open mode, if opfid is non-zero */
+	uint32_t	offset;
 };
 
 struct Fid

sys/src/cmd/9nfs/fns.h

@@ -22,7 +22,7 @@ int	dir2fattr(Unixidmap*, Dir*, void*);
 int	error(Rpccall*, int);
 void	fidtimer(Session*, long);
 int	garbage(Rpccall*, char*);
-int	getdom(ulong, char*, int);
+int	getdom(uint32_t, char*, int);
 int	getticket(Session*, char*);
 char*	id2name(Unixid**, int);
 void	idprint(int, Unixid*);
@@ -32,7 +32,7 @@ void	mnttimer(long);
 int	name2id(Unixid**, char*);
 Fid*	newfid(Session*);
 long	niwrite(int, void*, long);
-Unixidmap*	pair2idmap(char*, ulong);
+Unixidmap*	pair2idmap(char*, uint32_t);
 void	panic(char*, ...);
 void	putfid(Session*, Fid*);
 int	readunixidmaps(char*);

sys/src/cmd/abaco/fns.h

@@ -60,7 +60,7 @@ int dimwidth(Dimen , int);
 void frdims(Dimen *, int, int, int **);
 Image* getbg(Page *);
 Rune* getbase(Page *);
-Image* eallocimage(Display *, Rectangle, ulong, int, int);
+Image* eallocimage(Display *, Rectangle, uint32_t, int, int);
 Image* getcolor(int);
 void freecolors(void);
 Font* getfont(int);

sys/src/cmd/acme/edit.h

@@ -29,7 +29,7 @@ struct Addr
 		String	*re;
 		Addr	*left;		/* left side of , and ; */
 	};
-	ulong	num;
+	uint32_t	num;
 	Addr	*next;			/* or right side of , and ; */
 };
 

sys/src/cmd/aquarela/netbios.h

@@ -94,12 +94,14 @@ struct NbnsMessageResource {
 	NbName name;
 	ushort type;
 	ushort class;
-	ulong ttl;
+	uint32_t ttl;
 	ushort rdlength;
 	uchar *rdata;
 	NbnsMessageResource *next;
 };
-NbnsMessageResource *nbnsmessageresourcenew(NbName name, ushort type, ushort class, ulong ttl, int rdcount, uchar *rdata);
+NbnsMessageResource *nbnsmessageresourcenew(NbName name, ushort type, ushort class,
+					    uint32_t ttl, int rdcount,
+					    uchar *rdata);
 
 typedef struct NbnsMessage {
 	ushort id;
@@ -127,7 +129,9 @@ int nbnsconvS2M(NbnsMessage *s, uchar *ap, int nap);
 
 
 NbnsMessage *nbnsmessagenamequeryrequestnew(ushort id, int broadcast, NbName name);
-NbnsMessage *nbnsmessagenameregistrationrequestnew(ushort id, int broadcast, NbName name, ulong ttl, uchar *ipaddr);
+NbnsMessage *nbnsmessagenameregistrationrequestnew(ushort id, int broadcast, NbName name,
+						   uint32_t ttl,
+						   uchar *ipaddr);
 
 typedef struct NbnsTransaction NbnsTransaction;
 
@@ -138,8 +142,10 @@ struct NbnsTransaction {
 };
 ushort nbnsnextid(void);
 
-int nbnsfindname(uchar *serveripaddr, NbName name, uchar *ipaddr, ulong *ttlp);
-int nbnsaddname(uchar *serveripaddr, NbName name, ulong ttl, uchar *ipaddr);
+int nbnsfindname(uchar *serveripaddr, NbName name, uchar *ipaddr,
+		 uint32_t *ttlp);
+int nbnsaddname(uchar *serveripaddr, NbName name, uint32_t ttl,
+		uchar *ipaddr);
 
 NbnsTransaction *nbnstransactionnew(NbnsMessage *request, uchar *ipaddr);
 void nbnstransactionfree(NbnsTransaction **tp);
@@ -152,7 +158,7 @@ struct NbnsAlarm {
 	NbnsAlarm *next;
 };
 
-void nbnsalarmset(NbnsAlarm *a, ulong millisec);
+void nbnsalarmset(NbnsAlarm *a, uint32_t millisec);
 void nbnsalarmcancel(NbnsAlarm *a);
 void nbnsalarmfree(NbnsAlarm **ap);
 NbnsAlarm *nbnsalarmnew(void);
@@ -183,7 +189,7 @@ int nbssgatherwrite(NbSession *s, NbScatterGather *a);
 long nbssscatterread(NbSession *, NbScatterGather *a);
 int nbsswrite(NbSession *s, void *buf, long n);
 long nbssread(NbSession *s, void *buf, long n);
-void *nbemalloc(ulong);
+void *nbemalloc(uint32_t);
 
 int nbnameresolve(NbName name, uchar *ipaddr);
 
@@ -243,7 +249,7 @@ int nbnametablefind(NbName name, int add);
 int nbnameisany(NbName name);
 
 int nbremotenametablefind(NbName name, uchar *ipaddr);
-int nbremotenametableadd(NbName name, uchar *ipaddr, ulong ttl);
+int nbremotenametableadd(NbName name, uchar *ipaddr, uint32_t ttl);
 
 typedef struct NbGlobals {
 	uchar myipaddr[IPaddrlen];

sys/src/cmd/aquarela/smbdat.h

@@ -35,14 +35,14 @@ typedef int SMBCIFSACCEPTFN(SmbCifsSession *cifs, SMBCIFSWRITEFN **fnp);
 typedef void SMBIDMAPAPPLYFN(void *magic, void *p);
 
 struct SmbPeerInfo {
-	ulong capabilities;
+	uint32_t capabilities;
 	ushort maxlen;
 	uchar securitymode;
 	ushort maxmpxcount;
 	ushort maxnumbervcs;
-	ulong maxbuffersize;
-	ulong maxrawsize;
-	ulong sessionkey;
+	uint32_t maxbuffersize;
+	uint32_t maxrawsize;
+	uint32_t sessionkey;
 	vlong utc;
 	short tzoff;
 	uchar encryptionkeylength;
@@ -53,22 +53,22 @@ struct SmbPeerInfo {
 struct SmbTransaction {
 	struct {
 		char *name;
-		ulong tpcount;
+		uint32_t tpcount;
 		uchar *parameters;
-		ulong pcount;
-		ulong tdcount;
+		uint32_t pcount;
+		uint32_t tdcount;
 		uchar *data;
-		ulong maxpcount;
-		ulong maxdcount;
-		ulong maxscount;
-		ulong dcount;
+		uint32_t maxpcount;
+		uint32_t maxdcount;
+		uint32_t maxscount;
+		uint32_t dcount;
 		ushort scount;
 		ushort *setup;
 		ushort flags;
 	} in;
 	struct {
-		ulong tpcount;
-		ulong tdcount;
+		uint32_t tpcount;
+		uint32_t tdcount;
 		SmbBuffer *parameters;
 		SmbBuffer *data;
 		ushort *setup;
@@ -114,7 +114,7 @@ typedef struct SmbHeader {
 			uchar errclass;
 			ushort error;
 		};
-		ulong status;
+		uint32_t status;
 	};
 	uchar flags;
 	ushort flags2;
@@ -159,7 +159,7 @@ struct SmbServerInfo {
 	char *name;
 	char *nativelanman;
 	uchar vmaj, vmin;
-	ulong stype;
+	uint32_t stype;
 	char *remark;
 };
 
@@ -249,7 +249,7 @@ struct SmbFile {
 
 struct SmbSharedFile {
 	ushort type;
-	ulong dev;
+	uint32_t dev;
 	vlong path;
 //	char *name;
 	int share;			// current share level
@@ -282,19 +282,19 @@ struct SmbRapServerInfo1 {
 	char name[16];
 	uchar vmaj;
 	uchar vmin;
-	ulong type;
+	uint32_t type;
 	char *remark;
 };
 
 struct SmbFindFileBothDirectoryInfo {
-	ulong fileindex;
+	uint32_t fileindex;
 	vlong creationtime;
 	vlong lastaccesstime;
 	vlong lastwritetime;
 	vlong changetime;
 	vlong endoffile;
 	vlong allocationsize;
-	ulong extfileattributes;
+	uint32_t extfileattributes;
 	char *filename;
 };
 

sys/src/cmd/aquarela/smbfns.h

@@ -8,10 +8,10 @@
  */
 
 ushort smbnhgets(uchar *);
-ulong smbnhgetl(uchar *);
+uint32_t smbnhgetl(uchar *);
 vlong smbnhgetv(uchar *);
 void smbhnputs(uchar *, ushort);
-void smbhnputl(uchar *, ulong);
+void smbhnputl(uchar *, uint32_t);
 void smbhnputv(uchar *, vlong);
 
 SMBPROCESSFN smbnegotiate;
@@ -42,9 +42,9 @@ SMBPROCESSFN smbcomlockingandx;
 SMBPROCESSFN smbcomsetinformation;
 SMBPROCESSFN smbcomntcreateandx;
 
-void *smbemalloc(ulong size);
-void *smbemallocz(ulong size, int clear);
-void smberealloc(void **pp, ulong size);
+void *smbemalloc(uint32_t size);
+void *smbemallocz(uint32_t size, int clear);
+void smberealloc(void **pp, uint32_t size);
 char *smbestrdup(char *s);
 void smbfree(void **pp);
 
@@ -60,19 +60,23 @@ int smbstringlen(SmbPeerInfo *i, char *string);
 void smbstringprint(char **p, char *fmt, ...);
 
 int smbucs2len(char *string);
-int smbstringput(SmbPeerInfo *p, ulong flags, uchar *buf, ushort n, ushort maxlen, char *string);
-int smbstrput(ulong flags, uchar *buf, ushort n, ushort maxlen, char *string);
+int smbstringput(SmbPeerInfo *p, uint32_t flags, uchar *buf, ushort n,
+		 ushort maxlen, char *string);
+int smbstrput(uint32_t flags, uchar *buf, ushort n, ushort maxlen,
+	      char *string);
 int smbstrnput(uchar *buf, ushort n, ushort maxlen, char *string, ushort size, int upcase);
-int smbucs2put(ulong flags, uchar *buf, ushort n, ushort maxlen, char *string);
+int smbucs2put(uint32_t flags, uchar *buf, ushort n, ushort maxlen,
+	       char *string);
 
 void smbresponseinit(SmbSession *s, ushort maxlen);
 int smbresponsealignl2(SmbSession *s, int l2a);
 ushort smbresponseoffset(SmbSession *s);
 int smbresponseputheader(SmbSession *s, SmbHeader *h, uchar errclass, ushort error);
-int smbresponseputandxheader(SmbSession *s, SmbHeader *h, ushort andxcommand, ulong *andxoffsetfixup);
+int smbresponseputandxheader(SmbSession *s, SmbHeader *h, ushort andxcommand,
+			     uint32_t *andxoffsetfixup);
 int smbresponseputb(SmbSession *s, uchar b);
 int smbresponseputs(SmbSession *s, ushort s);
-int smbresponseputl(SmbSession *s, ulong l);
+int smbresponseputl(SmbSession *s, uint32_t l);
 int smbresponseoffsetputs(SmbSession *s, ushort offset, ushort s);
 int smbresponseputstring(SmbSession *s, int mustalign, char *string);
 int smbresponseputstr(SmbSession *s, char *string);
@@ -86,7 +90,8 @@ int smbresponsecpy(SmbSession *s, uchar *data, ushort datalen);
 void smbtreedisconnect(SmbSession *s, SmbTree *t);
 void smbtreedisconnectbyid(SmbSession *s, ushort id);
 SmbTree *smbtreeconnect(SmbSession *s, SmbService *serv);
-int smbchaincommand(SmbSession *s, SmbHeader *h, ulong andxfixupoffset, uchar cmd, ushort offset, SmbBuffer *b);
+int smbchaincommand(SmbSession *s, SmbHeader *h, uint32_t andxfixupoffset,
+		    uchar cmd, ushort offset, SmbBuffer *b);
 
 SmbService *smbservicefind(SmbSession *s, char *path, char *service, uchar *errclassp, ushort *errorp);
 void smbserviceput(SmbService *serv);
@@ -96,64 +101,67 @@ int smbrap2(SmbSession *s);
 
 void smbglobalsguess(int client);
 
-SmbBuffer *smbbuffernew(ulong maxlen);
+SmbBuffer *smbbuffernew(uint32_t maxlen);
 void smbbufferfree(SmbBuffer **bp);
-SmbBuffer *smbbufferinit(void *base, void *bdata, ulong blen);
-ulong smbbufferwriteoffset(SmbBuffer *s);
-ulong smbbufferwritemaxoffset(SmbBuffer *s);
-ulong smbbufferreadoffset(SmbBuffer *s);
+SmbBuffer *smbbufferinit(void *base, void *bdata, uint32_t blen);
+uint32_t smbbufferwriteoffset(SmbBuffer *s);
+uint32_t smbbufferwritemaxoffset(SmbBuffer *s);
+uint32_t smbbufferreadoffset(SmbBuffer *s);
 void *smbbufferwritepointer(SmbBuffer *s);
 void *smbbufferreadpointer(SmbBuffer *s);
 int smbbufferputheader(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p);
-int smbbufferputandxheader(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p, uchar andxcommand, ulong *andxoffsetfixup);
+int smbbufferputandxheader(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p, uchar andxcommand,
+			   uint32_t *andxoffsetfixup);
 int smbbufferputb(SmbBuffer *s, uchar b);
 int smbbufferputs(SmbBuffer *s, ushort s);
-int smbbufferputl(SmbBuffer *s, ulong l);
-int smbbufferoffsetputs(SmbBuffer *s, ulong offset, ushort s);
-int smbbufferputstring(SmbBuffer *b, SmbPeerInfo *p, ulong flags, char *string);
+int smbbufferputl(SmbBuffer *s, uint32_t l);
+int smbbufferoffsetputs(SmbBuffer *s, uint32_t offset, ushort s);
+int smbbufferputstring(SmbBuffer *b, SmbPeerInfo *p, uint32_t flags,
+		       char *string);
 int smbbufferpututstring(SmbBuffer *b, SmbPeerInfo *p, int mustalign, char *string);
 int smbbufferputucs2(SmbBuffer *b, int mustalign, char *string);
 int smbbufferputstr(SmbBuffer *s, char *string);
 int smbbufferputstrn(SmbBuffer *s, char *string, int len, int upcase);
 int smbbufferputerror(SmbBuffer *s, SmbHeader *h, SmbPeerInfo *p, uchar errclass, ushort error);
-int smbbufferskip(SmbBuffer *s, ulong amount);
-ulong smbbufferspace(SmbBuffer *s);
+int smbbufferskip(SmbBuffer *s, uint32_t amount);
+uint32_t smbbufferspace(SmbBuffer *s);
 void smbbufferreset(SmbBuffer *s);
-int smbbufferputbytes(SmbBuffer *s, void *data, ulong datalen);
-int smbbuffergetbytes(SmbBuffer *b, void *buf, ulong len);
-void smbbuffersetreadlen(SmbBuffer *b, ulong len);
-int smbbuffertrimreadlen(SmbBuffer *b, ulong len);
-ulong smbbufferwritespace(SmbBuffer *b);
+int smbbufferputbytes(SmbBuffer *s, void *data, uint32_t datalen);
+int smbbuffergetbytes(SmbBuffer *b, void *buf, uint32_t len);
+void smbbuffersetreadlen(SmbBuffer *b, uint32_t len);
+int smbbuffertrimreadlen(SmbBuffer *b, uint32_t len);
+uint32_t smbbufferwritespace(SmbBuffer *b);
 int smbbuffergets(SmbBuffer *b, ushort *sp);
-int smbbuffergetstr(SmbBuffer *b, ulong flags, char **sp);
+int smbbuffergetstr(SmbBuffer *b, uint32_t flags, char **sp);
 int smbbuffergetstrinline(SmbBuffer *b, char **sp);
 int smbbuffergetstrn(SmbBuffer *b, ushort size, char **sp);
-int smbbuffergetstring(SmbBuffer *b, SmbHeader *h, ulong flags, char **sp);
-int smbbuffergetucs2(SmbBuffer *b, ulong flags, char **sp);
-void *smbbufferpointer(SmbBuffer *b, ulong offset);
+int smbbuffergetstring(SmbBuffer *b, SmbHeader *h, uint32_t flags, char **sp);
+int smbbuffergetucs2(SmbBuffer *b, uint32_t flags, char **sp);
+void *smbbufferpointer(SmbBuffer *b, uint32_t offset);
 int smbbuffergetb(SmbBuffer *b, uchar *bp);
-int smbbuffergetl(SmbBuffer *b, ulong *lp);
+int smbbuffergetl(SmbBuffer *b, uint32_t *lp);
 int smbbuffergetv(SmbBuffer *b, vlong *vp);
-ulong smbbufferreadspace(SmbBuffer *b);
-void smbbufferwritelimit(SmbBuffer *b, ulong limit);
-int smbbufferreadskipto(SmbBuffer *b, ulong offset);
-int smbbufferpushreadlimit(SmbBuffer *b, ulong offset);
+uint32_t smbbufferreadspace(SmbBuffer *b);
+void smbbufferwritelimit(SmbBuffer *b, uint32_t limit);
+int smbbufferreadskipto(SmbBuffer *b, uint32_t offset);
+int smbbufferpushreadlimit(SmbBuffer *b, uint32_t offset);
 int smbbufferpopreadlimit(SmbBuffer *b);
 int smbbufferalignl2(SmbBuffer *b, int al2);
-int smbbufferwritebackup(SmbBuffer *b, ulong offset);
-int smbbufferreadbackup(SmbBuffer *b, ulong offset);
-int smbbufferfixuprelatives(SmbBuffer *b, ulong fixupoffset);
-int smbbufferfixuprelativel(SmbBuffer *b, ulong fixupoffset);
-int smbbufferfixuprelativeinclusivel(SmbBuffer *b, ulong fixupoffset);
-int smbbufferfixupabsolutes(SmbBuffer *b, ulong fixupoffset);
-int smbbufferfixupabsolutel(SmbBuffer *b, ulong fixupoffset);
-int smbbufferfixupl(SmbBuffer *b, ulong fixupoffset, ulong val);
+int smbbufferwritebackup(SmbBuffer *b, uint32_t offset);
+int smbbufferreadbackup(SmbBuffer *b, uint32_t offset);
+int smbbufferfixuprelatives(SmbBuffer *b, uint32_t fixupoffset);
+int smbbufferfixuprelativel(SmbBuffer *b, uint32_t fixupoffset);
+int smbbufferfixuprelativeinclusivel(SmbBuffer *b, uint32_t fixupoffset);
+int smbbufferfixupabsolutes(SmbBuffer *b, uint32_t fixupoffset);
+int smbbufferfixupabsolutel(SmbBuffer *b, uint32_t fixupoffset);
+int smbbufferfixupl(SmbBuffer *b, uint32_t fixupoffset, uint32_t val);
 int smbbufferputv(SmbBuffer *b, vlong v);
 int smbbufferputack(SmbBuffer *b, SmbHeader *h, SmbPeerInfo *p);
-int smbbufferfill(SmbBuffer *b, uchar c, ulong len);
-int smbbufferoffsetgetb(SmbBuffer *b, ulong offset, uchar *bp);
-int smbbuffercopy(SmbBuffer *to, SmbBuffer *from, ulong amount);
-int smbbufferoffsetcopystr(SmbBuffer *b, ulong offset, char *buf, int buflen, int *lenp);
+int smbbufferfill(SmbBuffer *b, uchar c, uint32_t len);
+int smbbufferoffsetgetb(SmbBuffer *b, uint32_t offset, uchar *bp);
+int smbbuffercopy(SmbBuffer *to, SmbBuffer *from, uint32_t amount);
+int smbbufferoffsetcopystr(SmbBuffer *b, uint32_t offset, char *buf,
+			   int buflen, int *lenp);
 
 SmbClient *smbconnect(char *to, char *share, char **errmsgp);
 void smbclientfree(SmbClient *s);
@@ -201,20 +209,21 @@ void smbsearchclosebyid(SmbSession *s, ushort sid);
 
 void smbseterror(SmbSession *s, uchar errclass, ushort error);
 
-void smbplan9time2datetime(ulong time, int tzoff, ushort *datep, ushort *timep);
-ulong smbdatetime2plan9time(ushort date, ushort time, int tzoff);
-vlong smbplan9time2time(ulong time);
-ulong smbplan9time2utime(ulong time, int tzoff);
-ulong smbutime2plan9time(ulong time, int tzoff);
-ulong smbtime2plan9time(vlong);
+void smbplan9time2datetime(uint32_t time, int tzoff, ushort *datep,
+			   ushort *timep);
+uint32_t smbdatetime2plan9time(ushort date, ushort time, int tzoff);
+vlong smbplan9time2time(uint32_t time);
+uint32_t smbplan9time2utime(uint32_t time, int tzoff);
+uint32_t smbutime2plan9time(uint32_t time, int tzoff);
+uint32_t smbtime2plan9time(vlong);
 void smbpathcanon(char *path);
 void smbpathsplit(char *path, char **dirp, char **namep);
 
-ushort smbplan9mode2dosattr(ulong mode);
-ulong smbdosattr2plan9wstatmode(ulong oldmode, ushort attr);
-ulong smbdosattr2plan9mode(ushort attr);
+ushort smbplan9mode2dosattr(uint32_t mode);
+uint32_t smbdosattr2plan9wstatmode(uint32_t oldmode, ushort attr);
+uint32_t smbdosattr2plan9mode(ushort attr);
 
-ulong smbplan9length2size32(vlong size);
+uint32_t smbplan9length2size32(vlong size);
 
 void smbfileclose(SmbSession *s, SmbFile *f);
 
@@ -235,7 +244,9 @@ vlong smbl2roundupvlong(vlong v, int l2);
 
 int smblistencifs(SMBCIFSACCEPTFN *accept);
 
-int smbnetserverenum2(SmbClient *c, ulong stype, char *domain, int *entriesp, SmbRapServerInfo1 **sip, char **errmsgp);
+int smbnetserverenum2(SmbClient *c, uint32_t stype, char *domain,
+		      int *entriesp, SmbRapServerInfo1 **sip,
+		      char **errmsgp);
 
 int smbbuffergetheader(SmbBuffer *b, SmbHeader *h, uchar **parametersp, ushort *bytecountp);
 int smbbuffergetandcheckheader(SmbBuffer *b, SmbHeader *h, uchar command, int response,
@@ -250,9 +261,9 @@ int smbmatch(char *name, Reprog *rep);
 Reprog *smbmkrep(char *pattern);
 
 int smbclientopen(SmbClient *c, ushort mode, char *name, uchar *errclassp, ushort *errorp, ushort *fid, ushort *attrp,
-ulong *mtimep, ulong *sizep, ushort *accessallowedp, char **errmsgp);
+uint32_t *mtimep, uint32_t *sizep, ushort *accessallowedp, char **errmsgp);
 
-Rune smbruneconvert(Rune r, ulong flags);
+Rune smbruneconvert(Rune r, uint32_t flags);
 
 int smbslut(SmbSlut *table, char *name);
 char *smbrevslut(SmbSlut *table, int val);
@@ -266,4 +277,6 @@ SmbProcessResult smbtruncatefile(SmbSession *s, SmbFile *f, vlong offset);
 #endif
 
 int smbremovefile(SmbTree *t, char *dir, char *name);
-int smbbrowsesendhostannouncement(char *name, ulong periodms, ulong type, char *comment, char **errmsgp);
+int smbbrowsesendhostannouncement(char *name, uint32_t periodms,
+				  uint32_t type, char *comment,
+				  char **errmsgp);

sys/src/cmd/auth/factotum/dat.h

@@ -78,7 +78,7 @@ struct Fsstate
 	struct {		/* pending or finished key confirmations */
 		Key *key;
 		int canuse;
-		ulong tag;
+		uint32_t tag;
 	} *conf;
 	int nconf;
 };
@@ -91,7 +91,7 @@ struct Key
 	Proto *proto;
 
 	void *priv;	/* protocol-specific; a parsed key, perhaps */
-	ulong successes;
+	uint32_t successes;
 };
 
 struct Keyinfo	/* for findkey */

sys/src/cmd/auth/secstore/SConn.h

@@ -40,5 +40,5 @@ void	writerr(SConn*, char*);
 int	readstr(SConn*, char*);
 
 void	*emalloc(ulong);		/* dies on failure; clears memory */
-void	*erealloc(void*, ulong);
+void	*erealloc(void*, uint32_t);
 char	*estrdup(char*);

sys/src/cmd/auth/secstore/secstore.h

@@ -22,7 +22,7 @@ enum {
 
 typedef struct PW {
 	char	*id;		/* user id */
-	ulong	expire;		/* expiration time (epoch seconds) */
+	uint32_t	expire;		/* expiration time (epoch seconds) */
 	ushort	status;		/* Enabled, STA, ... */
 	ushort	failed;		/* number of failed login attempts */
 	char	*other;		/* other information, e.g. sponsor */

sys/src/cmd/aux/flashfs/aux.h

@@ -7,8 +7,8 @@
  * in the LICENSE file.
  */
 
-void*	emalloc9p(ulong sz);
-void*	erealloc9p(void *v, ulong sz);
+void*	emalloc9p(uint32_t sz);
+void*	erealloc9p(void *v, uint32_t sz);
 char*	estrdup9p(char *s);
 
 #define DMDIR CHDIR

sys/src/cmd/aux/flashfs/flashfs.h

@@ -73,9 +73,9 @@ typedef struct	Renum	Renum;
 struct Extent
 {
 	int	sect;
-	ulong	addr;
-	ulong	off;
-	ulong	size;
+	uint32_t	addr;
+	uint32_t	off;
+	uint32_t	size;
 	Extent*	next;
 	Extent*	prev;
 };
@@ -90,11 +90,11 @@ struct Entry
 {
 	int	ref;
 	char*	name;
-	ulong	fnum;
-	ulong	mode;
-	ulong	mnum;
-	ulong	mtime;
-	ulong	size;
+	uint32_t	fnum;
+	uint32_t	mode;
+	uint32_t	mnum;
+	uint32_t	mtime;
+	uint32_t	size;
 
 	union
 	{
@@ -123,21 +123,21 @@ struct Dirr
 	Entry*	cur;
 	Dirr*	next;
 	Dirr*	prev;
-	ulong	offset;
+	uint32_t	offset;
 };
 
 struct Jrec
 {
 	int	type;
-	ulong	mode;
-	ulong	fnum;
-	ulong	mnum;
-	ulong	tnum;
-	ulong	mtime;
-	ulong	parent;
-	ulong	size;
-	ulong	offset;
-	ulong	seq;
+	uint32_t	mode;
+	uint32_t	fnum;
+	uint32_t	mnum;
+	uint32_t	tnum;
+	uint32_t	mtime;
+	uint32_t	parent;
+	uint32_t	size;
+	uint32_t	offset;
+	uint32_t	seq;
 	char	name[MAXNSIZE+2];
 };
 
@@ -149,12 +149,12 @@ struct Renum
 
 extern	void	initdata(char*, int);
 extern	void	clearsect(int);
-extern	void	readdata(int, void*, ulong, ulong);
-extern	int	writedata(int, int, void*, ulong, ulong);
-extern	int	getc3(uchar*, ulong*);
-extern	int	putc3(uchar*, ulong);
-extern	ulong	get4(uchar*);
-extern	void	put4(uchar*, ulong);
+extern	void	readdata(int, void*, uint32_t, uint32_t);
+extern	int	writedata(int, int, void*, uint32_t, uint32_t);
+extern	int	getc3(uchar*, uint32_t*);
+extern	int	putc3(uchar*, uint32_t);
+extern	uint32_t	get4(uchar*);
+extern	void	put4(uchar*, uint32_t);
 extern	int	convM2J(Jrec*, uchar*);
 extern	int	convJ2M(Jrec*, uchar*);
 extern	void	loadfs(int);
@@ -162,23 +162,24 @@ extern	char*	need(int bytes);
 extern	void	put(Jrec*, int);
 extern	void	putw(Jrec*, int, Extent *x, void*);
 extern	int	Jconv(Fmt*);
-extern	ulong	now(void);
+extern	uint32_t	now(void);
 extern	void	serve(char*);
 
 #pragma	varargck	type	"J"	Jrec*
 
 extern	void	einit(void);
 extern	void	edump(void);
-extern	Entry*	elookup(ulong);
-extern	Extent*	esum(Entry*, int, ulong, int*);
+extern	Entry*	elookup(uint32_t);
+extern	Extent*	esum(Entry*, int, uint32_t, int*);
 extern	void	edestroy(Entry*);
-extern	Entry*	ecreate(Entry*, char*, ulong, ulong, ulong, char**);
+extern	Entry*	ecreate(Entry*, char*, uint32_t, uint32_t,
+				    uint32_t, char**);
 extern	char*	eremove(Entry*);
 extern	Entry*	ewalk(Entry*, char*, char**);
-extern	void	etrunc(Entry*, ulong, ulong);
-extern	ulong	echmod(Entry*, ulong, ulong);
-extern	ulong	eread(Entry*, int, void*, ulong, ulong);
-extern	void	ewrite(Entry*, Extent *, int, ulong);
+extern	void	etrunc(Entry*, uint32_t, uint32_t);
+extern	uint32_t	echmod(Entry*, uint32_t, uint32_t);
+extern	uint32_t	eread(Entry*, int, void*, uint32_t, uint32_t);
+extern	void	ewrite(Entry*, Extent *, int, uint32_t);
 extern	Qid	eqid(Entry*);
 extern	void	estat(Entry*, Dir*, int);
 extern	Dirr*	ediropen(Entry*);
@@ -194,14 +195,14 @@ extern	char	Enotdir[];
 extern	char	Eperm[];
 extern	char	Erofs[];
 
-extern	ulong	sectsize;
-extern	ulong	nsects;
+extern	uint32_t	sectsize;
+extern	uint32_t	nsects;
 extern	uchar*	sectbuff;
 extern	Entry	*root;
 extern	int	readonly;
-extern	ulong	delta;
+extern	uint32_t	delta;
 extern	int	eparity;
 extern	uchar	magic[];
-extern	ulong	used;
-extern	ulong	limit;
-extern	ulong	maxwrite;
+extern	uint32_t	used;
+extern	uint32_t	limit;
+extern	uint32_t	maxwrite;

sys/src/cmd/aux/vga/pci.h

@@ -101,7 +101,7 @@ typedef struct Pcidev {
 	uchar	rid;			/* revision ID */
 
 	struct {
-		ulong	bar;		/* base address */
+		uint32_t	bar;		/* base address */
 		int	size;
 	} mem[6];
 

sys/src/cmd/aux/vga/vga.h

@@ -60,7 +60,7 @@ typedef struct Ctlr {
 	void	(*dump)(Vga*, Ctlr*);
 	char*	type;
 
-	ulong	flag;
+	uint32_t	flag;
 
 	Ctlr*	link;
 } Ctlr;
@@ -124,7 +124,7 @@ typedef struct Mode {
 	int		vbs;		/* optional Vertical Blank Start */
 	int		vbe;		/* optional Vertical Blank End */
 	
-	ulong	videobw;
+	uint32_t	videobw;
 
 	char	hsync;
 	char	vsync;
@@ -166,21 +166,21 @@ typedef struct Vga {
 	uchar	pstatus;
 	uchar	palette[Pcolours][3];
 
-	ulong	f[2];			/* clock */
-	ulong	d[2];
-	ulong	i[2];
-	ulong	m[2];
-	ulong	n[2];
-	ulong	p[2];
-	ulong	q[2];
-	ulong	r[2];
+	uint32_t	f[2];			/* clock */
+	uint32_t	d[2];
+	uint32_t	i[2];
+	uint32_t	m[2];
+	uint32_t	n[2];
+	uint32_t	p[2];
+	uint32_t	q[2];
+	uint32_t	r[2];
 
-	ulong	vma;			/* video memory linear-address alignment */
-	ulong	vmb;			/* video memory linear-address base */
-	ulong	apz;			/* aperture size */
-	ulong	vmz;			/* video memory size */
+	uint32_t	vma;			/* video memory linear-address alignment */
+	uint32_t	vmb;			/* video memory linear-address base */
+	uint32_t	apz;			/* aperture size */
+	uint32_t	vmz;			/* video memory size */
 
-	ulong	membw;			/* memory bandwidth, MB/s */
+	uint32_t	membw;			/* memory bandwidth, MB/s */
 
 	long	offset;			/* BIOS string offset */
 	char*	bios;			/* matching BIOS string */
@@ -188,8 +188,8 @@ typedef struct Vga {
 
 	Mode*	mode;
 
-	ulong	virtx;			/* resolution of virtual screen */
-	ulong	virty;
+	uint32_t	virtx;			/* resolution of virtual screen */
+	uint32_t	virty;
 
 	int	panning;		/* pan the virtual screen */
 
@@ -298,17 +298,17 @@ extern uchar inportb(long);
 extern void outportb(long, uchar);
 extern ushort inportw(long);
 extern void outportw(long, ushort);
-extern ulong inportl(long);
-extern void outportl(long, ulong);
+extern uint32_t inportl(long);
+extern void outportl(long, uint32_t);
 extern char* vgactlr(char*, char*);
 extern void vgactlw(char*, char*);
 extern char* readbios(long, long);
 extern void dumpbios(long);
 extern void error(char*, ...);
-extern void* alloc(ulong);
+extern void* alloc(uint32_t);
 extern void printitem(char*, char*);
-extern void printreg(ulong);
-extern void printflag(ulong);
+extern void printreg(uint32_t);
+extern void printflag(uint32_t);
 extern void setpalette(int, int, int, int);
 extern int curprintindex;
 
@@ -324,7 +324,7 @@ extern Ctlr mach64xxhwgc;
 
 /* main.c */
 extern char* chanstr[];
-extern void resyncinit(Vga*, Ctlr*, ulong, ulong);
+extern void resyncinit(Vga*, Ctlr*, uint32_t, uint32_t);
 extern void sequencer(Vga*, int);
 extern void main(int, char*[]);
 Biobuf stdout;

sys/src/cmd/cc/cc.h

@@ -45,10 +45,10 @@ typedef	Rune	TRune;	/* target system type */
 #define	MASK(n)		(SIGN(n)|(SIGN(n)-1))
 
 #define	BITS	5
-#define	NVAR	(BITS*sizeof(ulong)*8)
+#define	NVAR	(BITS*sizeof(uint32_t)*8)
 struct	Bits
 {
-	ulong	b[BITS];
+	uint32_t	b[BITS];
 };
 
 struct	Node
@@ -146,7 +146,7 @@ struct	Type
 struct	Init			/* general purpose initialization */
 {
 	int	code;
-	ulong	value;
+	uint32_t	value;
 	char*	s;
 };
 
@@ -528,10 +528,10 @@ EXTERN	char*	typeswitch;
 EXTERN	char*	typeword;
 EXTERN	char*	typecmplx;
 
-extern	ulong	thash1;
-extern	ulong	thash2;
-extern	ulong	thash3;
-extern	ulong	thash[];
+extern	uint32_t	thash1;
+extern	uint32_t	thash2;
+extern	uint32_t	thash3;
+extern	uint32_t	thash[];
 
 /*
  *	compat.c/unix.c/windows.c
@@ -546,7 +546,7 @@ int	myexec(char*, char*[]);
 int	mydup(int, int);
 int	myfork(void);
 int	mypipe(int*);
-void*	mysbrk(ulong);
+void*	mysbrk(uint32_t);
 
 /*
  *	parser
@@ -630,8 +630,8 @@ Node*	revertdcl(void);
 long	round(long, int);
 int	rsametype(Type*, Type*, int, int);
 int	sametype(Type*, Type*);
-ulong	sign(Sym*);
-ulong	signature(Type*);
+uint32_t	sign(Sym*);
+uint32_t	signature(Type*);
 void	sualign(Type*);
 void	tmerge(Type*, Sym*);
 void	walkparam(Node*, int);
@@ -705,7 +705,7 @@ int	side(Node*);
 int	vconst(Node*);
 int	log2(uvlong);
 int	vlog(Node*);
-int	topbit(ulong);
+int	topbit(uint32_t);
 void	simplifyshift(Node*);
 long	typebitor(long, long);
 void	diag(Node*, char*, ...);

sys/src/cmd/cdfs/dat.h

@@ -170,8 +170,8 @@ struct Track
 	/* initialized while obtaining the toc (gettoc) */
 	vlong	size;		/* total size in bytes */
 	long	bs;		/* block size in bytes */
-	ulong	beg;		/* beginning block number */
-	ulong	end;		/* ending block number */
+	uint32_t	beg;		/* beginning block number */
+	uint32_t	end;		/* ending block number */
 	int	type;
 	Msf	mbeg;
 	Msf	mend;
@@ -179,7 +179,7 @@ struct Track
 	/* initialized by fs */
 	char	name[32];
 	int	mode;
-	ulong	mtime;
+	uint32_t	mtime;
 };
 
 struct DTrack			/* not used */
@@ -265,7 +265,7 @@ struct Buf
 	long	ndata;		/* no. valid bytes in data */
 	int	nblock;		/* total buffer size in blocks */
 	int	omode;		/* OREAD, OWRITE */
-	long	(*fn)(Buf*, void*, long, ulong); /* read, write */
+	long	(*fn)(Buf*, void*, long, uint32_t); /* read, write */
 
 	/* used only by client */
 	Otrack	*otrack;

sys/src/cmd/cdfs/fns.h

@@ -7,13 +7,13 @@
  * in the LICENSE file.
  */
 
-Buf*	bopen(long (*)(Buf*, void*, long, ulong), int, int, int);
+Buf*	bopen(long (*)(Buf*, void*, long, uint32_t), int, int, int);
 long	bread(Buf*, void*, long, vlong);
 void	bterm(Buf*);
 long	bufread(Otrack*, void*, long, vlong);
 long	bufwrite(Otrack*, void*, long);
 long	bwrite(Buf*, void*, long);
 char*	disctype(Drive *drive);
-void	*emalloc(ulong);
+void	*emalloc(uint32_t);
 char*	geterrstr(void);
 Drive*	mmcprobe(Scsi*);

sys/src/cmd/cfs/bcache.h

@@ -42,13 +42,13 @@ struct Bcache
 };
 
 int	bcinit(Bcache*, int, int);
-Bbuf*	bcalloc(Bcache*, ulong);
-Bbuf*	bcread(Bcache*, ulong);
+Bbuf*	bcalloc(Bcache*, uint32_t);
+Bbuf*	bcread(Bcache*, uint32_t);
 void	bcmark(Bcache*, Bbuf*);
 int	bcwrite(Bcache*, Bbuf*);
 int	bcsync(Bcache*);
-int	bread(Bcache*, ulong, void*);
-int	bwrite(Bcache*, ulong, void*);
+int	bread(Bcache*, uint32_t, void*);
+int	bwrite(Bcache*, uint32_t, void*);
 int	bref(Bcache*, Bbuf*);
 void	error(char*, ...);
 void	warning(char*);

sys/src/cmd/cfs/cformat.h

@@ -23,7 +23,7 @@ enum
 {
 	Amagic= 	0xbebeefed,	/* allocation block magic */
 	Imagic=		0xbadc00ce,	/* inode block magic */
-	BtoUL=		8*sizeof(ulong),/* bits in a ulong */
+	BtoUL=		8*sizeof(uint32_t),/* bits in a ulong */
 	CACHENAMELEN=	128
 };
 #define	Indbno		0x80000000	/* indirect block */
@@ -36,15 +36,15 @@ enum
  */
 struct Dahdr
 {
-	ulong	magic;
-	ulong	bsize;		/* logical block size */
+	uint32_t	magic;
+	uint32_t	bsize;		/* logical block size */
 	char	name[CACHENAMELEN];
 	short	nab;		/* number of allocation blocks */
 };
 struct Dalloc
 {
 	Dahdr;
-	ulong	bits[1];
+	uint32_t	bits[1];
 };
 
 /*
@@ -52,8 +52,8 @@ struct Dalloc
  */
 struct Dptr
 {
-	ulong	fbno;		/* file block number */
-	ulong	bno;		/* disk block number */
+	uint32_t	fbno;		/* file block number */
+	uint32_t	bno;		/* disk block number */
 	ushort	start;		/* offset into block of valid data */
 	ushort	end;		/* offset into block after valid data */
 };
@@ -74,8 +74,8 @@ struct Inode
  */
 struct Dihdr
 {
-	ulong	magic;
-	ulong	nino;		/* number of inodes */
+	uint32_t	magic;
+	uint32_t	nino;		/* number of inodes */
 };
 struct Dinode
 {

sys/src/cmd/cfs/disk.h

@@ -23,9 +23,9 @@ struct Disk
 };
 
 int	dinit(Disk*, int, int, char*);
-int	dformat(Disk*, int, char*, ulong, ulong);
-ulong	dalloc(Disk*, Dptr*);
-ulong	dpalloc(Disk*, Dptr*);
+int	dformat(Disk*, int, char*, uint32_t, uint32_t);
+uint32_t	dalloc(Disk*, Dptr*);
+uint32_t	dpalloc(Disk*, Dptr*);
 int	dfree(Disk*, Dptr*);
 
 extern int debug;

sys/src/cmd/cfs/file.h

@@ -8,7 +8,7 @@
  */
 
 void	fmerge(Dptr*, char*, char*, int, int);
-int	fbwrite(Icache*, Ibuf*, char*, ulong, int);
-long	fwrite(Icache*, Ibuf*, char*, ulong, long);
-Dptr*	fpget(Icache*, Ibuf*, ulong);
-long	fread(Icache*, Ibuf*, char*, ulong, long);
+int	fbwrite(Icache*, Ibuf*, char*, uint32_t, int);
+long	fwrite(Icache*, Ibuf*, char*, uint32_t, long);
+Dptr*	fpget(Icache*, Ibuf*, uint32_t);
+long	fread(Icache*, Ibuf*, char*, uint32_t, long);

sys/src/cmd/cfs/inode.h

@@ -57,13 +57,13 @@ struct Icache
 	Lru	mlru;
 };
 
-Ibuf*	ialloc(Icache*, ulong);
+Ibuf*	ialloc(Icache*, uint32_t);
 Ibuf*	iget(Icache*, Qid);
-Ibuf*	iread(Icache*, ulong);
-int	iformat(Icache*, int, ulong, char*, int, int);
+Ibuf*	iread(Icache*, uint32_t);
+int	iformat(Icache*, int, uint32_t, char*, int, int);
 int	iinit(Icache*, int, int, char*);
-int	iremove(Icache*, ulong);
-int	iupdate(Icache*, ulong, Qid);
+int	iremove(Icache*, uint32_t);
+int	iupdate(Icache*, uint32_t, Qid);
 int	iwrite(Icache*, Ibuf*);
 void	ifree(Icache*, Ibuf*);
 void	iinc(Icache*, Ibuf*);

sys/src/cmd/cfs/stats.h

@@ -8,7 +8,7 @@
  */
 
 struct Cfsmsg {
-	ulong	n;			/* number of messages (of some type) */
+	uint32_t	n;			/* number of messages (of some type) */
 	vlong	t;			/* time spent in these messages */
 	vlong	s;			/* start time of last call */
 };
@@ -17,11 +17,11 @@ struct Cfsstat {
 	struct Cfsmsg cm[128];		/* client messages */
 	struct Cfsmsg sm[128];		/* server messages */
 
-	ulong ndirread;			/* # of directory read ops */
-	ulong ndelegateread;		/* # of read ops delegated */
-	ulong ninsert;			/* # of cache insert ops */
-	ulong ndelete;			/* # of cache delete ops */
-	ulong nupdate;			/* # of cache update ops */
+	uint32_t ndirread;			/* # of directory read ops */
+	uint32_t ndelegateread;		/* # of read ops delegated */
+	uint32_t ninsert;			/* # of cache insert ops */
+	uint32_t ndelete;			/* # of cache delete ops */
+	uint32_t nupdate;			/* # of cache update ops */
 
 	uvlong bytesread;		/* # of bytes read by client */
 	uvlong byteswritten;		/* # of bytes written by client */

sys/src/cmd/cwfs/9netics32.16k/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/9netics64.8k/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/all.h

@@ -87,12 +87,12 @@ struct Fspar {
 	long	declared;
 } fspar[];
 
-ulong	roflag;
-ulong	errorflag;
-ulong	chatflag;
-ulong	attachflag;
-ulong	authdebugflag;
-ulong	authdisableflag;
+uint32_t	roflag;
+uint32_t	errorflag;
+uint32_t	chatflag;
+uint32_t	attachflag;
+uint32_t	authdebugflag;
+uint32_t	authdisableflag;
 int	noattach;
 int	wstatallow;		/* set to circumvent wstat permissions */
 int	writeallow;		/* set to circumvent write permissions */

sys/src/cmd/cwfs/choline/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/cwfs/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/emelie/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/fs/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/fs64/dat.h

@@ -32,8 +32,8 @@ enum { FIXEDSIZE = 1 };
 enum { MAXBANK = 2 };
 
 typedef struct Mbank {
-	ulong	base;
-	ulong	limit;
+	uint32_t	base;
+	uint32_t	limit;
 } Mbank;
 
 typedef struct Mconf {

sys/src/cmd/cwfs/portdat.h

@@ -100,7 +100,7 @@ struct	Tag
 struct	Qid9p1
 {
 	Off	path;			/* was long */
-	ulong	version;		/* should be Off */
+	uint32_t	version;		/* should be Off */
 };
 
 /* DONT TOUCH, this is the disk structure */
@@ -264,7 +264,7 @@ struct	Chan
 	char	whochan[50];
 	char	whoname[NAMELEN];
 	void	(*whoprint)(Chan*);
-	ulong	flags;
+	uint32_t	flags;
 	int	chan;			/* overall channel #, mostly for printing */
 	int	nmsgs;			/* outstanding messages, set under flock -- for flush */
 
@@ -317,7 +317,7 @@ struct	Tlock
 
 struct	Cons
 {
-	ulong	flags;		/* overall flags for all channels */
+	uint32_t	flags;		/* overall flags for all channels */
 	QLock;			/* generic qlock for mutex */
 	int	uid;		/* botch -- used to get uid on cons_create */
 	int	gid;		/* botch -- used to get gid on cons_create */
@@ -330,9 +330,9 @@ struct	Cons
 
 	int	profile;	/* are we profiling? */
 	long*	profbuf;
-	ulong	minpc;
-	ulong	maxpc;
-	ulong	nprofbuf;
+	uint32_t	minpc;
+	uint32_t	maxpc;
+	uint32_t	nprofbuf;
 
 	long	nlarge;		/* number of large message buffers */
 	long	nsmall;		/* ... small ... */
@@ -365,7 +365,7 @@ struct	File
 	Off	addr;
 	long	slot;		/* ordinal # of Dentry with a directory block */
 	Off	lastra;		/* read ahead address */
-	ulong	fid;
+	uint32_t	fid;
 	Userid	uid;
 	Auth	*auth;
 	char	open;
@@ -374,7 +374,7 @@ struct	File
 		#define	FREMOV	4
 
 	Off	doffset;	/* directory reading */
-	ulong	dvers;
+	uint32_t	dvers;
 	long	dslot;
 };
 
@@ -423,27 +423,27 @@ struct	Superb
 
 struct	Conf
 {
-	ulong	nmach;		/* processors */
-	ulong	mem;		/* total physical bytes of memory */
-	ulong	nuid;		/* distinct uids */
-	ulong	nserve;		/* server processes */
-	ulong	nfile;		/* number of fid -- system wide */
-	ulong	nwpath;		/* number of active paths, derived from nfile */
-	ulong	gidspace;	/* space for gid names -- derived from nuid */
+	uint32_t	nmach;		/* processors */
+	uint32_t	mem;		/* total physical bytes of memory */
+	uint32_t	nuid;		/* distinct uids */
+	uint32_t	nserve;		/* server processes */
+	uint32_t	nfile;		/* number of fid -- system wide */
+	uint32_t	nwpath;		/* number of active paths, derived from nfile */
+	uint32_t	gidspace;	/* space for gid names -- derived from nuid */
 
-	ulong	nlgmsg;		/* number of large message buffers */
-	ulong	nsmmsg;		/* number of small message buffers */
+	uint32_t	nlgmsg;		/* number of large message buffers */
+	uint32_t	nsmmsg;		/* number of small message buffers */
 
 	Off	recovcw;	/* recover addresses */
 	Off	recovro;
 	Off	firstsb;
 	Off	recovsb;
 
-	ulong	configfirst;	/* configure before starting normal operation */
+	uint32_t	configfirst;	/* configure before starting normal operation */
 	char	*confdev;
 	char	*devmap;	/* name of config->file device mapping file */
 
-	ulong	nauth;		/* number of Auth structs */
+	uint32_t	nauth;		/* number of Auth structs */
 	uchar	nodump;		/* no periodic dumps */
 	uchar	dumpreread;	/* read and compare in dump copy */
 };
@@ -458,7 +458,7 @@ enum {
  */
 struct	Msgbuf
 {
-	ulong	magic;
+	uint32_t	magic;
 	short	count;
 	short	flags;
 		#define	LARGE	(1<<0)
@@ -508,7 +508,7 @@ struct	Flag
 {
 	char*	arg0;
 	char*	help;
-	ulong	flag;
+	uint32_t	flag;
 };
 
 struct	Rtc

sys/src/cmd/cwfs/portfns.h

@@ -91,7 +91,7 @@ void	netinit(void);
 void	netstart(void);
 void	exit(void);
 void	fileinit(Chan*);
-File*	filep(Chan*, ulong, int);
+File*	filep(Chan*, uint32_t, int);
 void	firmware(void);
 int	fname(char*);
 int	fpair(char*, char*);
@@ -114,7 +114,7 @@ Chan*	getlcp(uchar*, long);
 Off	getraddr(Device*);
 void	hexdump(void*, int);
 int	iaccess(File*, Dentry*, int);
-void*	ialloc(ulong, int);
+void*	ialloc(uint32_t, int);
 Off	ibbpow(int);
 Off	ibbpowsum(int);
 Device*	iconfig(char *);
@@ -144,7 +144,7 @@ void	machinit(void);
 Msgbuf*	mballoc(int, Chan*, int);
 void	mbinit(void);
 void	mbfree(Msgbuf*);
-ulong	meminit(void);
+uint32_t	meminit(void);
 Iobuf*	movebuf(Iobuf*);
 void	mcatinit(Device*);
 int	mcatread(Device*, Off, void*);
@@ -251,4 +251,4 @@ Devsize	wrensize(Device*);
 int	wrenwrite(Device*, Off, void*);
 void	cmd_exec(char*);
 void	cmd_install(char*, char*, void (*)(int, char*[]));
-ulong	flag_install(char*, char*);
+uint32_t	flag_install(char*, char*);

sys/src/cmd/db/defs.h

@@ -19,7 +19,7 @@
 
 #include <mach.h>
 
-typedef ulong WORD;
+typedef uint32_t WORD;
 typedef uvlong ADDR;
 
 #define	HUGEINT	0x7fffffff	/* enormous WORD */

sys/src/cmd/disk/9660/iso9660.h

@@ -35,13 +35,13 @@ struct XDir {
 	char	*uid;
 	char	*gid;
 	char	*symlink;
-	ulong   uidno;   /* Numeric uid */
-	ulong   gidno;   /* Numeric gid */
+	uint32_t   uidno;   /* Numeric uid */
+	uint32_t   gidno;   /* Numeric gid */
 
-	ulong	mode;
-	ulong	atime;
-	ulong	mtime;
-	ulong   ctime;
+	uint32_t	mode;
+	uint32_t	atime;
+	uint32_t	mtime;
+	uint32_t   ctime;
 
         vlong   length;
 };
@@ -55,20 +55,20 @@ struct Direc {
 	char *confname;	/* conformant name */
 	char *srcfile;	/* file to copy onto the image */
 
-	ulong block;
-	ulong length;
+	uint32_t block;
+	uint32_t length;
 	int flags;
 
 	char *uid;
 	char *gid;
 	char *symlink;
-	ulong mode;
+	uint32_t mode;
 	long atime;
 	long ctime;
 	long mtime;
 
-	ulong uidno;
-	ulong gidno;
+	uint32_t uidno;
+	uint32_t gidno;
 
 	Direc *child;
 	int nchild;
@@ -93,9 +93,9 @@ struct Voldesc {
 	char *notice;
 
 	/* path table */
-	ulong pathsize;
-	ulong lpathloc;
-	ulong mpathloc;
+	uint32_t pathsize;
+	uint32_t lpathloc;
+	uint32_t mpathloc;
 
 	/* root of file tree */
 	Direc root;	
@@ -112,16 +112,16 @@ struct Voldesc {
 struct Cdimg {
 	char *file;
 	int fd;
-	ulong dumpblock;
-	ulong nextblock;
-	ulong iso9660pvd;
-	ulong jolietsvd;
-	ulong pathblock;
+	uint32_t dumpblock;
+	uint32_t nextblock;
+	uint32_t iso9660pvd;
+	uint32_t jolietsvd;
+	uint32_t pathblock;
 	uvlong rrcontin;	/* rock ridge continuation offset */
-	ulong nulldump;		/* next dump block */
-	ulong nconform;		/* number of conform entries written already */
+	uint32_t nulldump;		/* next dump block */
+	uint32_t nconform;		/* number of conform entries written already */
 	uvlong bootcatptr;
-	ulong bootcatblock;
+	uint32_t bootcatblock;
 	uvlong bootimageptr;
 	Direc *loaderdirec;
 	Direc *bootdirec;
@@ -189,8 +189,8 @@ struct Dump {
 struct Dumpdir {
 	char *name;
 	uchar md5[MD5dlen];
-	ulong block;
-	ulong length;
+	uint32_t block;
+	uint32_t length;
 	Dumpdir *md5left;
 	Dumpdir *md5right;
 	Dumpdir *blockleft;
@@ -310,13 +310,13 @@ void findloader(Cdimg*, Direc*);
 /* cdrdwr.c */
 Cdimg *createcd(char*, Cdinfo);
 Cdimg *opencd(char*, Cdinfo);
-void Creadblock(Cdimg*, void*, ulong, ulong);
-ulong big(void*, int);
-ulong little(void*, int);
+void Creadblock(Cdimg*, void*, uint32_t, uint32_t);
+uint32_t big(void*, int);
+uint32_t little(void*, int);
 int parsedir(Cdimg*, Direc*, uchar*, int, char *(*)(uchar*, int));
-void setroot(Cdimg*, ulong, ulong, ulong);
-void setvolsize(Cdimg*, uvlong, ulong);
-void setpathtable(Cdimg*, ulong, ulong, ulong, ulong);
+void setroot(Cdimg*, uint32_t, uint32_t, uint32_t);
+void setvolsize(Cdimg*, uvlong, uint32_t);
+void setpathtable(Cdimg*, uint32_t, uint32_t, uint32_t, uint32_t);
 void Cputc(Cdimg*, int);
 void Cputnl(Cdimg*, uvlong, int);
 void Cputnm(Cdimg*, uvlong, int);
@@ -329,8 +329,8 @@ void Crepeatr(Cdimg*, Rune, int);
 void Cputrs(Cdimg*, Rune*, int);
 void Cputrscvt(Cdimg*, char*, int);
 void Cpadblock(Cdimg*);
-void Cputdate(Cdimg*, ulong);
-void Cputdate1(Cdimg*, ulong);
+void Cputdate(Cdimg*, uint32_t);
+void Cputdate1(Cdimg*, uint32_t);
 void Cread(Cdimg*, void*, int);
 void Cwflush(Cdimg*);
 void Cwseek(Cdimg*, vlong);
@@ -344,7 +344,7 @@ int Clinelen(Cdimg*);
 /* conform.c */
 void rdconform(Cdimg*);
 char *conform(char*, int);
-void wrconform(Cdimg*, int, ulong*, uvlong*);
+void wrconform(Cdimg*, int, uint32_t*, uvlong*);
 
 /* direc.c */
 void mkdirec(Direc*, XDir*);
@@ -357,14 +357,14 @@ void dsort(Direc*, int (*)(const void*, const void*));
 void setparents(Direc*);
 
 /* dump.c */
-ulong Cputdumpblock(Cdimg*);
+uint32_t Cputdumpblock(Cdimg*);
 int hasdump(Cdimg*);
 Dump *dumpcd(Cdimg*, Direc*);
 Dumpdir *lookupmd5(Dump*, uchar*);
-void insertmd5(Dump*, char*, uchar*, ulong, ulong);
+void insertmd5(Dump*, char*, uchar*, uint32_t, uint32_t);
 
 Direc readdumpdirs(Cdimg*, XDir*, char*(*)(uchar*,int));
-char *adddumpdir(Direc*, ulong, XDir*);
+char *adddumpdir(Direc*, uint32_t, XDir*);
 void copybutname(Direc*, Direc*);
 
 void readkids(Cdimg*, Direc*, char*(*)(uchar*,int));
@@ -390,15 +390,15 @@ void Cputjolietsvd(Cdimg*, Cdinfo);
 void writepathtables(Cdimg*);
 
 /* util.c */
-void *emalloc(ulong);
-void *erealloc(void*, ulong);
+void *emalloc(uint32_t);
+void *erealloc(void*, uint32_t);
 char *atom(char*);
 char *struprcpy(char*, char*);
 int chat(char*, ...);
 
 /* unix.c, plan9.c */
 void dirtoxdir(XDir*, Dir*);
-void fdtruncate(int, ulong);
+void fdtruncate(int, uint32_t);
 long uidno(char*);
 long gidno(char*);
 
@@ -429,7 +429,7 @@ enum {
 	DTrootdot,
 };
 
-extern ulong now;
+extern uint32_t now;
 extern Conform *map;
 extern int chatty;
 extern int docolon;

sys/src/cmd/disk/kfs/dat.h

@@ -70,14 +70,14 @@ struct	Cons
 
 struct	Conf
 {
-	ulong	niobuf;		/* number of iobufs to allocate */
-	ulong	nuid;		/* distinct uids */
-	ulong	uidspace;	/* space for uid names -- derrived from nuid */
-	ulong	gidspace;	/* space for gid names -- derrived from nuid */
-	ulong	nserve;		/* server processes */
-	ulong	nfile;		/* number of fid -- system wide */
-	ulong	nwpath;		/* number of active paths, derrived from nfile */
-	ulong	bootsize;	/* number of bytes reserved for booting */
+	uint32_t	niobuf;		/* number of iobufs to allocate */
+	uint32_t	nuid;		/* distinct uids */
+	uint32_t	uidspace;	/* space for uid names -- derrived from nuid */
+	uint32_t	gidspace;	/* space for gid names -- derrived from nuid */
+	uint32_t	nserve;		/* server processes */
+	uint32_t	nfile;		/* number of fid -- system wide */
+	uint32_t	nwpath;		/* number of active paths, derrived from nfile */
+	uint32_t	bootsize;	/* number of bytes reserved for booting */
 };
 
 struct	Command

sys/src/cmd/disk/kfs/portdat.h

@@ -28,7 +28,7 @@ typedef	struct	File	File;
 typedef	struct	Filsys	Filsys;
 typedef	struct	Filta	Filta;
 typedef	struct	Filter	Filter;
-typedef		ulong	Float;
+typedef		uint32_t	Float;
 typedef	struct	Hiob	Hiob;
 typedef	struct	Iobuf	Iobuf;
 typedef	struct	P9call	P9call;
@@ -124,8 +124,8 @@ struct	Device
  */
 struct	Filter
 {
-	ulong	count;			/* count and old count kept separate */
-	ulong	oldcount;		/* so interrput can read them */
+	uint32_t	count;			/* count and old count kept separate */
+	uint32_t	oldcount;		/* so interrput can read them */
 	Float	filter[3];		/* filters for 1m 10m 100m */ 
 };
 

sys/src/cmd/disk/kfs/portfns.h

@@ -45,7 +45,7 @@ void	dtrunc(Iobuf*, Dentry*);
 void	exit(void);
 Float	famd(Float, int, int, int);
 int	fchar(void);
-ulong	fdf(Float, int);
+uint32_t	fdf(Float, int);
 void	fileinit(Chan*);
 void	sublockinit(void);
 File*	filep(Chan*, int, int);

sys/src/cmd/dossrv/dat.h

@@ -185,14 +185,14 @@ enum
 #define PLONG(p,v)	((p)[0]=(v),(p)[1]=(v)>>8,(p)[2]=(v)>>16,(p)[3]=(v)>>24)
 
 struct Dosptr{
-	ulong	addr;		/* sector & entry within of file's directory entry */
-	ulong	offset;
-	ulong	paddr;		/* of parent's directory entry */
-	ulong	poffset;
-	ulong	iclust;		/* ordinal within file */
-	ulong	clust;
-	ulong	naddr;		/* next block in directory (for writing multi entry elements) */
-	ulong	prevaddr;
+	uint32_t	addr;		/* sector & entry within of file's directory entry */
+	uint32_t	offset;
+	uint32_t	paddr;		/* of parent's directory entry */
+	uint32_t	poffset;
+	uint32_t	iclust;		/* ordinal within file */
+	uint32_t	clust;
+	uint32_t	naddr;		/* next block in directory (for writing multi entry elements) */
+	uint32_t	prevaddr;
 	Iosect *p;
 	Dosdir *d;
 };
@@ -217,7 +217,7 @@ struct Xfs{
 struct Xfile{
 	Xfile	*next;		/* in hash bucket */
 	long	fid;
-	ulong	flags;
+	uint32_t	flags;
 	Qid	qid;
 	Xfs	*xf;
 	Dosptr	*ptr;

sys/src/cmd/dossrv/fns.h

@@ -20,7 +20,7 @@ Xfile	*clean(Xfile*);
 long	clust2sect(Dosbpb*, long);
 void	dirdump(void*);
 int	dosfs(Xfs*);
-void	dosptrreloc(Xfile *f, Dosptr *dp, ulong addr, ulong offset);
+void	dosptrreloc(Xfile *f, Dosptr *dp, uint32_t addr, uint32_t offset);
 int	emptydir(Xfile*);
 int	eqqid(Qid, Qid);
 int	falloc(Xfs*);
@@ -37,14 +37,14 @@ Xfs	*getxfs(char*, char*);
 long	gtime(Dosdir *d);
 void	io(int srvfd);
 int	iscontig(Xfs *xf, Dosdir *d);
-int	isroot(ulong addr);
+int	isroot(uint32_t addr);
 int	makecontig(Xfile*, int);
 void	mkalias(char*, char*, int);
 int	nameok(char*);
 void	panic(char*, ...);
 #pragma	varargck	argpos	panic	1
 void	putdir(Dosdir*, Dir*);
-void	putfat(Xfs*, int, ulong);
+void	putfat(Xfs*, int, uint32_t);
 void	putfile(Xfile*);
 int	putlongname(Xfs *f, Dosptr *ndp, char *name, char sname[13]);
 void	putname(char*, Dosdir*);

sys/src/cmd/ext2srv/dat.h

@@ -179,8 +179,8 @@ struct Xfile{
 
 	uint inbr;		/* inode nbr */
 	uint pinbr;	/* parrent inode */
-	ulong bufaddr;	/* addr of inode block */
-	ulong bufoffset;
+	uint32_t bufaddr;	/* addr of inode block */
+	uint32_t bufoffset;
 	int root;		/* true on attach for ref count */
 	int dirindex;	/* next dir entry to read */
 };

sys/src/cmd/ext2srv/fns.h

@@ -52,7 +52,7 @@ int create_dir(Xfile *, char *, int);
 int unlink(Xfile *);
 int  delete_entry(Xfs *, Inode *, int);
 int  free_block_inode(Xfile *);
-void free_block( Xfs *, ulong);
+void free_block( Xfs *, uint32_t);
 void free_inode( Xfs *, int);
 int empty_dir(Xfile *);
 int truncfile(Xfile *);

sys/src/cmd/faces/faces.h

@@ -30,7 +30,7 @@ struct Face
 	Image	*mask;	/* unless there's an error, this is file->mask */
 	char		*str[Nstring];
 	int		recent;
-	ulong	time;
+	uint32_t	time;
 	Tm		tm;
 	int		unknown;
 	Facefile	*file;
@@ -43,8 +43,8 @@ struct Facefile
 {
 	Image	*image;
 	Image	*mask;
-	ulong	mtime;
-	ulong	rdtime;
+	uint32_t	mtime;
+	uint32_t	rdtime;
 	int		ref;
 	char		*file;
 	Facefile	*next;
@@ -66,10 +66,10 @@ void	freefacefile(Facefile*);
 Face*	dirface(char*, char*);
 void	resized(void);
 int	alreadyseen(char*);
-ulong	dirlen(char*);
+uint32_t	dirlen(char*);
 
-void	*emalloc(ulong);
-void	*erealloc(void*, ulong);
+void	*emalloc(uint32_t);
+void	*erealloc(void*, uint32_t);
 char	*estrdup(char*);
 char	*findfile(Face*, char*, char*);
 void	addmaildir(char*);