aboutsummaryrefslogtreecommitdiff
path: root/src/lj_asm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lj_asm.c')
-rw-r--r--src/lj_asm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_asm.c b/src/lj_asm.c
index db126d74..bda86fc4 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -636,7 +636,7 @@ static Reg ra_rematk(ASMState *as, IRIns *ir)
636#endif 636#endif
637 } else { 637 } else {
638 lua_assert(ir->o == IR_KINT || ir->o == IR_KGC || 638 lua_assert(ir->o == IR_KINT || ir->o == IR_KGC ||
639 ir->o == IR_KPTR || ir->o == IR_KNULL); 639 ir->o == IR_KPTR || ir->o == IR_KKPTR || ir->o == IR_KNULL);
640 emit_loadi(as, r, ir->i); 640 emit_loadi(as, r, ir->i);
641 } 641 }
642 return r; 642 return r;
@@ -946,7 +946,7 @@ static void ra_left(ASMState *as, Reg dest, IRRef lref)
946#endif 946#endif
947 } else { 947 } else {
948 lua_assert(ir->o == IR_KINT || ir->o == IR_KGC || 948 lua_assert(ir->o == IR_KINT || ir->o == IR_KGC ||
949 ir->o == IR_KPTR || ir->o == IR_KNULL); 949 ir->o == IR_KPTR || ir->o == IR_KKPTR || ir->o == IR_KNULL);
950 emit_loadi(as, dest, ir->i); 950 emit_loadi(as, dest, ir->i);
951 return; 951 return;
952 } 952 }
@@ -1312,7 +1312,7 @@ static void asm_fusexref(ASMState *as, IRRef ref, RegSet allow)
1312{ 1312{
1313 IRIns *ir = IR(ref); 1313 IRIns *ir = IR(ref);
1314 as->mrm.idx = RID_NONE; 1314 as->mrm.idx = RID_NONE;
1315 if (ir->o == IR_KPTR) { 1315 if (ir->o == IR_KPTR || ir->o == IR_KKPTR) {
1316 as->mrm.ofs = ir->i; 1316 as->mrm.ofs = ir->i;
1317 as->mrm.base = RID_NONE; 1317 as->mrm.base = RID_NONE;
1318 } else if (ir->o == IR_STRREF) { 1318 } else if (ir->o == IR_STRREF) {