aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2016-05-28 00:35:07 +0200
committerMike Pall <mike>2016-05-28 00:35:07 +0200
commit6360f6e10675d4337bbe0c79a67b40d6aa631393 (patch)
tree2ea9d5a8a501ea0e5f853d0ac2b74311a38f1416
parent9fa843aefbf4eb1bc91dd6ca4f947365b5393e26 (diff)
downloadluajit-6360f6e10675d4337bbe0c79a67b40d6aa631393.tar.gz
luajit-6360f6e10675d4337bbe0c79a67b40d6aa631393.tar.bz2
luajit-6360f6e10675d4337bbe0c79a67b40d6aa631393.zip
Fix collateral damage from LJ_GC64 changes to asm_href().
-rw-r--r--src/lj_asm_x86.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
index 26705e2c..f5230a44 100644
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -1180,7 +1180,7 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge)
1180 lua_assert(irt_ispri(kt) && !irt_isnil(kt)); 1180 lua_assert(irt_ispri(kt) && !irt_isnil(kt));
1181 emit_u32(as, (irt_toitype(kt)<<15)|0x7fff); 1181 emit_u32(as, (irt_toitype(kt)<<15)|0x7fff);
1182 emit_rmro(as, XO_ARITHi, XOg_CMP, dest, offsetof(Node, key.it)); 1182 emit_rmro(as, XO_ARITHi, XOg_CMP, dest, offsetof(Node, key.it));
1183#else 1183#endif
1184 } else { 1184 } else {
1185 if (!irt_ispri(kt)) { 1185 if (!irt_ispri(kt)) {
1186 lua_assert(irt_isaddr(kt)); 1186 lua_assert(irt_isaddr(kt));
@@ -1194,7 +1194,6 @@ static void asm_href(ASMState *as, IRIns *ir, IROp merge)
1194 lua_assert(!irt_isnil(kt)); 1194 lua_assert(!irt_isnil(kt));
1195 emit_i8(as, irt_toitype(kt)); 1195 emit_i8(as, irt_toitype(kt));
1196 emit_rmro(as, XO_ARITHi8, XOg_CMP, dest, offsetof(Node, key.it)); 1196 emit_rmro(as, XO_ARITHi8, XOg_CMP, dest, offsetof(Node, key.it));
1197#endif
1198 } 1197 }
1199 emit_sfixup(as, l_loop); 1198 emit_sfixup(as, l_loop);
1200 checkmclim(as); 1199 checkmclim(as);