cmd/5g, cmd/6g: pass the full torture test.

The patch adds more cases to agenr to allocate registers later,
and makes 6g generate addresses for sgen in something else than
SI and DI. It avoids a complex save/restore sequence that
amounts to allocate a register before descending in subtrees.

Fixes #4207.

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

diff --git a/src/cmd/5g/cgen.c b/src/cmd/5g/cgen.c
index b7abc9e4ecaaab36c2a9750a9e4eecde5a3b55c4..008d1b94897e5bb3146d01e6cd958885f8586b5b 100644 (file)
--- a/src/cmd/5g/cgen.c
+++ b/src/cmd/5g/cgen.c
@@ -893,6 +893,21 @@ agenr(Node *n, Node *a, Node *res)
        nr = n->right;
 
        switch(n->op) {
+       case ODOT:
+       case ODOTPTR:
+       case OCALLFUNC:
+       case OCALLMETH:
+       case OCALLINTER:
+               igen(n, &n1, res);
+               regalloc(a, types[tptr], &n1);
+               agen(&n1, a);
+               regfree(&n1);
+               break;
+
+       case OIND:
+               cgenr(n->left, a, res);
+               break;
+
        case OINDEX:
                p2 = nil;  // to be patched to panicindex.
                w = n->type->width;

diff --git a/src/cmd/5g/gsubr.c b/src/cmd/5g/gsubr.c
index 8340e8a98b9a6d3c1d22f1c2b05067ff8250c148..916d2a7453239fda95c4f459280828a6299d82af 100644 (file)
--- a/src/cmd/5g/gsubr.c
+++ b/src/cmd/5g/gsubr.c
@@ -361,6 +361,7 @@ regalloc(Node *n, Type *t, Node *o)
                                regpc[i] = (uintptr)getcallerpc(&n);
                                goto out;
                        }
+               print("registers allocated at\n");
                for(i=REGALLOC_R0; i<=REGALLOC_RMAX; i++)
                        print("%d %p\n", i, regpc[i]);
                yyerror("out of fixed registers");

diff --git a/src/cmd/6g/cgen.c b/src/cmd/6g/cgen.c
index 751a5b7f133f9c5c13cb4b78a6b5aa22617eb6bf..1333dc194f4f8d92f3371b3d1cf3f22319fe63f1 100644 (file)
--- a/src/cmd/6g/cgen.c
+++ b/src/cmd/6g/cgen.c
@@ -576,6 +576,21 @@ agenr(Node *n, Node *a, Node *res)
        nr = n->right;
 
        switch(n->op) {
+       case ODOT:
+       case ODOTPTR:
+       case OCALLFUNC:
+       case OCALLMETH:
+       case OCALLINTER:
+               igen(n, &n1, res);
+               regalloc(a, types[tptr], &n1);
+               agen(&n1, a);
+               regfree(&n1);
+               break;
+
+       case OIND:
+               cgenr(n->left, a, res);
+               break;
+
        case OINDEX:
                freelen = 0;
                w = n->type->width;
@@ -1309,7 +1324,7 @@ stkof(Node *n)
 void
 sgen(Node *n, Node *ns, int64 w)
 {
-       Node nodl, nodr, oldl, oldr, cx, oldcx, tmp;
+       Node nodl, nodr, nodsi, noddi, cx, oldcx, tmp;
        int32 c, q, odst, osrc;
 
        if(debug['g']) {
@@ -1353,22 +1368,18 @@ sgen(Node *n, Node *ns, int64 w)
        }
 
        if(n->ullman >= ns->ullman) {
-               savex(D_SI, &nodr, &oldr, N, types[tptr]);
-               agen(n, &nodr);
-
-               regalloc(&nodr, types[tptr], &nodr);    // mark nodr as live
-               savex(D_DI, &nodl, &oldl, N, types[tptr]);
-               agen(ns, &nodl);
-               regfree(&nodr);
+               agenr(n, &nodr, N);
+               agenr(ns, &nodl, N);
        } else {
-               savex(D_DI, &nodl, &oldl, N, types[tptr]);
-               agen(ns, &nodl);
-
-               regalloc(&nodl, types[tptr], &nodl);    // mark nodl as live
-               savex(D_SI, &nodr, &oldr, N, types[tptr]);
-               agen(n, &nodr);
-               regfree(&nodl);
+               agenr(ns, &nodl, N);
+               agenr(n, &nodr, N);
        }
+       nodreg(&noddi, types[tptr], D_DI);
+       nodreg(&nodsi, types[tptr], D_SI);
+       gmove(&nodl, &noddi);
+       gmove(&nodr, &nodsi);
+       regfree(&nodl);
+       regfree(&nodr);
 
        c = w % 8;      // bytes
        q = w / 8;      // quads
@@ -1425,9 +1436,6 @@ sgen(Node *n, Node *ns, int64 w)
                }
        }
 
-
-       restx(&nodl, &oldl);
-       restx(&nodr, &oldr);
        restx(&cx, &oldcx);
 }
 

diff --git a/test/torture.go b/test/torture.go
index c510bb923730c71daec358058b77d2dba88edee8..d14d78fd14c531124d76d94d3cf4cc775f13526b 100644 (file)
--- a/test/torture.go
+++ b/test/torture.go
@@ -279,12 +279,12 @@ func ChainAssertArrayIndex(u *UArr) J {
                Children[0].(*UArr).
                Children[0].(*UArr).
                Children[0].(*UArr).
-               // Children[0].(*UArr).
-               // Children[0].(*UArr).
-               // Children[0].(*UArr).
-               // Children[0].(*UArr).
-               // Children[0].(*UArr).
-               // Children[0].(*UArr).
+               Children[0].(*UArr).
+               Children[0].(*UArr).
+               Children[0].(*UArr).
+               Children[0].(*UArr).
+               Children[0].(*UArr).
+               Children[0].(*UArr).
                Children[0]
 }
 
@@ -295,21 +295,20 @@ type UArrPtr struct {
 func (u *UArrPtr) Child(n int) J { return u.Children[n] }
 
 func ChainAssertArrayptrIndex(u *UArrPtr) J {
-       // TODO: don't crash on longer chains.
        return u.
                Children[0].(*UArrPtr).
                Children[0].(*UArrPtr).
                Children[0].(*UArrPtr).
                Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
-               // Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
+               Children[0].(*UArrPtr).
                Children[0]
 }