diff options
Diffstat (limited to 'src/lj_asm_mips.h')
-rw-r--r-- | src/lj_asm_mips.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lj_asm_mips.h b/src/lj_asm_mips.h index 1d4c8a25..10a5dbe9 100644 --- a/src/lj_asm_mips.h +++ b/src/lj_asm_mips.h | |||
@@ -1732,7 +1732,7 @@ static void asm_head_root_base(ASMState *as) | |||
1732 | } | 1732 | } |
1733 | 1733 | ||
1734 | /* Coalesce BASE register for a side trace. */ | 1734 | /* Coalesce BASE register for a side trace. */ |
1735 | static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow) | 1735 | static Reg asm_head_side_base(ASMState *as, IRIns *irp) |
1736 | { | 1736 | { |
1737 | IRIns *ir = IR(REF_BASE); | 1737 | IRIns *ir = IR(REF_BASE); |
1738 | Reg r = ir->r; | 1738 | Reg r = ir->r; |
@@ -1742,15 +1742,15 @@ static RegSet asm_head_side_base(ASMState *as, IRIns *irp, RegSet allow) | |||
1742 | if (rset_test(as->modset, r) || irt_ismarked(ir->t)) | 1742 | if (rset_test(as->modset, r) || irt_ismarked(ir->t)) |
1743 | ir->r = RID_INIT; /* No inheritance for modified BASE register. */ | 1743 | ir->r = RID_INIT; /* No inheritance for modified BASE register. */ |
1744 | if (irp->r == r) { | 1744 | if (irp->r == r) { |
1745 | rset_clear(allow, r); /* Mark same BASE register as coalesced. */ | 1745 | return r; /* Same BASE register already coalesced. */ |
1746 | } else if (ra_hasreg(irp->r) && rset_test(as->freeset, irp->r)) { | 1746 | } else if (ra_hasreg(irp->r) && rset_test(as->freeset, irp->r)) { |
1747 | rset_clear(allow, irp->r); | ||
1748 | emit_move(as, r, irp->r); /* Move from coalesced parent reg. */ | 1747 | emit_move(as, r, irp->r); /* Move from coalesced parent reg. */ |
1748 | return irp->r; | ||
1749 | } else { | 1749 | } else { |
1750 | emit_getgl(as, r, jit_base); /* Otherwise reload BASE. */ | 1750 | emit_getgl(as, r, jit_base); /* Otherwise reload BASE. */ |
1751 | } | 1751 | } |
1752 | } | 1752 | } |
1753 | return allow; | 1753 | return RID_NONE; |
1754 | } | 1754 | } |
1755 | 1755 | ||
1756 | /* -- Tail of trace ------------------------------------------------------- */ | 1756 | /* -- Tail of trace ------------------------------------------------------- */ |