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

PPC: Fix write barrier and linkage for BC_USETV/BC_USETS.

Browse Source 
Some older linkers can't rearrange to accomodate R_PPC_REL14.
This commit is contained in:
Mike Pall 2010-09-13 21:19:33 +02:00
parent cd6a45760a
commit dcfc385bf3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/buildvm_ppc.dasc
View File

@ -1480,24 +1480,25 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| lbz TMP3, UPVAL:RB->marked | lbz TMP3, UPVAL:RB->marked
| lwz CARG2, UPVAL:RB->v | lwz CARG2, UPVAL:RB->v
| andi. TMP3, TMP3, LJ_GC_BLACK // isblack(uv) | andi. TMP3, TMP3, LJ_GC_BLACK // isblack(uv)
| lbz TMP2, UPVAL:RB->closed | lbz TMP0, UPVAL:RB->closed
| evmergehi TMP0, TMP1, TMP1 | evmergehi TMP2, TMP1, TMP1
| evstdd TMP1, 0(CARG2) | evstdd TMP1, 0(CARG2)
| cmplwi cr1, TMP2, 0 | cmplwi cr1, TMP0, 0
| cror 4*cr0+eq, 4*cr0+eq, 4*cr1+eq | cror 4*cr0+eq, 4*cr0+eq, 4*cr1+eq
| subi TMP0, TMP0, LJ_TISNUM | subi TMP2, TMP2, LJ_TISNUM
| bne >2 // Upvalue is closed and black? | bne >2 // Upvalue is closed and black?
|1: |1:
| ins_next | ins_next
| |
|2: // Check if new value is collectable. |2: // Check if new value is collectable.
| cmplwi TMP0, LJ_TISGCV - LJ_TISNUM | cmplwi TMP2, LJ_TISGCV - LJ_TISNUM
| bge <1 // tvisgcv(v) | bge <1 // tvisgcv(v)
| lbz TMP3, GCOBJ:TMP1->gch.marked | lbz TMP3, GCOBJ:TMP1->gch.marked
| andi. TMP3, TMP3, LJ_GC_WHITES // iswhite(v) | andi. TMP3, TMP3, LJ_GC_WHITES // iswhite(v)
| la CARG1, GG_DISP2G(DISPATCH) | la CARG1, GG_DISP2G(DISPATCH)
| // Crossed a write barrier. Move the barrier forward. | // Crossed a write barrier. Move the barrier forward.
| bnel extern lj_gc_barrieruv // (global_State *g, TValue *tv) | beq <1
| bl extern lj_gc_barrieruv // (global_State *g, TValue *tv)
| b <1 | b <1
break; break;
case BC_USETS: case BC_USETS:
@ -1526,7 +1527,8 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| crand 4*cr0+eq, 4*cr0+eq, 4*cr1+eq | crand 4*cr0+eq, 4*cr0+eq, 4*cr1+eq
| la CARG1, GG_DISP2G(DISPATCH) | la CARG1, GG_DISP2G(DISPATCH)
| // Crossed a write barrier. Move the barrier forward. | // Crossed a write barrier. Move the barrier forward.
| bnel extern lj_gc_barrieruv // (global_State *g, TValue *tv) | beq <1
| bl extern lj_gc_barrieruv // (global_State *g, TValue *tv)
| b <1 | b <1
break; break;
case BC_USETN: case BC_USETN: