When we process one block, we start by allocating registers for all the temporaries live at the exit of the block. Before this patch we processed temps first, then in doblk() we would mark globally live registers allocated. This meant that temps could get wrongly assigned a live register. The fix is simple: we now process registers first at block exits, then allocate temps.
Unified · Split
| @@ -359,8 +359,6 @@ doblk(Blk *b, RMap *cur) · 358 unmodified lines | |||
| 359 | Mem *m; | 359 | Mem *m; |
| 360 | Ref *ra[4]; | 360 | Ref *ra[4]; |
| 361 | 361 | ||
| 362 | for (r=0; bsiter(b->out, &r) && r<Tmp0; r++) | ||
| 363 | radd(cur, r, r); | ||
| 364 | if (rtype(b->jmp.arg) == RTmp) | 362 | if (rtype(b->jmp.arg) == RTmp) |
| 365 | b->jmp.arg = ralloc(cur, b->jmp.arg.val); | 363 | b->jmp.arg = ralloc(cur, b->jmp.arg.val); |
| 366 | curi = &insb[NIns]; | 364 | curi = &insb[NIns]; |
| @@ -534,6 +532,8 @@ rega(Fn *fn) · 167 unmodified lines | |||
| 534 | rl[j] = t; | 532 | rl[j] = t; |
| 535 | } | 533 | } |
| 536 | } | 534 | } |
| 535 | for (r=0; bsiter(b->out, &r) && r<Tmp0; r++) | ||
| 536 | radd(&cur, r, r); | ||
| 537 | for (j=0; j<x; j++) | 537 | for (j=0; j<x; j++) |
| 538 | ralloctry(&cur, rl[j], 1); | 538 | ralloctry(&cur, rl[j], 1); |
| 539 | for (j=0; j<x; j++) | 539 | for (j=0; j<x; j++) |