From 93a71f6a52538b49c4ac0d34a9d9f7ba8feb8ccc Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 23 Jan 2012 19:10:14 +0100
Subject: ARM: Avoid pointless arg clearing in BC_IFUNCF. Fix comments.
---
src/buildvm_arm.dasc | 8 ++++----
src/buildvm_arm.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/buildvm_arm.dasc b/src/buildvm_arm.dasc
index 60857c08..09420553 100644
--- a/src/buildvm_arm.dasc
+++ b/src/buildvm_arm.dasc
@@ -1571,7 +1571,7 @@ static void build_subroutines(BuildCtx *ctx)
| add CARG1, STR:CARG1, #sizeof(GCstr)-1
| movgt RB, CARG2
| add CARG2, CARG1, CARG3
- | subs CARG3, RB, CARG3 // len = start - end
+ | subs CARG3, RB, CARG3 // len = end - start
| add CARG3, CARG3, #1 // len += 1
| bge ->fff_newstr
|->fff_emptystr:
@@ -2217,7 +2217,7 @@ static void build_subroutines(BuildCtx *ctx)
| ins_callt
#endif
|
- |->cont_ffi_callback: // Return from FFI callback.
+ |->cont_ffi_callback: // Return from FFI callback.
#if LJ_HASFFI
| ldr CTSTATE, [DISPATCH, #DISPATCH_GL(ctype_state)]
| str BASE, L->base
@@ -3369,7 +3369,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| str BASE, L->base
| mov CARG1, L
| str PC, SAVE_PC
- | bl extern lj_tab_reasize // (lua_State *L, GCtab *t, int nasize)
+ | bl extern lj_tab_reasize // (lua_State *L, GCtab *t, int nasize)
| // Must not reallocate the stack.
| IOS ldr BASE, L->base
| b <1
@@ -3945,7 +3945,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|2:
| cmp NARGS8:RC, CARG2, lsl #3 // Check for missing parameters.
| mvn CARG4, #~LJ_TNIL
- | ble >3
+ | blo >3
if (op == BC_JFUNCF) {
| decode_RD RC, INS
| b =>BC_JLOOP
diff --git a/src/buildvm_arm.h b/src/buildvm_arm.h
index 9d26dd8e..2c97cee0 100644
--- a/src/buildvm_arm.h
+++ b/src/buildvm_arm.h
@@ -5687,7 +5687,7 @@ static const unsigned int build_actionlist[5777] = {
0xe15b0181,
0xe3e03000,
0x000a0000,
-0xda000000,
+0x3a000000,
0x00050003,
0x00000000,
0xe1a0b82e,
--
cgit v1.2.3-55-g6feb