aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2017-02-20 02:42:54 +0100
committerMike Pall <mike>2017-02-20 02:42:54 +0100
commitf640ec713a57cfb7d16c8cf81d0af487dd9038c2 (patch)
tree198479729d452bd8a4b114221f1f695e38034253 /src
parent0a46ef1ac6792b27659eafceceaf998a568ee6dd (diff)
downloadluajit-f640ec713a57cfb7d16c8cf81d0af487dd9038c2.tar.gz
luajit-f640ec713a57cfb7d16c8cf81d0af487dd9038c2.tar.bz2
luajit-f640ec713a57cfb7d16c8cf81d0af487dd9038c2.zip
x64/LJ_GC64: Fix (currently unused) integer stores in asm_tvptr().
Diffstat (limited to '')
-rw-r--r--src/lj_asm_x86.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h
index b6754cfa..fceb1877 100644
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -1065,7 +1065,8 @@ static void asm_tvptr(ASMState *as, Reg dest, IRRef ref)
1065 emit_u32(as, irt_toitype(ir->t) << 15); 1065 emit_u32(as, irt_toitype(ir->t) << 15);
1066 emit_rmro(as, XO_ARITHi, XOg_OR, dest, 4); 1066 emit_rmro(as, XO_ARITHi, XOg_OR, dest, 4);
1067 } else { 1067 } else {
1068 emit_movmroi(as, dest, 4, (irt_toitype(ir->t) << 15) | 0x7fff); 1068 /* Currently, no caller passes integers that might end up here. */
1069 emit_movmroi(as, dest, 4, (irt_toitype(ir->t) << 15));
1069 } 1070 }
1070 emit_movtomro(as, REX_64IR(ir, src), dest, 0); 1071 emit_movtomro(as, REX_64IR(ir, src), dest, 0);
1071 } 1072 }