diff options
Diffstat (limited to 'src/vm_arm.dasc')
-rw-r--r-- | src/vm_arm.dasc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc index 58efabce..9db3b827 100644 --- a/src/vm_arm.dasc +++ b/src/vm_arm.dasc | |||
@@ -336,7 +336,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
336 | | // - The GC shrinks the stack in between. | 336 | | // - The GC shrinks the stack in between. |
337 | | // - A return back from a lua_call() with (high) nresults adjustment. | 337 | | // - A return back from a lua_call() with (high) nresults adjustment. |
338 | | str BASE, L->top // Save current top held in BASE (yes). | 338 | | str BASE, L->top // Save current top held in BASE (yes). |
339 | | mov CARG2, KBASE | 339 | | lsr CARG2, KBASE, #3 |
340 | | mov CARG1, L | 340 | | mov CARG1, L |
341 | | bl extern lj_state_growstack // (lua_State *L, int n) | 341 | | bl extern lj_state_growstack // (lua_State *L, int n) |
342 | | ldr BASE, L->top // Need the (realloced) L->top in BASE. | 342 | | ldr BASE, L->top // Need the (realloced) L->top in BASE. |
@@ -390,7 +390,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
390 | | str BASE, L->base | 390 | | str BASE, L->base |
391 | | add PC, PC, #4 // Must point after first instruction. | 391 | | add PC, PC, #4 // Must point after first instruction. |
392 | | str RC, L->top | 392 | | str RC, L->top |
393 | | lsr CARG3, RA, #3 | 393 | | lsr CARG2, RA, #3 |
394 | |2: | 394 | |2: |
395 | | // L->base = new base, L->top = top | 395 | | // L->base = new base, L->top = top |
396 | | str PC, SAVE_PC | 396 | | str PC, SAVE_PC |
@@ -3295,10 +3295,10 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
3295 | | mvn RC, RC | 3295 | | mvn RC, RC |
3296 | | ldr UPVAL:CARG2, [LFUNC:CARG2, RA] | 3296 | | ldr UPVAL:CARG2, [LFUNC:CARG2, RA] |
3297 | | ldr STR:CARG3, [KBASE, RC, lsl #2] | 3297 | | ldr STR:CARG3, [KBASE, RC, lsl #2] |
3298 | | mvn CARG4, #~LJ_TSTR | ||
3299 | | ldrb RB, UPVAL:CARG2->marked | 3298 | | ldrb RB, UPVAL:CARG2->marked |
3300 | | ldr CARG2, UPVAL:CARG2->v | ||
3301 | | ldrb RC, UPVAL:CARG2->closed | 3299 | | ldrb RC, UPVAL:CARG2->closed |
3300 | | ldr CARG2, UPVAL:CARG2->v | ||
3301 | | mvn CARG4, #~LJ_TSTR | ||
3302 | | tst RB, #LJ_GC_BLACK // isblack(uv) | 3302 | | tst RB, #LJ_GC_BLACK // isblack(uv) |
3303 | | ldrb RB, STR:CARG3->marked | 3303 | | ldrb RB, STR:CARG3->marked |
3304 | | strd CARG34, [CARG2] | 3304 | | strd CARG34, [CARG2] |