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

diff --git a/sys/src/cmd/1a/a.h b/sys/src/cmd/1a/a.h
index c57787b977c346fcff5d8b69516e3165c5ff7712..d9abec36161b9f81f5b27717cfa062f4556c75ae 100644 (file)
--- a/sys/src/cmd/1a/a.h
+++ b/sys/src/cmd/1a/a.h
@@ -132,7 +132,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 int    assemble(char*);

diff --git a/sys/src/cmd/1l/l.h b/sys/src/cmd/1l/l.h
index 41ec656857e1f0a9d4fbf1a6375e1e1e70af4ce9..72cedf3bdd249f285c319662044623554b39eea7 100644 (file)
--- a/sys/src/cmd/1l/l.h
+++ b/sys/src/cmd/1l/l.h
@@ -200,7 +200,7 @@ EXTERN      Sym*    symlist;
 EXTERN long    symsize;
 EXTERN Prog*   textp;
 EXTERN long    textsize;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN int     version;
 EXTERN Prog    zprg;
 

diff --git a/sys/src/cmd/1l/obj.c b/sys/src/cmd/1l/obj.c
index 01fc3344a26740a16370f2c8a8c190a5b2574fed..9cc82a56e1c21259553514d6bd5173c7cd1883c5 100644 (file)
--- a/sys/src/cmd/1l/obj.c
+++ b/sys/src/cmd/1l/obj.c
@@ -250,7 +250,7 @@ main(int argc, char *argv[])
                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));
        }

diff --git a/sys/src/cmd/2a/a.h b/sys/src/cmd/2a/a.h
index 52ed2b2fa89283fc7e8158ef9ff9c4b66dade5df..68cd1e8dce4618b6cffca747902cf29261fe78c0 100644 (file)
--- a/sys/src/cmd/2a/a.h
+++ b/sys/src/cmd/2a/a.h
@@ -134,7 +134,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  allocn(void*, long, long);

diff --git a/sys/src/cmd/2l/l.h b/sys/src/cmd/2l/l.h
index 19c100f5665b932174622b21621b07bf5c755d91..a0899c0f5a601bc5eaa5205b4b61afc1f7d6b478 100644 (file)
--- a/sys/src/cmd/2l/l.h
+++ b/sys/src/cmd/2l/l.h
@@ -190,7 +190,7 @@ EXTERN      Sym*    symlist;
 EXTERN long    symsize;
 EXTERN Prog*   textp;
 EXTERN long    textsize;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN int     version;
 EXTERN Prog    zprg;
 

diff --git a/sys/src/cmd/2l/obj.c b/sys/src/cmd/2l/obj.c
index 70f8f1502619b9cba829d695864f79e963841a2c..411d2a5f5b5d4e0f2480b67341253eb370f7fd1f 100644 (file)
--- a/sys/src/cmd/2l/obj.c
+++ b/sys/src/cmd/2l/obj.c
@@ -252,7 +252,7 @@ main(int argc, char *argv[])
                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));
        }

diff --git a/sys/src/cmd/5a/a.h b/sys/src/cmd/5a/a.h
index eb3a70ec616b684508e369057b581b52dbbd8a6d..08ea625a9f4dc98695ceba5b3847fc65ce722f84 100644 (file)
--- a/sys/src/cmd/5a/a.h
+++ b/sys/src/cmd/5a/a.h
@@ -115,7 +115,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  alloc(long);

diff --git a/sys/src/cmd/5l/l.h b/sys/src/cmd/5l/l.h
index 24426e11bde2471519376f1e218e3b4356d7038d..8a45a7a7a1edeff630bf610dcbf081a98de47988 100644 (file)
--- a/sys/src/cmd/5l/l.h
+++ b/sys/src/cmd/5l/l.h
@@ -270,7 +270,7 @@ EXTERN      uchar   repop[ALAST];
 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;

diff --git a/sys/src/cmd/5l/obj.c b/sys/src/cmd/5l/obj.c
index a185919b32eaca01490a3fd52176f3a47692ca2b..c10d4b8dd71729fe1ec62a5d5b0c834aa3a0fdb9 100644 (file)
--- a/sys/src/cmd/5l/obj.c
+++ b/sys/src/cmd/5l/obj.c
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
 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));
        }

