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 2016-03-30 16:30:44 +02:00
commit 6e623b9914
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vm_mips.dasc
View File

@ -1875,7 +1875,8 @@ static void build_subroutines(BuildCtx *ctx)
| |
|.ffunc string_char // Only handle the 1-arg case here. |.ffunc string_char // Only handle the 1-arg case here.
| ffgccheck | ffgccheck
|. lw CARG3, HI(BASE) |. nop
| lw CARG3, HI(BASE)
| lw CARG1, LO(BASE) | lw CARG1, LO(BASE)
| li TMP1, 255 | li TMP1, 255
| xori AT, NARGS8:RC, 8 // Exactly 1 argument. | xori AT, NARGS8:RC, 8 // Exactly 1 argument.
@ -1902,7 +1903,8 @@ static void build_subroutines(BuildCtx *ctx)
| |
|.ffunc string_sub |.ffunc string_sub
| ffgccheck | ffgccheck
|. addiu AT, NARGS8:RC, -16 |. nop
| addiu AT, NARGS8:RC, -16
| lw CARG3, 16+HI(BASE) | lw CARG3, 16+HI(BASE)
| lw TMP0, HI(BASE) | lw TMP0, HI(BASE)
| lw STR:CARG1, LO(BASE) | lw STR:CARG1, LO(BASE)
@ -1946,7 +1948,8 @@ static void build_subroutines(BuildCtx *ctx)
|.macro ffstring_op, name |.macro ffstring_op, name
| .ffunc string_ .. name | .ffunc string_ .. name
| ffgccheck | ffgccheck
|. lw CARG3, HI(BASE) |. nop
| lw CARG3, HI(BASE)
| lw STR:CARG2, LO(BASE) | lw STR:CARG2, LO(BASE)
| beqz NARGS8:RC, ->fff_fallback | beqz NARGS8:RC, ->fff_fallback
|. li AT, LJ_TSTR |. li AT, LJ_TSTR