diff options
| author | Mike Pall <mike> | 2011-04-10 17:00:32 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2011-04-10 17:00:32 +0200 |
| commit | 54e986a51db56b34cae7f50a86d6d8098a7e20f0 (patch) | |
| tree | d0f18711e7adf29ec926bd47f19443172a4f4f2e /src | |
| parent | 040c8c5737ccc2071a03da0217157ee8d4571d56 (diff) | |
| download | luajit-54e986a51db56b34cae7f50a86d6d8098a7e20f0.tar.gz luajit-54e986a51db56b34cae7f50a86d6d8098a7e20f0.tar.bz2 luajit-54e986a51db56b34cae7f50a86d6d8098a7e20f0.zip | |
ARM: Misc. fixes for interpreter.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildvm_arm.dasc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buildvm_arm.dasc b/src/buildvm_arm.dasc index 7a5196d1..2ad02b74 100644 --- a/src/buildvm_arm.dasc +++ b/src/buildvm_arm.dasc | |||
| @@ -538,7 +538,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
| 538 | | str TAB:RB, [CARG2] | 538 | | str TAB:RB, [CARG2] |
| 539 | | str CARG4, [CARG2, #4] | 539 | | str CARG4, [CARG2, #4] |
| 540 | |2: | 540 | |2: |
| 541 | | mvn CARG4, #~LJ_TISNUM | 541 | | mvn CARG4, #~LJ_TSTR |
| 542 | | str STR:RC, TMPDlo | 542 | | str STR:RC, TMPDlo |
| 543 | | str CARG4, TMPDhi | 543 | | str CARG4, TMPDhi |
| 544 | | mov CARG3, TMPDp | 544 | | mov CARG3, TMPDp |
| @@ -1505,6 +1505,7 @@ static void build_subroutines(BuildCtx *ctx) | |||
| 1505 | | bhi >5 // Need to grow stack. | 1505 | | bhi >5 // Need to grow stack. |
| 1506 | | blx CARG3 // (lua_State *L) | 1506 | | blx CARG3 // (lua_State *L) |
| 1507 | | // Either throws an error, or recovers and returns -1, 0 or nresults+1. | 1507 | | // Either throws an error, or recovers and returns -1, 0 or nresults+1. |
| 1508 | | ldr BASE, L->base | ||
| 1508 | | cmp CRET1, #0 | 1509 | | cmp CRET1, #0 |
| 1509 | | lsl RC, CRET1, #3 | 1510 | | lsl RC, CRET1, #3 |
| 1510 | | sub RA, BASE, #8 | 1511 | | sub RA, BASE, #8 |