Move towards registerizing stuff.

3 files changed, 14 insertions, 31 deletions

diff --git a/6/asm.h b/6/asm.h
index 8881a87..5240582 100644
--- a/6/asm.h
+++ b/6/asm.h
@@ -109,6 +109,7 @@ struct Isel {
 
     Node *ret;          /* we store the return into here */
     Htab *locs;         /* decl id => int stkoff */
+    Htab *reglocs;      /* decl id => Loc *reg */
     Htab *globls;       /* decl id => char *globlname */
 
     /* increased when we spill */
diff --git a/6/isel.c b/6/isel.c
index acb3042..b9469fe 100644
--- a/6/isel.c
+++ b/6/isel.c
@@ -94,7 +94,9 @@ static Loc *loc(Isel *s, Node *n)
                     rip = locphysreg(Rrip);
                 l = locmeml(htget(s->globls, n), rip, NULL, mode(n));
             } else {
-                die("%s (id=%ld) not found", namestr(n->expr.args[0]), n->expr.did);
+                if (!hthas(s->reglocs, n))
+                    htput(s->reglocs, n, locreg(mode(n)));
+                return htget(s->reglocs, n);
             }
             break;
         case Olit:
@@ -870,6 +872,7 @@ void genasm(FILE *fd, Func *fn, Htab *globls)
     size_t i, j;
     char buf[128];
 
+    is.reglocs = mkht(dclhash, dcleq);
     is.locs = fn->locs;
     is.globls = globls;
     is.ret = fn->ret;
diff --git a/6/simp.c b/6/simp.c
index 5737103..f57d80d 100644
--- a/6/simp.c
+++ b/6/simp.c
@@ -151,30 +151,6 @@ static Node *disp(int line, uint v)
     return n;
 }
 
-static size_t did(Node *n)
-{
-    if (n->type == Ndecl) {
-        return n->decl.did;
-    } else if (n->type == Nexpr) {
-        assert(exprop(n) == Ovar);
-        return n->expr.did;
-    }
-    dump(n, stderr);
-    die("Can't get did");
-    return 0;
-}
-
-static ulong dclhash(void *dcl)
-{
-    /* large-prime hash. meh. */
-    return did(dcl) * 366787;
-}
-
-static int dcleq(void *a, void *b)
-{
-    return did(a) == did(b);
-}
-
 static void append(Simp *s, Node *n)
 {
     lappend(&s->stmts, &s->nstmts, n);
@@ -325,7 +301,8 @@ static Node *temp(Simp *simp, Node *e)
 
     assert(e->type == Nexpr);
     t = gentemp(simp, e, e->expr.type, &dcl);
-    declarelocal(simp, dcl);
+    if (stacknode(e))
+        declarelocal(simp, dcl);
     return t;
 }
 
@@ -1094,11 +1071,13 @@ static Node *rval(Simp *s, Node *n, Node *dst)
 static void declarelocal(Simp *s, Node *n)
 {
     assert(n->type == Ndecl);
-    s->stksz += size(n);
-    s->stksz = align(s->stksz, min(size(n), Ptrsz));
-    if (debug)
-        printf("declare %s:%s(%zd) at %zd\n", declname(n), tystr(decltype(n)), n->decl.did, s->stksz);
-    htput(s->locs, n, (void*)s->stksz);
+    if (stacknode(n)) {
+        s->stksz += size(n);
+        s->stksz = align(s->stksz, min(size(n), Ptrsz));
+        if (debug)
+            printf("declare %s:%s(%zd) at %zd\n", declname(n), tystr(decltype(n)), n->decl.did, s->stksz);
+        htput(s->locs, n, (void*)s->stksz);
+    }
 }
 
 static void declarearg(Simp *s, Node *n)