diff options
author | Mike Pall <mike> | 2012-01-23 19:10:14 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2012-01-23 19:17:19 +0100 |
commit | 93a71f6a52538b49c4ac0d34a9d9f7ba8feb8ccc (patch) | |
tree | 32a943a09e1b17a61e9913783e409ed8d3e52b06 /src | |
parent | b9651b4ba2a7a76d722acbb4e13d29866d517868 (diff) | |
download | luajit-93a71f6a52538b49c4ac0d34a9d9f7ba8feb8ccc.tar.gz luajit-93a71f6a52538b49c4ac0d34a9d9f7ba8feb8ccc.tar.bz2 luajit-93a71f6a52538b49c4ac0d34a9d9f7ba8feb8ccc.zip |
ARM: Avoid pointless arg clearing in BC_IFUNCF. Fix comments.
Diffstat (limited to 'src')
-rw-r--r-- | src/buildvm_arm.dasc | 8 | ||||
-rw-r--r-- | src/buildvm_arm.h | 2 |
2 files changed, 5 insertions, 5 deletions
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) | |||
1571 | | add CARG1, STR:CARG1, #sizeof(GCstr)-1 | 1571 | | add CARG1, STR:CARG1, #sizeof(GCstr)-1 |
1572 | | movgt RB, CARG2 | 1572 | | movgt RB, CARG2 |
1573 | | add CARG2, CARG1, CARG3 | 1573 | | add CARG2, CARG1, CARG3 |
1574 | | subs CARG3, RB, CARG3 // len = start - end | 1574 | | subs CARG3, RB, CARG3 // len = end - start |
1575 | | add CARG3, CARG3, #1 // len += 1 | 1575 | | add CARG3, CARG3, #1 // len += 1 |
1576 | | bge ->fff_newstr | 1576 | | bge ->fff_newstr |
1577 | |->fff_emptystr: | 1577 | |->fff_emptystr: |
@@ -2217,7 +2217,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
2217 | | ins_callt | 2217 | | ins_callt |
2218 | #endif | 2218 | #endif |
2219 | | | 2219 | | |
2220 | |->cont_ffi_callback: // Return from FFI callback. | 2220 | |->cont_ffi_callback: // Return from FFI callback. |
2221 | #if LJ_HASFFI | 2221 | #if LJ_HASFFI |
2222 | | ldr CTSTATE, [DISPATCH, #DISPATCH_GL(ctype_state)] | 2222 | | ldr CTSTATE, [DISPATCH, #DISPATCH_GL(ctype_state)] |
2223 | | str BASE, L->base | 2223 | | str BASE, L->base |
@@ -3369,7 +3369,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
3369 | | str BASE, L->base | 3369 | | str BASE, L->base |
3370 | | mov CARG1, L | 3370 | | mov CARG1, L |
3371 | | str PC, SAVE_PC | 3371 | | str PC, SAVE_PC |
3372 | | bl extern lj_tab_reasize // (lua_State *L, GCtab *t, int nasize) | 3372 | | bl extern lj_tab_reasize // (lua_State *L, GCtab *t, int nasize) |
3373 | | // Must not reallocate the stack. | 3373 | | // Must not reallocate the stack. |
3374 | | IOS ldr BASE, L->base | 3374 | | IOS ldr BASE, L->base |
3375 | | b <1 | 3375 | | b <1 |
@@ -3945,7 +3945,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
3945 | |2: | 3945 | |2: |
3946 | | cmp NARGS8:RC, CARG2, lsl #3 // Check for missing parameters. | 3946 | | cmp NARGS8:RC, CARG2, lsl #3 // Check for missing parameters. |
3947 | | mvn CARG4, #~LJ_TNIL | 3947 | | mvn CARG4, #~LJ_TNIL |
3948 | | ble >3 | 3948 | | blo >3 |
3949 | if (op == BC_JFUNCF) { | 3949 | if (op == BC_JFUNCF) { |
3950 | | decode_RD RC, INS | 3950 | | decode_RD RC, INS |
3951 | | b =>BC_JLOOP | 3951 | | 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] = { | |||
5687 | 0xe15b0181, | 5687 | 0xe15b0181, |
5688 | 0xe3e03000, | 5688 | 0xe3e03000, |
5689 | 0x000a0000, | 5689 | 0x000a0000, |
5690 | 0xda000000, | 5690 | 0x3a000000, |
5691 | 0x00050003, | 5691 | 0x00050003, |
5692 | 0x00000000, | 5692 | 0x00000000, |
5693 | 0xe1a0b82e, | 5693 | 0xe1a0b82e, |