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

PPC64: Fix external branches that should address on R12

Browse Source 
The TOC register was not set correctly when branching with other
registers as the PIC code setup uses the R12 reference in order to set
the R2 (TOC register). This is only acknowledged by using LuaJIT as a
library, as torch uses on it qtlua/qlua subproject.
This commit is contained in:
Gustavo Serra Scalet 2016-02-19 15:09:18 -02:00
parent 0213722d42
commit 030a8643e7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vm_ppc64.dasc
View File

@ -59,7 +59,7 @@
|.define RA, r20 // Callee-save. |.define RA, r20 // Callee-save.
|.define RB, r10 |.define RB, r10
|.define RC, r11 |.define RC, r11
|.define RD, r12 |.define RD, r12 // Also used as function linkage register
|.define INS, r7 // Overlaps CARG5. |.define INS, r7 // Overlaps CARG5.
| |
|.define TMP0, r0 |.define TMP0, r0
@ -696,7 +696,8 @@ static void build_subroutines(BuildCtx *ctx)
| std TMP1, SAVE_CFRAME | std TMP1, SAVE_CFRAME
| std sp, L->cframe // Add our C frame to cframe chain. | std sp, L->cframe // Add our C frame to cframe chain.
| std L, DISPATCH_GL(cur_L)(DISPATCH) | std L, DISPATCH_GL(cur_L)(DISPATCH)
| mtctr CARG4 | mr r12, CARG4 // keep r12 for function linkage.
| mtctr r12
| bctrl // (lua_State *L, lua_CFunction func, void *ud) | bctrl // (lua_State *L, lua_CFunction func, void *ud)
| mr. BASE, CRET1 | mr. BASE, CRET1
| li PC, FRAME_CP | li PC, FRAME_CP
@ -2059,7 +2060,8 @@ static void build_subroutines(BuildCtx *ctx)
| std TMP1, L->top | std TMP1, L->top
| mr CARG1, L | mr CARG1, L
| bgt >5 // Need to grow stack. | bgt >5 // Need to grow stack.
| mtctr TMP3 | mr r12, TMP3 // keep r12 for function linkage.
| mtctr r12
| bctrl // (lua_State *L) | bctrl // (lua_State *L)
| // Either throws an error, or recovers and returns -1, 0 or nresults+1. | // Either throws an error, or recovers and returns -1, 0 or nresults+1.
| ld BASE, L->base | ld BASE, L->base
@ -4326,7 +4328,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| cmpld TMP1, TMP2 | cmpld TMP1, TMP2
| std RC, L->top | std RC, L->top
| li_vmstate C | li_vmstate C
| mtctr RD | mtctr RD // RD is r12, the function linkage register
if (op == BC_FUNCCW) { if (op == BC_FUNCCW) {
| ld CARG2, CFUNC:RB->f | ld CARG2, CFUNC:RB->f
} }