summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKai Backman <kaib@golang.org>2009-08-18 07:16:10 -0700
committerKai Backman <kaib@golang.org>2009-08-18 07:16:10 -0700
commit64cea6db3cec9b8bb1893b7646aa9266038cc790 (patch)
treeea565b624fd1de54b7701b522951d7b98c796da2 /src
parent4cc1541a6ba8d646e0dd5907bc4f00ca9100dd90 (diff)
downloadgolang-64cea6db3cec9b8bb1893b7646aa9266038cc790.tar.gz
slashed warnings
R=rsc APPROVED=rsc DELTA=35 (2 added, 1 deleted, 32 changed) OCL=33436 CL=33453
Diffstat (limited to 'src')
-rw-r--r--src/cmd/5a/lex.c2
-rw-r--r--src/cmd/5g/ggen.c4
-rw-r--r--src/cmd/5g/gobj.c27
-rw-r--r--src/cmd/5g/gsubr.c27
-rw-r--r--src/cmd/5g/list.c6
-rw-r--r--src/cmd/5l/obj.c65
6 files changed, 40 insertions, 91 deletions
diff --git a/src/cmd/5a/lex.c b/src/cmd/5a/lex.c
index 8a28c7d55..c5e9a3e78 100644
--- a/src/cmd/5a/lex.c
+++ b/src/cmd/5a/lex.c
@@ -53,7 +53,7 @@ void
main(int argc, char *argv[])
{
char *p;
- int nout, nproc, status, i, c;
+ int nout, nproc, i, c;
thechar = '5';
thestring = "arm";
diff --git a/src/cmd/5g/ggen.c b/src/cmd/5g/ggen.c
index 13083c3d8..3d04ca7f7 100644
--- a/src/cmd/5g/ggen.c
+++ b/src/cmd/5g/ggen.c
@@ -111,7 +111,7 @@ void
ginscall(Node *f, int proc)
{
Prog *p;
- Node reg, con;
+// Node reg, con;
switch(proc) {
default:
@@ -340,7 +340,7 @@ cgen_asop(Node *n)
{
Node n1, n2, n3, n4;
Node *nl, *nr;
- Prog *p1;
+// Prog *p1;
Addr addr;
int a;
diff --git a/src/cmd/5g/gobj.c b/src/cmd/5g/gobj.c
index 7c22780d3..5da9e03ce 100644
--- a/src/cmd/5g/gobj.c
+++ b/src/cmd/5g/gobj.c
@@ -83,7 +83,7 @@ void
zaddr(Biobuf *b, Addr *a, int s)
{
int32 l;
- Ieee e;
+// Ieee e;
int i;
char *n;
@@ -142,18 +142,19 @@ zaddr(Biobuf *b, Addr *a, int s)
break;
case D_FCONST:
- ieeedtod(&e, a->dval);
- l = e.l;
- Bputc(b, l);
- Bputc(b, l>>8);
- Bputc(b, l>>16);
- Bputc(b, l>>24);
- l = e.h;
- Bputc(b, l);
- Bputc(b, l>>8);
- Bputc(b, l>>16);
- Bputc(b, l>>24);
- break;
+ fatal("zaddr D_FCONST not implemented");
+ //ieeedtod(&e, a->dval);
+ //l = e.l;
+ //Bputc(b, l);
+ //Bputc(b, l>>8);
+ //Bputc(b, l>>16);
+ //Bputc(b, l>>24);
+ //l = e.h;
+ //Bputc(b, l);
+ //Bputc(b, l>>8);
+ //Bputc(b, l>>16);
+ //Bputc(b, l>>24);
+ //break;
}
}
diff --git a/src/cmd/5g/gsubr.c b/src/cmd/5g/gsubr.c
index 5d9460446..305fd56f5 100644
--- a/src/cmd/5g/gsubr.c
+++ b/src/cmd/5g/gsubr.c
@@ -420,8 +420,9 @@ gmove(Node *f, Node *t)
{
int a, ft, tt;
Type *cvt;
- Node r1, r2, t1, t2, flo, fhi, tlo, thi, con, f0, f1, ax, dx, cx;
- Prog *p1, *p2, *p3;
+ Node r1, con;
+// Node r1, r2, t1, t2, flo, fhi, tlo, thi, con, f0, f1, ax, dx, cx;
+// Prog *p1, *p2, *p3;
if(debug['M'])
print("gmove %N -> %N\n", f, t);
@@ -948,7 +949,7 @@ gmove(Node *f, Node *t)
gins(a, f, t);
return;
-rdst:
+//rdst:
// requires register destination
regalloc(&r1, t->type, t);
gins(a, f, &r1);
@@ -964,7 +965,7 @@ hard:
regfree(&r1);
return;
-hardmem:
+//hardmem:
// requires memory intermediate
tempalloc(&r1, cvt);
gmove(f, &r1);
@@ -1000,8 +1001,8 @@ samaddr(Node *f, Node *t)
Prog*
gins(int as, Node *f, Node *t)
{
- Node nod;
- int32 v;
+// Node nod;
+// int32 v;
Prog *p;
if(f != N && f->op == OINDEX) {
@@ -1775,13 +1776,13 @@ lit:
// break;
// }
-// cleani += 2;
-// reg = &clean[cleani-1];
-// reg1 = &clean[cleani-2];
-// reg->op = OEMPTY;
-// reg1->op = OEMPTY;
-// naddr(n, a);
-// goto yes;
+ cleani += 2;
+ reg = &clean[cleani-1];
+ reg1 = &clean[cleani-2];
+ reg->op = OEMPTY;
+ reg1->op = OEMPTY;
+ naddr(n, a);
+ goto yes;
odot:
o = dotoffset(n, oary, &nn);
diff --git a/src/cmd/5g/list.c b/src/cmd/5g/list.c
index 82d0825b2..d1437733d 100644
--- a/src/cmd/5g/list.c
+++ b/src/cmd/5g/list.c
@@ -76,10 +76,10 @@ Pconv(Fmt *fp)
int
Dconv(Fmt *fp)
{
- char str[100], s[100];
+ char str[100]; //, s[100];
Addr *a;
int i;
- uint32 d1, d2;
+// uint32 d1, d2;
a = va_arg(fp->args, Addr*);
i = a->type;
@@ -128,7 +128,7 @@ Dconv(Fmt *fp)
// a->type = D_ADDR;
// goto conv;
}
-conv:
+//conv:
return fmtstrcpy(fp, str);
}
diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 7c9cb1ae2..ff9e66770 100644
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -79,7 +79,6 @@ main(int argc, char *argv[])
char *a;
Binit(&bso, 1, OWRITE);
- srand(time(0));
cout = -1;
listinit();
outfile = 0;
@@ -556,23 +555,13 @@ zaddr(Biobuf *f, Adr *a, Sym *h[])
break;
case D_SCONST:
- while(nhunk < NSNAME)
- gethunk();
- a->sval = (char*)hunk;
- nhunk -= NSNAME;
- hunk += NSNAME;
-
+ a->sval = mal(NSNAME);
Bread(f, a->sval, NSNAME);
c += NSNAME;
break;
case D_FCONST:
- while(nhunk < sizeof(Ieee))
- gethunk();
- a->ieee = (Ieee*)hunk;
- nhunk -= NSNAME;
- hunk += NSNAME;
-
+ a->ieee = mal(sizeof(Ieee));
a->ieee->l = Bget4(f);
a->ieee->h = Bget4(f);
break;
@@ -593,12 +582,7 @@ zaddr(Biobuf *f, Adr *a, Sym *h[])
return;
}
- while(nhunk < sizeof(Auto))
- gethunk();
- u = (Auto*)hunk;
- nhunk -= sizeof(Auto);
- hunk += sizeof(Auto);
-
+ u = mal(sizeof(Auto));
u->link = curauto;
curauto = u;
u->asym = s;
@@ -888,12 +872,7 @@ loop:
goto loop;
}
- if(nhunk < sizeof(Prog))
- gethunk();
- p = (Prog*)hunk;
- nhunk -= sizeof(Prog);
- hunk += sizeof(Prog);
-
+ p = mal(sizeof(Prog));
p->as = o;
p->scond = Bgetc(f);
p->reg = Bgetc(f);
@@ -1229,12 +1208,7 @@ lookup(char *symb, int v)
if(memcmp(s->name, symb, l) == 0)
return s;
- while(nhunk < sizeof(Sym))
- gethunk();
- s = (Sym*)hunk;
- nhunk -= sizeof(Sym);
- hunk += sizeof(Sym);
-
+ s = mal(sizeof(Sym));
s->name = malloc(l);
memmove(s->name, symb, l);
@@ -1254,39 +1228,12 @@ prg(void)
{
Prog *p;
- while(nhunk < sizeof(Prog))
- gethunk();
- p = (Prog*)hunk;
- nhunk -= sizeof(Prog);
- hunk += sizeof(Prog);
-
+ p = mal(sizeof(Prog));
*p = zprg;
return p;
}
void
-gethunk(void)
-{
- char *h;
- int32 nh;
-
- nh = NHUNK;
- if(thunk >= 5L*NHUNK) {
- nh = 5L*NHUNK;
- if(thunk >= 25L*NHUNK)
- nh = 25L*NHUNK;
- }
- h = mysbrk(nh);
- if(h == (char*)-1) {
- diag("out of memory");
- errorexit();
- }
- hunk = h;
- nhunk = nh;
- thunk += nh;
-}
-
-void
doprof1(void)
{
Sym *s;