diff options
| author | Mike Pall <mike> | 2012-11-07 18:05:23 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-11-07 18:05:23 +0100 |
| commit | 061335899194145ca28f01eb499a1f7472c38fe8 (patch) | |
| tree | d714b31f32d32f526c9f1261b29803792f17f052 | |
| parent | 8a11869d4905249600ce34bc12a47d6058fa4e21 (diff) | |
| download | luajit2-061335899194145ca28f01eb499a1f7472c38fe8.tar.gz | |
ARM: Fix ordered comparisons for number <=> non-number.
| -rw-r--r-- | src/vm_arm.dasc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc index fb9363e4..7c419cde 100644 --- a/src/vm_arm.dasc +++ b/src/vm_arm.dasc @@ -2538,6 +2538,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | checktp CARG4, LJ_TISNUM | vldr d1, [RC] | blo >5 + | bhi ->vmeta_comp | // d0 is a number, CARG3 is an integer. | vmov s4, CARG3 | vcvt.f64.s32 d1, s4 @@ -2568,6 +2569,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop) | checktp CARG4, LJ_TISNUM | movlo RA, RB // Save RB. | blo >5 + | bhi ->vmeta_comp | // CARG12 is a number, CARG3 is an integer. | mov CARG1, CARG3 | mov RC, RA |