Commit a093f3d5 authored by Ken Thompson's avatar Ken Thompson

fix tst instruction on arm to set overflow bit

R=r
CC=golang-dev
https://golang.org/cl/4009041
parent d9ffbc4b
...@@ -832,7 +832,7 @@ gencmp0(Node *n, Type *t, int o, Prog *to) ...@@ -832,7 +832,7 @@ gencmp0(Node *n, Type *t, int o, Prog *to)
} else } else
gins(ATST, &n1, N); gins(ATST, &n1, N);
a = optoas(o, t); a = optoas(o, t);
patch(gbranch(optoas(o, t), t), to); patch(gbranch(a, t), to);
regfree(&n1); regfree(&n1);
} }
......
...@@ -1559,11 +1559,9 @@ if(debug['G']) print("%ux: %s: arm %d %d %d\n", (uint32)(p->pc), p->from.sym->na ...@@ -1559,11 +1559,9 @@ if(debug['G']) print("%ux: %s: arm %d %d %d\n", (uint32)(p->pc), p->from.sym->na
o1 |= (p->from.reg<<16); o1 |= (p->from.reg<<16);
o1 |= (p->to.reg<<12); o1 |= (p->to.reg<<12);
break; break;
case 90: /* tst reg */ case 90: /* tst reg */
o1 = oprrr(AMOVW, p->scond); o1 = oprrr(ACMP+AEND, p->scond);
o1 |= p->from.reg | (p->from.reg<<12); o1 |= p->from.reg<<16;
o1 |= 1 << 20; // SBIT
break; break;
} }
...@@ -1716,6 +1714,8 @@ oprrr(int a, int sc) ...@@ -1716,6 +1714,8 @@ oprrr(int a, int sc)
return o | (0xe<<24) | (0x0<<20) | (0xb<<8) | (1<<4); return o | (0xe<<24) | (0x0<<20) | (0xb<<8) | (1<<4);
case AMOVFW+AEND: // copy FtoW case AMOVFW+AEND: // copy FtoW
return o | (0xe<<24) | (0x1<<20) | (0xb<<8) | (1<<4); return o | (0xe<<24) | (0x1<<20) | (0xb<<8) | (1<<4);
case ACMP+AEND: // cmp imm
return o | (0x3<<24) | (0x5<<20);
} }
diag("bad rrr %d", a); diag("bad rrr %d", a);
prasm(curp); prasm(curp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment