8c, 6c: native ROL (cyclic shift) instruction support, improve peephole optimizers

[plan9front.git] / sys / src / cmd / 6c / sgen.c

diff --git a/sys/src/cmd/6c/sgen.c b/sys/src/cmd/6c/sgen.c
index a7d751c0fb0822cabcbb9fd732fc0d176798bf3d..14e5f3c7e289de940f42d3d4e371803ef28a8505 100644 (file)
--- a/sys/src/cmd/6c/sgen.c
+++ b/sys/src/cmd/6c/sgen.c
@@ -120,7 +120,6 @@ xcom(Node *n)
                                *l = *(n->left);
                                l->xoffset += r->vconst;
                                n->left = l;
-                               r = n->right;
                                goto brk;
                        }
                        break;
@@ -212,7 +211,6 @@ xcom(Node *n)
                if(g >= 0) {
                        n->left = r;
                        n->right = l;
-                       l = r;
                        r = n->right;
                }
                g = vlog(r);
@@ -288,6 +286,12 @@ xcom(Node *n)
                indexshift(n);
                break;
 
+       case OOR:
+               xcom(l);
+               xcom(r);
+               rolor(n);
+               break;
+
        default:
                if(l != Z)
                        xcom(l);
@@ -298,6 +302,8 @@ xcom(Node *n)
 brk:
        if(n->addable >= 10)
                return;
+       l = n->left;
+       r = n->right;
        if(l != Z)
                n->complex = l->complex;
        if(r != Z) {
@@ -344,6 +350,7 @@ brk:
                }
                break;
 
+       case OROL:
        case OLSHR:
        case OASHL:
        case OASHR: