From 54e986a51db56b34cae7f50a86d6d8098a7e20f0 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Sun, 10 Apr 2011 17:00:32 +0200
Subject: [PATCH] ARM: Misc. fixes for interpreter.

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

diff --git a/src/buildvm_arm.dasc b/src/buildvm_arm.dasc
index 7a5196d1..2ad02b74 100644
--- a/src/buildvm_arm.dasc
+++ b/src/buildvm_arm.dasc
@@ -538,7 +538,7 @@ static void build_subroutines(BuildCtx *ctx)
   |  str TAB:RB, [CARG2]
   |   str CARG4, [CARG2, #4]
   |2:
-  |   mvn CARG4, #~LJ_TISNUM
+  |   mvn CARG4, #~LJ_TSTR
   |  str STR:RC, TMPDlo
   |   str CARG4, TMPDhi
   |  mov CARG3, TMPDp
@@ -1505,6 +1505,7 @@ static void build_subroutines(BuildCtx *ctx)
   |  bhi >5				// Need to grow stack.
   |   blx CARG3				// (lua_State *L)
   |  // Either throws an error, or recovers and returns -1, 0 or nresults+1.
+  |   ldr BASE, L->base
   |  cmp CRET1, #0
   |   lsl RC, CRET1, #3
   |   sub RA, BASE, #8