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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2015-01-05 00:07:14 +01:00
commit fcae87e315
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vm_arm.dasc
View File

@ -543,9 +543,8 @@ static void build_subroutines(BuildCtx *ctx)
|1: |1:
| beq ->cont_ffi_callback // cont = 1: return from FFI callback. | beq ->cont_ffi_callback // cont = 1: return from FFI callback.
| // cont = 0: tailcall from C function. | // cont = 0: tailcall from C function.
| ldr CARG3, [BASE, FRAME_FUNC] | sub CARG4, CARG4, #16
| sub CARG4, CARG4, #16 | sub RC, CARG4, BASE
| sub RC, CARG4, BASE
| b ->vm_call_tail | b ->vm_call_tail
|.endif |.endif
| |
@ -3749,7 +3748,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
case BC_TSETR: case BC_TSETR:
| decode_RB8 RB, INS | decode_RB8 RB, INS
| decode_RC8 RC, INS | decode_RC8 RC, INS
| // RA = dst*8, RB = table*8, RC = key*8 | // RA = src*8, RB = table*8, RC = key*8
| ldr TAB:CARG2, [BASE, RB] | ldr TAB:CARG2, [BASE, RB]
| ldr CARG3, [BASE, RC] | ldr CARG3, [BASE, RC]
| ldrb INS, TAB:CARG2->marked | ldrb INS, TAB:CARG2->marked

3
src/vm_x86.dasc
View File

@ -4649,8 +4649,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| jnz <4 | jnz <4
| movzx RA, PC_RA | movzx RA, PC_RA
| not RAa | not RAa
| lea RA, [BASE+RA*8] | mov LFUNC:KBASE, [BASE+RA*8-8] // Need to prepare KBASE.
| mov LFUNC:KBASE, [RA-8] // Need to prepare KBASE.
| mov KBASE, LFUNC:KBASE->pc | mov KBASE, LFUNC:KBASE->pc
| mov KBASE, [KBASE+PC2PROTO(k)] | mov KBASE, [KBASE+PC2PROTO(k)]
| jmp <4 | jmp <4