summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2022-07-08 14:57:01 +0200
committerMike Pall <mike>2022-07-08 14:57:01 +0200
commit674afcd4e21d0cf64de3219d347557a0aed8ecc7 (patch)
treecd7b2c5f2006544b339a4a2652c7e4b4e121cddb
parent2e98c3d0644fc0c265844908f43b7e4526dd819c (diff)
downloadluajit2-674afcd4e21d0cf64de3219d347557a0aed8ecc7.tar.gz
x86/x64: Fix math.ceil(-0.9) result sign.
Reported by minoki.
-rw-r--r--src/vm_x86.dasc13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index 8c2740c3..7db5e710 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -415,9 +415,6 @@
|.macro sseconst_1, reg, tmp // Synthesize 1.0.
| sseconst_hi reg, tmp, 3ff00000
|.endmacro
-|.macro sseconst_m1, reg, tmp // Synthesize -1.0.
-| sseconst_hi reg, tmp, bff00000
-|.endmacro
|.macro sseconst_2p52, reg, tmp // Synthesize 2^52.
| sseconst_hi reg, tmp, 43300000
|.endmacro
@@ -3114,15 +3111,17 @@ static void build_subroutines(BuildCtx *ctx)
| addsd xmm1, xmm3 // (|x| + 2^52) - 2^52
| subsd xmm1, xmm3
| orpd xmm1, xmm2 // Merge sign bit back in.
+ | sseconst_1 xmm3, RDa
| .if mode == 1 // ceil(x)?
- | sseconst_m1 xmm2, RDa // Must subtract -1 to preserve -0.
| cmpsd xmm0, xmm1, 6 // x > result?
+ | andpd xmm0, xmm3
+ | addsd xmm1, xmm0 // If yes, add 1.
+ | orpd xmm1, xmm2 // Merge sign bit back in (again).
| .else // floor(x)?
- | sseconst_1 xmm2, RDa
| cmpsd xmm0, xmm1, 1 // x < result?
+ | andpd xmm0, xmm3
+ | subsd xmm1, xmm0 // If yes, subtract 1.
| .endif
- | andpd xmm0, xmm2
- | subsd xmm1, xmm0 // If yes, subtract +-1.
|.endif
| movaps xmm0, xmm1
|1: