implement floor and ceil with inline assembly on i586

Author: folkertdev

libm/src/math/arch/i586.rs

@@ -6,31 +6,31 @@
 ///
 /// Based on https://github.com/NetBSD/src/blob/trunk/lib/libm/arch/i387/s_ceil.S
 /// (written by J.T. Conklin <jtc@NetBSD.org>).
-#[unsafe(naked)]
-pub extern "C" fn ceil(_: f64) -> f64 {
-    core::arch::naked_asm!(
-        "pushl  %ebp",
-        "movl   %esp,%ebp",
-        "subl   $8,%esp",
-        // Store fpu control word.
-        "fstcw   -4(%ebp)",
-        "movw    -4(%ebp),%dx",
-        // Round towards +oo.
-        "orw $0x0800,%dx",
-        "andw    $0xfbff,%dx",
-        "movw    %dx,-8(%ebp)",
-        // Load modified control word
-        "fldcw   -8(%ebp)",
-        // Round.
-        "fldl    8(%ebp)",
-        "frndint",
-        // Restore original control word.
-        "fldcw   -4(%ebp)",
-        // Restore esp and ebp and return
-        "leave",
-        "ret",
-        options(att_syntax)
-    )
+pub fn ceil(mut x: f64) -> f64 {
+    // We save and later restore the FPU control word.
+    let mut cw_orig: u16 = 0;
+    unsafe {
+        core::arch::asm!(
+            "fstcw   ({cw_ptr})",      // Save the cw
+            "movw    ({cw_ptr}), %dx", // ...
+            "orw     $0x0800, %dx",    // Set rounding control to 0b10 (+∞),
+            "andw    $0xfbff, %dx",    // preserving other controls
+            "movw    %dx, ({cw_ptr})", // Apply cw
+            "fldcw    ({cw_ptr})",     // ...
+            "fldl     ({x_ptr})",      // Push x to the stack
+            "frndint",                 // Round
+            "fldcw    ({cw_ptr})",     // Restore cw
+            "fstpl   ({x_ptr})",       // Save rounded x to mem
+            cw_ptr = in(reg) &mut cw_orig,
+            x_ptr = in(reg) &mut x,
+            out("dx") _,               // Cw scratch
+            // All the x87 FPU stack is used, all registers must be clobbered
+            out("st(0)") _, out("st(1)") _, out("st(2)") _, out("st(3)") _,
+            out("st(4)") _, out("st(5)") _, out("st(6)") _, out("st(7)") _,
+            options(att_syntax)
+        )
+    }
+    x
 }
 
 /// Use an alternative implementation on x86, because the
@@ -39,29 +39,29 @@ pub extern "C" fn ceil(_: f64) -> f64 {
 ///
 /// Based on https://github.com/NetBSD/src/blob/trunk/lib/libm/arch/i387/s_floor.S
 /// (written by J.T. Conklin <jtc@NetBSD.org>).
-#[unsafe(naked)]
-pub extern "C" fn floor(_: f64) -> f64 {
-    core::arch::naked_asm!(
-        "pushl  %ebp",
-        "movl   %esp,%ebp",
-        "subl   $8,%esp",
-        // Store fpu control word.
-        "fstcw   -4(%ebp)",
-        "movw    -4(%ebp),%dx",
-        // Round towards -oo.
-        "orw	$0x0400,%dx",
-        "andw	$0xf7ff,%dx",
-        "movw   %dx,-8(%ebp)",
-        // Load modified control word
-        "fldcw   -8(%ebp)",
-        // Round.
-        "fldl    8(%ebp)",
-        "frndint",
-        // Restore original control word.
-        "fldcw   -4(%ebp)",
-        // Restore esp and ebp and return
-        "leave",
-        "ret",
-        options(att_syntax)
-    )
+pub fn floor(mut x: f64) -> f64 {
+    // We save and later restore the FPU control word.
+    let mut cw_orig: u16 = 0;
+    unsafe {
+        core::arch::asm!(
+            "fstcw   ({cw_ptr})",      // Save the cw
+            "movw    ({cw_ptr}), %dx", // ...
+            "orw     $0x0400, %dx",    // Set rounding control to 0b01 (-∞),
+            "andw    $0xf7ff, %dx",    // preserving other controls
+            "movw    %dx, ({cw_ptr})", // Apply cw
+            "fldcw    ({cw_ptr})",     // ...
+            "fldl     ({x_ptr})",      // Push x to the stack
+            "frndint",                 // Round
+            "fldcw    ({cw_ptr})",     // Restore cw
+            "fstpl   ({x_ptr})",       // Save rounded x to mem
+            cw_ptr = in(reg) &mut cw_orig,
+            x_ptr = in(reg) &mut x,
+            out("dx") _,               // Cw scratch
+            // All the x87 FPU stack is used, all registers must be clobbered
+            out("st(0)") _, out("st(1)") _, out("st(2)") _, out("st(3)") _,
+            out("st(4)") _, out("st(5)") _, out("st(6)") _, out("st(7)") _,
+            options(att_syntax)
+        )
+    }
+    x
 }