gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: Minor fixes and cleanups for type checks.

Browse Source
This commit is contained in:
Mike Pall 2011-04-04 01:44:54 +02:00
parent 33bab1f76c
commit f1c79f80c2
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/buildvm_arm.dasc
View File

@ -148,9 +148,9 @@
|.macro ins_callt |.macro ins_callt
| // BASE = new base, CARG3 = LFUNC/CFUNC, RC = nargs*8, FRAME_PC(BASE) = PC | // BASE = new base, CARG3 = LFUNC/CFUNC, RC = nargs*8, FRAME_PC(BASE) = PC
| ldr PC, LFUNC:CARG3->field_pc | ldr PC, LFUNC:CARG3->field_pc
| ldrb OP, [PC] | ldrb OP, [PC] // STALL: load PC. early PC.
| ldr INS, [PC], #4 | ldr INS, [PC], #4
| ldr OP, [DISPATCH, OP, lsl #2] | ldr OP, [DISPATCH, OP, lsl #2] // STALL: load OP. early OP.
| decode_RA8 RA, INS | decode_RA8 RA, INS
| add RA, RA, BASE | add RA, RA, BASE
| bx OP | bx OP
@ -159,13 +159,14 @@
|.macro ins_call |.macro ins_call
| // BASE = new base, CARG3 = LFUNC/CFUNC, RC = nargs*8, PC = caller PC | // BASE = new base, CARG3 = LFUNC/CFUNC, RC = nargs*8, PC = caller PC
| str PC, [BASE, FRAME_PC] | str PC, [BASE, FRAME_PC]
| ins_callt | ins_callt // STALL: locked PC.
|.endmacro |.endmacro
| |
|//----------------------------------------------------------------------- |//-----------------------------------------------------------------------
| |
|// Macros to test operand types. |// Macros to test operand types.
|.macro checktp, reg, tp; cmn reg, #-tp; .endmacro |.macro checktp, reg, tp; cmn reg, #-tp; .endmacro
|.macro checktpeq, reg, tp; cmneq reg, #-tp; .endmacro
|.macro checkstr, reg, target; checktp reg, LJ_TSTR; bne target; .endmacro |.macro checkstr, reg, target; checktp reg, LJ_TSTR; bne target; .endmacro
|.macro checktab, reg, target; checktp reg, LJ_TTAB; bne target; .endmacro |.macro checktab, reg, target; checktp reg, LJ_TTAB; bne target; .endmacro
|.macro checkfunc, reg, target; checktp reg, LJ_TFUNC; bne target; .endmacro |.macro checkfunc, reg, target; checktp reg, LJ_TFUNC; bne target; .endmacro
@ -930,7 +931,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| ldr CARG1, [RC, #4] | ldr CARG1, [RC, #4]
| add RA, BASE, RA | add RA, BASE, RA
| ins_next2 | ins_next2
| cmn CARG1, #-LJ_TTRUE | checktp CARG1, LJ_TTRUE
| mvnls CARG2, #~LJ_TFALSE | mvnls CARG2, #~LJ_TFALSE
| mvnhi CARG2, #~LJ_TTRUE | mvnhi CARG2, #~LJ_TTRUE
| str CARG2, [RA, #4] | str CARG2, [RA, #4]
@ -942,7 +943,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| ldrd CARG12, [BASE, RC] | ldrd CARG12, [BASE, RC]
| ins_next1 | ins_next1
| ins_next2 | ins_next2
| cmn CARG2, #-LJ_TISNUM | checktp CARG2, LJ_TISNUM
| bne >5 | bne >5
| rsbs CARG1, CARG1, #0 | rsbs CARG1, CARG1, #0
| bvs >4 | bvs >4
@ -1348,19 +1349,19 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| add RC, PC, RC, lsl #2 | add RC, PC, RC, lsl #2
if (!vk) { if (!vk) {
| ldrd CARG34, FOR_STOP | ldrd CARG34, FOR_STOP
| cmn CARG2, #-LJ_TISNUM | checktp CARG2, LJ_TISNUM
| ldr RB, FOR_TSTEP | ldr RB, FOR_TSTEP
| bne >5 | bne >5
| cmn CARG4, #-LJ_TISNUM | checktp CARG4, LJ_TISNUM
| ldr CARG4, FOR_STEP | ldr CARG4, FOR_STEP
| cmneq RB, #-LJ_TISNUM | checktpeq RB, LJ_TISNUM
| bne ->vmeta_for | bne ->vmeta_for
| cmp CARG4, #0 | cmp CARG4, #0
| blt >4 | blt >4
| cmp CARG1, CARG3 | cmp CARG1, CARG3
} else { } else {
| ldrd CARG34, FOR_STEP | ldrd CARG34, FOR_STEP
| cmn CARG2, #-LJ_TISNUM | checktp CARG2, LJ_TISNUM
| bne >5 | bne >5
| adds CARG1, CARG1, CARG3 | adds CARG1, CARG1, CARG3
| ldr CARG4, FOR_STOP | ldr CARG4, FOR_STOP
@ -1553,7 +1554,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
|1: |1:
| cmp RA, RC // Less args than parameters? | cmp RA, RC // Less args than parameters?
| ldrdlo CARG12, [RA], #8 | ldrdlo CARG12, [RA], #8
| mvnhs CARG2, CARG3 | movhs CARG2, CARG3
| strlo CARG3, [RA, #-4] // Clear old fixarg slot (help the GC). | strlo CARG3, [RA, #-4] // Clear old fixarg slot (help the GC).
|2: |2:
| subs RB, RB, #1 | subs RB, RB, #1