diff --git a/sys/src/cmd/6a/a.h b/sys/src/cmd/6a/a.h
index 84be2f0070fd12907598877ebb577dca36c1b7ed..9c9833348b54f22f5eefa66d428e44f0702b704c 100644 (file)
--- a/sys/src/cmd/6a/a.h
+++ b/sys/src/cmd/6a/a.h
@@ -128,7 +128,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  allocn(void*, long, long);

diff --git a/sys/src/cmd/6l/l.h b/sys/src/cmd/6l/l.h
index 42dba0d172dd560c56e7646056dc86c340a96788..6eaa603c64c19b94e4ef6102408498bf280bc4f8 100644 (file)
--- a/sys/src/cmd/6l/l.h
+++ b/sys/src/cmd/6l/l.h
@@ -303,7 +303,7 @@ EXTERN      Sym*    symlist;
 EXTERN long    symsize;
 EXTERN Prog*   textp;
 EXTERN vlong   textsize;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN int     version;
 EXTERN Prog    zprg;
 EXTERN int     dtype;

diff --git a/sys/src/cmd/6l/obj.c b/sys/src/cmd/6l/obj.c
index 1c609b98f4984b101a4850c4f3461d57ce048b2a..5483eebaedbe2bcbd0ee96ef758adba72d459d45 100644 (file)
--- a/sys/src/cmd/6l/obj.c
+++ b/sys/src/cmd/6l/obj.c
@@ -341,7 +341,7 @@ main(int argc, char *argv[])
        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));
        }

diff --git a/sys/src/cmd/7a/a.h b/sys/src/cmd/7a/a.h
index 5d09f62707f85db43aa3fd9683aebca0e80d56cf..3ef0f1a96408519a6921a5aa95b83c9051e2e885 100644 (file)
--- a/sys/src/cmd/7a/a.h
+++ b/sys/src/cmd/7a/a.h
@@ -120,7 +120,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  alloc(long);

diff --git a/sys/src/cmd/7l/l.h b/sys/src/cmd/7l/l.h
index 73852d65ec26869d55fca15cf3cfa59bc243013c..5528cc6bdab001958e349cb89e74d651e4bc88ff 100644 (file)
--- a/sys/src/cmd/7l/l.h
+++ b/sys/src/cmd/7l/l.h
@@ -310,7 +310,7 @@ EXTERN      uchar   repop[ALAST];
 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;

diff --git a/sys/src/cmd/8a/a.h b/sys/src/cmd/8a/a.h
index 3bac7ae05e5d110cdd3176a14311b46f2be3aea7..7d4b9366be93030565a675049dbc71f4aec8c769 100644 (file)
--- a/sys/src/cmd/8a/a.h
+++ b/sys/src/cmd/8a/a.h
@@ -128,7 +128,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  allocn(void*, long, long);

diff --git a/sys/src/cmd/8l/l.h b/sys/src/cmd/8l/l.h
index 2ca800342a75538213b148fcd51e4fccdb12a2f7..f8968d01d946b30e4b3368c5fb5ec9bb83adbac2 100644 (file)
--- a/sys/src/cmd/8l/l.h
+++ b/sys/src/cmd/8l/l.h
@@ -276,7 +276,7 @@ EXTERN      Sym*    symlist;
 EXTERN long    symsize;
 EXTERN Prog*   textp;
 EXTERN long    textsize;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN int     version;
 EXTERN Prog    zprg;
 EXTERN int     dtype;

diff --git a/sys/src/cmd/8l/obj.c b/sys/src/cmd/8l/obj.c
index ba4571468935f4daa126c82d6d875510df48fdaf..efdbd411022203dc49ef6ff16ec74b1b931dfd4c 100644 (file)
--- a/sys/src/cmd/8l/obj.c
+++ b/sys/src/cmd/8l/obj.c
@@ -338,7 +338,7 @@ main(int argc, char *argv[])
        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));
        }

diff --git a/sys/src/cmd/cc/cc.h b/sys/src/cmd/cc/cc.h
index f22cad7e395b055fba1d2b1c183eba508b767c90..75ac42d7ff59f81e39865522ab7b8b5bbaef60e6 100644 (file)
--- a/sys/src/cmd/cc/cc.h
+++ b/sys/src/cmd/cc/cc.h
@@ -471,7 +471,7 @@ EXTERN      Type*   tufield;
 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;

