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

Fixes for negative string.sub arguments and __index metamethod calls.

Browse Source
This commit is contained in:
Michael Munday 2017-01-04 12:25:15 -05:00
parent 705784a4f9
commit e598c067c3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vm_s390x.dasc
View File

@ -705,7 +705,7 @@ static void build_subroutines(BuildCtx *ctx)
|3: // Call __index metamethod. |3: // Call __index metamethod.
| // BASE = base, L->top = new base, stack = cont/func/t/k | // BASE = base, L->top = new base, stack = cont/func/t/k
| lg RA, L:RB->top | lg RA, L:RB->top
| stg PC, -24(PC) // [cont|PC] | stg PC, -24(RA) // [cont|PC]
| lay PC, FRAME_CONT(RA) | lay PC, FRAME_CONT(RA)
| sgr PC, BASE | sgr PC, BASE
| lg LFUNC:RB, -16(RA) // Guaranteed to be a function here. | lg LFUNC:RB, -16(RA) // Guaranteed to be a function here.
@ -1603,7 +1603,7 @@ static void build_subroutines(BuildCtx *ctx)
| lg STR:RB, 0(BASE) | lg STR:RB, 0(BASE)
| checkstr STR:RB, ->fff_fallback | checkstr STR:RB, ->fff_fallback
| lg ITYPE, 8(BASE) | lg ITYPE, 8(BASE)
| llgfr RA, ITYPE // Must clear hiword for lea below. | lgfr RA, ITYPE
| srag ITYPE, ITYPE, 47(r0) | srag ITYPE, ITYPE, 47(r0)
| cghi ITYPE, LJ_TISNUM | cghi ITYPE, LJ_TISNUM
| jne ->fff_fallback | jne ->fff_fallback
@ -1641,8 +1641,8 @@ static void build_subroutines(BuildCtx *ctx)
| j <3 | j <3
| |
|->fff_emptystr: // Range underflow. |->fff_emptystr: // Range underflow.
| lghi RD, 0 | lghi TMPR1, 0
| j <3 | j <4
| |
|.macro ffstring_op, name |.macro ffstring_op, name
| .ffunc_1 string_ .. name | .ffunc_1 string_ .. name