diff options
| author | Mike Pall <mike> | 2013-12-02 09:19:06 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-12-02 09:19:06 +0100 |
| commit | 5c7db3c4fc0f33c4e437aa4235ef557197b9235c (patch) | |
| tree | bbc835cfe9357d66fd4b4781cf0f6e5ea13b2e7f /src/vm_ppc.dasc | |
| parent | 4593fb5e29adc09cd53beaba8777f5656434c08d (diff) | |
| parent | 916f09d0a91155ce5ce1a78fdcd40ba42f61e493 (diff) | |
| download | luajit-5c7db3c4fc0f33c4e437aa4235ef557197b9235c.tar.gz luajit-5c7db3c4fc0f33c4e437aa4235ef557197b9235c.tar.bz2 luajit-5c7db3c4fc0f33c4e437aa4235ef557197b9235c.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/vm_ppc.dasc')
| -rw-r--r-- | src/vm_ppc.dasc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc index 5e89a2d9..91de682d 100644 --- a/src/vm_ppc.dasc +++ b/src/vm_ppc.dasc | |||
| @@ -3691,13 +3691,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
| 3691 | | cmplwi cr1, TMP0, 0 | 3691 | | cmplwi cr1, TMP0, 0 |
| 3692 | | lwz TMP1, 4(RD) | 3692 | | lwz TMP1, 4(RD) |
| 3693 | | cror 4*cr0+eq, 4*cr0+eq, 4*cr1+eq | 3693 | | cror 4*cr0+eq, 4*cr0+eq, 4*cr1+eq |
| 3694 | | subi TMP2, TMP2, (LJ_TISNUM+1) | 3694 | | subi TMP2, TMP2, (LJ_TNUMX+1) |
| 3695 | | bne >2 // Upvalue is closed and black? | 3695 | | bne >2 // Upvalue is closed and black? |
| 3696 | |1: | 3696 | |1: |
| 3697 | | ins_next | 3697 | | ins_next |
| 3698 | | | 3698 | | |
| 3699 | |2: // Check if new value is collectable. | 3699 | |2: // Check if new value is collectable. |
| 3700 | | cmplwi TMP2, LJ_TISGCV - (LJ_TISNUM+1) | 3700 | | cmplwi TMP2, LJ_TISGCV - (LJ_TNUMX+1) |
| 3701 | | bge <1 // tvisgcv(v) | 3701 | | bge <1 // tvisgcv(v) |
| 3702 | | lbz TMP3, GCOBJ:TMP1->gch.marked | 3702 | | lbz TMP3, GCOBJ:TMP1->gch.marked |
| 3703 | | andix. TMP3, TMP3, LJ_GC_WHITES // iswhite(v) | 3703 | | andix. TMP3, TMP3, LJ_GC_WHITES // iswhite(v) |