6g: fix build on Plan 9

src/cmd/6g/cgen.c
src/cmd/6g/gobj.c
src/cmd/6g/reg.c
. dropped unused assignments;
src/cmd/6g/gg.h
. added varargck pragmas;
src/cmd/6g/list.c
. adjusted print format for ulong casts;
src/cmd/6g/peep.c
. dropped redundant increment;

R=golang-dev
CC=golang-dev, rsc
https://golang.org/cl/4953049

diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c
index a4820cf2e3aad91915154ce396b7b54b4a155b37..6448d9c069eed86335c04ac519bec4bb99f78d33 100644 (file)
--- a/src/cmd/6g/cgen.c
+++ b/src/cmd/6g/cgen.c
@@ -729,9 +729,6 @@ bgen(Node *n, int true, Prog *to)
        if(n->ninit != nil)
                genlist(n->ninit);
 
-       nl = n->left;
-       nr = n->right;
-
        if(n->type == T) {
                convlit(&n, types[TBOOL]);
                if(n->type == T)
@@ -744,7 +741,6 @@ bgen(Node *n, int true, Prog *to)
                patch(gins(AEND, N, N), to);
                goto ret;
        }
-       nl = N;
        nr = N;
 
        switch(n->op) {

diff --git a/src/cmd/6g/gg.h b/src/cmd/6g/gg.h
index 47a92ad64923b350fc9f833f7fa5dbecd57e3b8f..8a80ee9fb5424c9d5e706ee9ed34484dcd0591a4 100644 (file)
--- a/src/cmd/6g/gg.h
+++ b/src/cmd/6g/gg.h
@@ -153,3 +153,5 @@ void        listinit(void);
 
 void   zaddr(Biobuf*, Addr*, int, int);
 
+#pragma        varargck        type    "D"     Addr*
+#pragma        varargck        type    "lD"    Addr*

diff --git a/src/cmd/6g/gobj.c b/src/cmd/6g/gobj.c
index 5e704ce01f2adf85e94ab078626e942bbb666f1b..e94759b71b02db604f74126bdf10d3d22eac1c0f 100644 (file)
--- a/src/cmd/6g/gobj.c
+++ b/src/cmd/6g/gobj.c
@@ -623,7 +623,6 @@ out:
                // but 6l has a bug, and it can't handle
                // JMP instructions too close to the top of
                // a new function.
-               p = pc;
                gins(ANOP, N, N);
        }
 

diff --git a/src/cmd/6g/list.c b/src/cmd/6g/list.c
index 4381a178a8bb4bef4dffb3442d83fd2d1d7fc653..ad63f7d29ef0ffe1764452ddfa84b0f5600e4e91 100644 (file)
--- a/src/cmd/6g/list.c
+++ b/src/cmd/6g/list.c
@@ -133,7 +133,7 @@ Dconv(Fmt *fp)
                if(fp->flags & FmtLong) {
                        d1 = a->offset & 0xffffffffLL;
                        d2 = (a->offset>>32) & 0xffffffffLL;
-                       snprint(str, sizeof(str), "$%ud-%ud", (ulong)d1, (ulong)d2);
+                       snprint(str, sizeof(str), "$%lud-%lud", (ulong)d1, (ulong)d2);
                        break;
                }
                snprint(str, sizeof(str), "$%lld", a->offset);

diff --git a/src/cmd/6g/peep.c b/src/cmd/6g/peep.c
index 3fac3b7d16261727d83b520dd83c540e286557ed..63ef3f78f0c270a9ae37b5552c6ae9640be39eb6 100644 (file)
--- a/src/cmd/6g/peep.c
+++ b/src/cmd/6g/peep.c
@@ -993,7 +993,6 @@ loop:
                if(p->from.dval == p0->from.dval)
                if(p->from.index == p0->from.index) {
                        excise(r);
-                       t++;
                        goto loop;
                }
                break;

diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c
index 9006cf2b6678e17d908b055585239099631d6c8e..72c4b38736499d0cf5a5be6ab3f6ef11f2450589 100644 (file)
--- a/src/cmd/6g/reg.c
+++ b/src/cmd/6g/reg.c
@@ -179,7 +179,6 @@ regopt(Prog *firstp)
        r1 = R;
        firstr = R;
        lastr = R;
-       nvar = 0;
 
        /*
         * control flow is more complicated in generated go code