From c8d6f078a52adb840e370ed52138ee5d379fe945 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 20 Dec 2010 19:34:15 +0100
Subject: [PATCH] Fix XSTORE for IRT_NUM constants.

---
 src/lj_asm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lj_asm.c b/src/lj_asm.c
index 27ccfe9a..84c37275 100644
--- a/src/lj_asm.c
+++ b/src/lj_asm.c
@@ -2056,7 +2056,8 @@ static void asm_fxstore(ASMState *as, IRIns *ir)
   /* The IRT_I16/IRT_U16 stores should never be simplified for constant
   ** values since mov word [mem], imm16 has a length-changing prefix.
   */
-  if (!asm_isk32(as, ir->op2, &k) || irt_isi16(ir->t) || irt_isu16(ir->t)) {
+  if (irt_isi16(ir->t) || irt_isu16(ir->t) || irt_isnum(ir->t) ||
+      !asm_isk32(as, ir->op2, &k)) {
     RegSet allow8 = irt_isnum(ir->t) ? RSET_FPR :
 		    (irt_isi8(ir->t) || irt_isu8(ir->t)) ? RSET_GPR8 : RSET_GPR;
     src = osrc = ra_alloc1(as, ir->op2, allow8);