nextafter fix

burrbull · Jan 24, 2024 · 0e0b607 · 0e0b607
1 parent 6412fc2
commit 0e0b607
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 41 deletions.
diff --git a/src/f64.rs b/src/f64.rs
@@ -873,15 +873,15 @@ pub fn nextafter(x: f64, y: f64) -> f64 {
     let mut cxi = x.to_bits() as i64;
     let c = (cxi < 0) == (y < x);
     if c {
-        cxi = -(cxi ^ (1 << 63));
+        cxi = -(cxi ^ i64::MIN);
     }
 
     if x != y {
         cxi -= 1;
     }
 
     if c {
-        cxi = -(((cxi as u64) ^ (1u64 << 63)) as i64);
+        cxi = -(cxi ^ i64::MIN);
     }
 
     let cxf = f64::from_bits(cxi as u64);

diff --git a/src/f64x.rs b/src/f64x.rs
@@ -912,47 +912,14 @@ where
     LaneCount<N>: SupportedLaneCount,
 {
     let x = x.simd_eq(F64x::ZERO).select(F64x::ZERO.mul_sign(y), x);
-    let mut xi2 = x.to_bits().cast::<i64>();
+    let xi2 = x.to_bits().cast::<i64>();
     let c = x.is_sign_negative() ^ y.simd_ge(x);
 
-    let mut t = (xi2 ^ I64x::splat(0x_7fff_ffff_ffff_ffff_u64 as _)) + I64x::splat(1);
-    t += swap_upper_lower(
-        I64x::splat(1)
-            & t.simd_eq(I64x::splat(0x_ffff_ffff_0000_0000_u64 as _))
-                .to_int(),
-    );
-    xi2 = c
-        .select(F64x::from_bits(t.cast()), F64x::from_bits(xi2.cast()))
-        .to_bits()
-        .cast();
-
-    xi2 -= (x.simd_ne(y).to_int().cast() & U64x::splat(1)).cast();
-
-    xi2 = x
-        .simd_ne(y)
-        .select(
-            F64x::from_bits(
-                (xi2 + swap_upper_lower(
-                    I64x::splat(0x_ffff_ffff_u64 as _)
-                        & xi2.simd_eq(I64x::splat(0x_ffff_ffff_u64 as _)).to_int(),
-                ))
-                .cast(),
-            ),
-            F64x::from_bits(xi2.cast()),
-        )
-        .to_bits()
-        .cast();
-
-    let mut t = (xi2 ^ I64x::splat(0x_7fff_ffff_ffff_ffff_u64 as _)) + I64x::splat(1);
-    t += swap_upper_lower(
-        I64x::splat(1)
-            & t.simd_eq(I64x::splat(0x_ffff_ffff_0000_0000_u64 as _))
-                .to_int(),
-    );
-    xi2 = c
-        .select(F64x::from_bits(t.cast()), F64x::from_bits(xi2.cast()))
-        .to_bits()
-        .cast();
+    let xi2 = c.select(-(xi2 ^ I64x::splat(i64::MIN)), xi2);
+
+    let xi2 = x.simd_ne(y).select(xi2 - I64x::splat(1), xi2);
+
+    let xi2 = c.select(-(xi2 ^ I64x::splat(i64::MIN)), xi2);
 
     let mut ret = F64x::from_bits(xi2.cast());