shithub: riscv

Info  •  Files  •  Log  •  Branches

cc, ?a, ?l: change thunk type to uintptr

--- a/sys/src/cmd/1a/a.h

+++ b/sys/src/cmd/1a/a.h

@@ -132,7 +132,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 int	assemble(char*);

--- a/sys/src/cmd/1l/l.h

+++ b/sys/src/cmd/1l/l.h

@@ -200,7 +200,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	Prog	zprg;

--- a/sys/src/cmd/1l/obj.c

+++ b/sys/src/cmd/1l/obj.c

@@ -250,7 +250,7 @@

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

 		Bprint(&bso, "%ld data statements\n", ndata);

 		Bprint(&bso, "%ld symbols\n", nsymbol);

-		Bprint(&bso, "%ld memory used\n", thunk);

+		Bprint(&bso, "%zud memory used\n", thunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/2a/a.h

+++ b/sys/src/cmd/2a/a.h

@@ -134,7 +134,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	allocn(void*, long, long);

--- a/sys/src/cmd/2l/l.h

+++ b/sys/src/cmd/2l/l.h

@@ -190,7 +190,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	Prog	zprg;

--- a/sys/src/cmd/2l/obj.c

+++ b/sys/src/cmd/2l/obj.c

@@ -252,7 +252,7 @@

 		Bprint(&bso, "%ld+%ld = %ld data statements\n",

 			ndata, ncase, ndata+ncase);

 		Bprint(&bso, "%ld symbols\n", nsymbol);

-		Bprint(&bso, "%ld memory used\n", thunk);

+		Bprint(&bso, "%zud memory used\n", thunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/5a/a.h

+++ b/sys/src/cmd/5a/a.h

@@ -115,7 +115,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	alloc(long);

--- a/sys/src/cmd/5l/l.h

+++ b/sys/src/cmd/5l/l.h

@@ -270,7 +270,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	char	xcmp[C_GOK+1][C_GOK+1];

 EXTERN	Prog	zprg;

--- a/sys/src/cmd/5l/obj.c

+++ b/sys/src/cmd/5l/obj.c

@@ -281,7 +281,7 @@

 out:

 	if(debug['v']) {

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

-		Bprint(&bso, "%ld memory used\n", thunk);

+		Bprint(&bso, "%zud memory used\n", thunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/6a/a.h

+++ b/sys/src/cmd/6a/a.h

@@ -128,7 +128,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	allocn(void*, long, long);

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

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

@@ -303,7 +303,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	vlong	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	Prog	zprg;

 EXTERN	int	dtype;

--- a/sys/src/cmd/6l/obj.c

+++ b/sys/src/cmd/6l/obj.c

@@ -341,7 +341,7 @@

 	if(debug['v']) {

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

 		Bprint(&bso, "%ld symbols\n", nsymbol);

-		Bprint(&bso, "%ld memory used\n", thunk);

+		Bprint(&bso, "%zud memory used\n", thunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/7a/a.h

+++ b/sys/src/cmd/7a/a.h

@@ -120,7 +120,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	alloc(long);

--- a/sys/src/cmd/7l/l.h

+++ b/sys/src/cmd/7l/l.h

@@ -310,7 +310,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	vlong	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	char	xcmp[C_NCLASS][C_NCLASS];

 EXTERN	int	xrefresolv;

--- a/sys/src/cmd/8a/a.h

+++ b/sys/src/cmd/8a/a.h

@@ -128,7 +128,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	allocn(void*, long, long);

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

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

@@ -276,7 +276,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	Prog	zprg;

 EXTERN	int	dtype;

--- a/sys/src/cmd/8l/obj.c

+++ b/sys/src/cmd/8l/obj.c

@@ -338,7 +338,7 @@

 	if(debug['v']) {

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

 		Bprint(&bso, "%ld symbols\n", nsymbol);

-		Bprint(&bso, "%ld memory used\n", thunk);

+		Bprint(&bso, "%zud memory used\n", thunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/cc/cc.h

+++ b/sys/src/cmd/cc/cc.h

@@ -471,7 +471,7 @@

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

 EXTERN	Type*	thisfn;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Type*	types[NTYPE];

 EXTERN	Type*	fntypes[NTYPE];

 EXTERN	Node*	initlist;

--- a/sys/src/cmd/ka/a.h

+++ b/sys/src/cmd/ka/a.h

@@ -115,7 +115,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	alloc(long);

--- a/sys/src/cmd/kl/l.h

+++ b/sys/src/cmd/kl/l.h

@@ -241,7 +241,7 @@

 EXTERN	long	staticgen;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	tothunk;

+EXTERN	uintptr	tothunk;

 EXTERN	char	xcmp[C_NCLASS][C_NCLASS];

 EXTERN	int	version;

 EXTERN	Prog	zprg;

--- a/sys/src/cmd/kl/obj.c

+++ b/sys/src/cmd/kl/obj.c

@@ -194,7 +194,7 @@

 out:

 	if(debug['v']) {

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

-		Bprint(&bso, "%ld memory used\n", tothunk);

+		Bprint(&bso, "%zud memory used\n", tothunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/qa/a.h

+++ b/sys/src/cmd/qa/a.h

@@ -135,7 +135,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void	errorexit(void);

--- a/sys/src/cmd/ql/l.h

+++ b/sys/src/cmd/ql/l.h

@@ -234,7 +234,7 @@

 EXTERN	long	staticgen;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	tothunk;

+EXTERN	uintptr	tothunk;

 EXTERN	char	xcmp[C_NCLASS][C_NCLASS];

 EXTERN	int	version;

 EXTERN	Prog	zprg;

--- a/sys/src/cmd/ql/obj.c

+++ b/sys/src/cmd/ql/obj.c

@@ -273,7 +273,7 @@

 out:

 	if(debug['v']) {

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

-		Bprint(&bso, "%ld memory used\n", tothunk);

+		Bprint(&bso, "%zud memory used\n", tothunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}

--- a/sys/src/cmd/va/a.h

+++ b/sys/src/cmd/va/a.h

@@ -114,7 +114,7 @@

 EXTERN	char	symb[NSYMB];

 EXTERN	int	thechar;

 EXTERN	char*	thestring;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	Biobuf	obuf;

 void*	alloc(long);

--- a/sys/src/cmd/vl/l.h

+++ b/sys/src/cmd/vl/l.h

@@ -233,7 +233,7 @@

 EXTERN	long	symsize;

 EXTERN	Prog*	textp;

 EXTERN	long	textsize;

-EXTERN	long	thunk;

+EXTERN	uintptr	thunk;

 EXTERN	int	version;

 EXTERN	char	xcmp[32][32];

 EXTERN	Prog	zprg;

--- a/sys/src/cmd/vl/obj.c

+++ b/sys/src/cmd/vl/obj.c

@@ -240,7 +240,7 @@

 out:

 	if(debug['v']) {

 		Bprint(&bso, "%5.2f cpu time\n", cputime());

-		Bprint(&bso, "%ld memory used\n", thunk);

+		Bprint(&bso, "%zud memory used\n", thunk);

 		Bprint(&bso, "%d sizeof adr\n", sizeof(Adr));

 		Bprint(&bso, "%d sizeof prog\n", sizeof(Prog));

 	}