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_mips.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_mips.dasc')
| -rw-r--r-- | src/vm_mips.dasc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm_mips.dasc b/src/vm_mips.dasc index e7d01dc4..7d69c7db 100644 --- a/src/vm_mips.dasc +++ b/src/vm_mips.dasc | |||
| @@ -2867,12 +2867,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
| 2867 | | li AT, LJ_GC_BLACK|1 | 2867 | | li AT, LJ_GC_BLACK|1 |
| 2868 | | or TMP3, TMP3, TMP0 | 2868 | | or TMP3, TMP3, TMP0 |
| 2869 | | beq TMP3, AT, >2 // Upvalue is closed and black? | 2869 | | beq TMP3, AT, >2 // Upvalue is closed and black? |
| 2870 | |. addiu TMP2, TMP2, -(LJ_TISNUM+1) | 2870 | |. addiu TMP2, TMP2, -(LJ_TNUMX+1) |
| 2871 | |1: | 2871 | |1: |
| 2872 | | ins_next | 2872 | | ins_next |
| 2873 | | | 2873 | | |
| 2874 | |2: // Check if new value is collectable. | 2874 | |2: // Check if new value is collectable. |
| 2875 | | sltiu AT, TMP2, LJ_TISGCV - (LJ_TISNUM+1) | 2875 | | sltiu AT, TMP2, LJ_TISGCV - (LJ_TNUMX+1) |
| 2876 | | beqz AT, <1 // tvisgcv(v) | 2876 | | beqz AT, <1 // tvisgcv(v) |
| 2877 | |. lw TMP1, LO(RD) | 2877 | |. lw TMP1, LO(RD) |
| 2878 | | lbu TMP3, GCOBJ:TMP1->gch.marked | 2878 | | lbu TMP3, GCOBJ:TMP1->gch.marked |