From 58d0dde0a2df49abc991decbabff15230010829a Mon Sep 17 00:00:00 2001

From: Mike Pall <mike>

Date: Sun, 14 Jan 2018 13:57:00 +0100

Subject: [PATCH 26/72] Fix IR_BUFPUT assembly.

Thanks to Peter Cawley.

---

 src/lj_asm.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lj_asm.c b/src/lj_asm.c

index 753fe6b..5f83779 100644

--- a/src/lj_asm.c

+++ b/src/lj_asm.c

@@ -1119,7 +1119,7 @@ static void asm_bufput(ASMState *as, IRIns *ir)

   const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_buf_putstr];

   IRRef args[3];

   IRIns *irs;

-  int kchar = -1;

+  int kchar = -129;

   args[0] = ir->op1;  /* SBuf * */

   args[1] = ir->op2;  /* GCstr * */

   irs = IR(ir->op2);

@@ -1127,7 +1127,7 @@ static void asm_bufput(ASMState *as, IRIns *ir)

   if (irs->o == IR_KGC) {

     GCstr *s = ir_kstr(irs);

     if (s->len == 1) {  /* Optimize put of single-char string constant. */

-      kchar = strdata(s)[0];

+      kchar = (int8_t)strdata(s)[0];  /* Signed! */

       args[1] = ASMREF_TMP1;  /* int, truncated to char */

       ci = &lj_ir_callinfo[IRCALL_lj_buf_putchar];

     }

@@ -1154,7 +1154,7 @@ static void asm_bufput(ASMState *as, IRIns *ir)

   asm_gencall(as, ci, args);

   if (args[1] == ASMREF_TMP1) {

     Reg tmp = ra_releasetmp(as, ASMREF_TMP1);

-    if (kchar == -1)

+    if (kchar == -129)

       asm_tvptr(as, tmp, irs->op1);

     else

       ra_allockreg(as, kchar, tmp);

-- 

2.20.1