8g: fix 386 floating point stack bug

Also fixes issue 310 comment 5 error.
Fixes #310.

R=rsc
https://golang.org/cl/163042

diff --git a/src/cmd/8c/reg.c b/src/cmd/8c/reg.c
index a94653fff0d3e9fc8668a7cbfb03373258ef78c5..837da2d04c077cd866f249b81b2fdd6f9bb013bc 100644 (file)
--- a/src/cmd/8c/reg.c
+++ b/src/cmd/8c/reg.c
@@ -254,7 +254,9 @@ regopt(Prog *p)
                 */
                case AFMOVDP:
                case AFMOVFP:
+               case AFMOVLP:
                case AFMOVVP:
+               case AFMOVWP:
                case ACALL:
                        for(z=0; z<BITS; z++)
                                addrs.b[z] |= bit.b[z];

diff --git a/src/cmd/8g/gsubr.c b/src/cmd/8g/gsubr.c
old mode 100755 (executable)
new mode 100644 (file)
index 71a7494..2e8c01b
--- a/src/cmd/8g/gsubr.c
+++ b/src/cmd/8g/gsubr.c
@@ -1289,10 +1289,12 @@ gmove(Node *f, Node *t)
                if(t->op == OREGISTER)
                        goto hardmem;
                nodreg(&r1, types[ft], D_F0);
-               if(ft == TFLOAT32 && f->op != OREGISTER)
-                       gins(AFMOVF, f, &r1);
-               else
-                       gins(AFMOVD, f, &r1);
+               if(f->op != OREGISTER) {
+                       if(ft == TFLOAT32)
+                               gins(AFMOVF, f, &r1);
+                       else
+                               gins(AFMOVD, f, &r1);
+               }
 
                // set round to zero mode during conversion
                tempalloc(&t1, types[TUINT16]);

diff --git a/src/cmd/8g/reg.c b/src/cmd/8g/reg.c
index cd98be4e61011d7d4390dc40193a532b36630042..568f72912f56dac7621814b78e6ed9cd9d3085dd 100644 (file)
--- a/src/cmd/8g/reg.c
+++ b/src/cmd/8g/reg.c
@@ -306,8 +306,9 @@ regopt(Prog *firstp)
                 */
                case AFMOVDP:
                case AFMOVFP:
-               case AFMOVVP:
                case AFMOVLP:
+               case AFMOVVP:
+               case AFMOVWP:
                case ACALL:
                        for(z=0; z<BITS; z++)
                                addrs.b[z] |= bit.b[z];