diff --git a/sys/src/cmd/ka/a.h b/sys/src/cmd/ka/a.h
index 9ab6ec68d21797446f282887b1cf6e475833af67..9f55ab3334dde5852d5b17285d568d3efc82954c 100644 (file)
--- a/sys/src/cmd/ka/a.h
+++ b/sys/src/cmd/ka/a.h
@@ -115,7 +115,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  alloc(long);

diff --git a/sys/src/cmd/kl/l.h b/sys/src/cmd/kl/l.h
index 94fa2b40fe4a2acd2510bfc984a18b0aeebc9b9e..e296e4509fd18fbe9b68771801ae43cb1fb27701 100644 (file)
--- a/sys/src/cmd/kl/l.h
+++ b/sys/src/cmd/kl/l.h
@@ -241,7 +241,7 @@ EXTERN      long    symsize;
 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;

diff --git a/sys/src/cmd/kl/obj.c b/sys/src/cmd/kl/obj.c
index 381bcf1dc14f41c853ae64181f9c62860d09b3aa..b778cfd8d138aeda0a58726d23b1a937e709ddb6 100644 (file)
--- a/sys/src/cmd/kl/obj.c
+++ b/sys/src/cmd/kl/obj.c
@@ -194,7 +194,7 @@ main(int argc, char *argv[])
 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));
        }

diff --git a/sys/src/cmd/qa/a.h b/sys/src/cmd/qa/a.h
index ab93efd07d2fb2d7b0676c24e89383ecffc756e2..74f386379de641bfb61bb046d0307b2b4c731137 100644 (file)
--- a/sys/src/cmd/qa/a.h
+++ b/sys/src/cmd/qa/a.h
@@ -135,7 +135,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void   errorexit(void);

diff --git a/sys/src/cmd/ql/l.h b/sys/src/cmd/ql/l.h
index fd56f6882666fb2e1d113c9b38a289f2dd1af1d9..e7822d01e16ddb1dcf34edfc95409683ea7b0c31 100644 (file)
--- a/sys/src/cmd/ql/l.h
+++ b/sys/src/cmd/ql/l.h
@@ -234,7 +234,7 @@ EXTERN      long    symsize;
 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;

diff --git a/sys/src/cmd/ql/obj.c b/sys/src/cmd/ql/obj.c
index c6c4e26dcd37429beaa73ff2323545bab8596a81..dba56bd46e7fcba7feea0aba0c05624a8e1432c9 100644 (file)
--- a/sys/src/cmd/ql/obj.c
+++ b/sys/src/cmd/ql/obj.c
@@ -273,7 +273,7 @@ main(int argc, char *argv[])
 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));
        }

diff --git a/sys/src/cmd/va/a.h b/sys/src/cmd/va/a.h
index 9b1f4da38920d1ebd6a58ae86a4a7fea6b4dc6bb..7438512f1f97a68aeadf7ad3429146a53ed2acfb 100644 (file)
--- a/sys/src/cmd/va/a.h
+++ b/sys/src/cmd/va/a.h
@@ -114,7 +114,7 @@ EXTERN      int     sym;
 EXTERN char    symb[NSYMB];
 EXTERN int     thechar;
 EXTERN char*   thestring;
-EXTERN long    thunk;
+EXTERN uintptr thunk;
 EXTERN Biobuf  obuf;
 
 void*  alloc(long);

diff --git a/sys/src/cmd/vl/l.h b/sys/src/cmd/vl/l.h
index 1ea12b15becca2dbfa4ab6f461b49bb2c1fd54d2..094da0a500d390563ceddf571821eb39373f0ac1 100644 (file)
--- a/sys/src/cmd/vl/l.h
+++ b/sys/src/cmd/vl/l.h
@@ -233,7 +233,7 @@ EXTERN      uchar   repop[ALAST];
 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;

diff --git a/sys/src/cmd/vl/obj.c b/sys/src/cmd/vl/obj.c
index 5f6e7200c205ff0ba16c5372d411ad157814ed0b..c20e5c98be1f4bd88b3ecce73bb714162e086ad5 100644 (file)
--- a/sys/src/cmd/vl/obj.c
+++ b/sys/src/cmd/vl/obj.c
@@ -240,7 +240,7 @@ main(int argc, char *argv[])
 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));
        }