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_x86.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_x86.dasc')
| -rw-r--r-- | src/vm_x86.dasc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index eaa99740..8ed6efd1 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
| @@ -4169,7 +4169,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
| 4169 | | | 4169 | | |
| 4170 | |2: // Upvalue is black. Check if new value is collectable and white. | 4170 | |2: // Upvalue is black. Check if new value is collectable and white. |
| 4171 | | sub RD, LJ_TISGCV | 4171 | | sub RD, LJ_TISGCV |
| 4172 | | cmp RD, LJ_TISNUM - LJ_TISGCV // tvisgcv(v) | 4172 | | cmp RD, LJ_TNUMX - LJ_TISGCV // tvisgcv(v) |
| 4173 | | jbe <1 | 4173 | | jbe <1 |
| 4174 | | test byte GCOBJ:RA->gch.marked, LJ_GC_WHITES // iswhite(v) | 4174 | | test byte GCOBJ:RA->gch.marked, LJ_GC_WHITES // iswhite(v) |
| 4175 | | jz <1 | 4175 | | jz <1 |