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_arm.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_arm.dasc')
| -rw-r--r-- | src/vm_arm.dasc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc index 0bd929fd..b728d52f 100644 --- a/src/vm_arm.dasc +++ b/src/vm_arm.dasc | |||
| @@ -3203,7 +3203,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | |||
| 3203 | | ins_next | 3203 | | ins_next |
| 3204 | | | 3204 | | |
| 3205 | |2: // Check if new value is collectable. | 3205 | |2: // Check if new value is collectable. |
| 3206 | | cmn RB, #-(LJ_TISNUM - LJ_TISGCV) | 3206 | | cmn RB, #-(LJ_TNUMX - LJ_TISGCV) |
| 3207 | | ldrbhi RC, GCOBJ:CARG3->gch.marked | 3207 | | ldrbhi RC, GCOBJ:CARG3->gch.marked |
| 3208 | | bls <1 // tvisgcv(v) | 3208 | | bls <1 // tvisgcv(v) |
| 3209 | | sub CARG1, DISPATCH, #-GG_DISP2G | 3209 | | sub CARG1, DISPATCH, #-GG_DISP2G |