diff options
| author | Ken Thompson <ken@golang.org> | 2008-11-24 14:01:12 -0800 |
|---|---|---|
| committer | Ken Thompson <ken@golang.org> | 2008-11-24 14:01:12 -0800 |
| commit | 8095a3049779cc32ed19627e858e21714028ad6a (patch) | |
| tree | f781e1018ce913841550dbd656da306dbec2b5d0 /src | |
| parent | ec3ff418bc0726568884215e1ca09c81b22fd8c4 (diff) | |
| download | golang-8095a3049779cc32ed19627e858e21714028ad6a.tar.gz | |
1. retract general field names
2. array bounds bug
3. ... optimization bug
R=r
OCL=19927
CL=19927
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/6g/cgen.c | 33 | ||||
| -rw-r--r-- | src/cmd/6g/reg.c | 4 | ||||
| -rw-r--r-- | src/cmd/gc/go.y | 5 |
3 files changed, 33 insertions, 9 deletions
diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c index 74e945e65..de54756de 100644 --- a/src/cmd/6g/cgen.c +++ b/src/cmd/6g/cgen.c @@ -406,17 +406,44 @@ agen(Node *n, Node *res) if(w == 0) fatal("index is zero width"); + // constant index if(whatis(nr) == Wlitint) { + v = mpgetfix(nr->val.u.xval); if(isptrdarray(nl->type)) { + + if(!debug['B']) { + n1 = n3; + n1.op = OINDREG; + n1.type = types[tptr]; + n1.xoffset = offsetof(Array, nel); + nodconst(&n2, types[TUINT64], v); + gins(optoas(OCMP, types[TUINT32]), &n1, &n2); + p1 = gbranch(optoas(OGT, types[TUINT32]), T); + gins(ACALL, N, throwindex); + patch(p1, pc); + } + n1 = n3; n1.op = OINDREG; n1.type = types[tptr]; n1.xoffset = offsetof(Array, array); gmove(&n1, &n3); + } else + if(!debug['B']) { + if(v < 0) + yyerror("out of bounds on array"); + else + if(isptrarray(nl->type)) { + if(v >= nl->type->type->bound) + yyerror("out of bounds on array"); + } else + if(v >= nl->type->bound) + yyerror("out of bounds on array"); } - v = mpgetfix(nr->val.u.xval); + nodconst(&n2, types[tptr], v*w); gins(optoas(OADD, types[tptr]), &n2, &n3); + gmove(&n3, res); regfree(&n3); break; @@ -443,8 +470,8 @@ agen(Node *n, Node *res) if(isptrarray(nl->type)) nodconst(&n1, types[TUINT64], nl->type->type->bound); } - gins(optoas(OCMP, types[TUINT64]), &n2, &n1); - p1 = gbranch(optoas(OLT, types[TUINT64]), T); + gins(optoas(OCMP, types[TUINT32]), &n2, &n1); + p1 = gbranch(optoas(OLT, types[TUINT32]), T); gins(ACALL, N, throwindex); patch(p1, pc); } diff --git a/src/cmd/6g/reg.c b/src/cmd/6g/reg.c index 0715faa09..841a2312e 100644 --- a/src/cmd/6g/reg.c +++ b/src/cmd/6g/reg.c @@ -767,8 +767,8 @@ mkvar(Reg *r, Adr *a) s = a->sym; if(s == S) goto none; -// if(s->name[0] == '.') -// goto none; + if(s->name[0] == '!' || s->name[0] == '.') + goto none; et = a->etype; o = a->offset; v = var; diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y index 0a7c7bc07..082a83fde 100644 --- a/src/cmd/gc/go.y +++ b/src/cmd/gc/go.y @@ -993,9 +993,6 @@ sym1: */ sym2: sym1 -| LTYPE -| LFUNC -| LVAR /* * keywords that can be variables @@ -2014,7 +2011,7 @@ hidden_importsym: * to check whether the rest of the grammar is free of * reduce/reduce conflicts, comment this section out by * removing the slash on the next line. - * + */ lpack: LATYPE { |