From 6237ba289068254c34fca5ad014a1cf8ba9ccbee Mon Sep 17 00:00:00 2001
From: Jack Mott <jack.mott@gmail.com>
Date: Fri, 13 Jul 2018 21:32:59 -0500
Subject: [PATCH] adding ceilf and floorf for issues rust-lang/libm#56 and
 rust-lang/libm#54

---
 library/compiler-builtins/libm/src/lib.rs     |  4 ---
 .../compiler-builtins/libm/src/math/ceilf.rs  | 29 ++++++++++++++++++
 .../compiler-builtins/libm/src/math/floorf.rs | 30 +++++++++++++++++++
 .../compiler-builtins/libm/src/math/mod.rs    |  4 +++
 .../libm/test-generator/src/main.rs           |  4 +--
 5 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 library/compiler-builtins/libm/src/math/ceilf.rs
 create mode 100644 library/compiler-builtins/libm/src/math/floorf.rs

diff --git a/library/compiler-builtins/libm/src/lib.rs b/library/compiler-builtins/libm/src/lib.rs
index 13e038bfc3be..783cc9e1818b 100644
--- a/library/compiler-builtins/libm/src/lib.rs
+++ b/library/compiler-builtins/libm/src/lib.rs
@@ -34,10 +34,8 @@ pub fn _eq(a: u64, b: u64) -> bool {
 ///
 /// This trait is sealed and cannot be implemented outside of `libm`.
 pub trait F32Ext: private::Sealed {
-    #[cfg(todo)]
     fn floor(self) -> Self;
 
-    #[cfg(todo)]
     fn ceil(self) -> Self;
 
     #[cfg(todo)]
@@ -142,13 +140,11 @@ pub trait F32Ext: private::Sealed {
 }
 
 impl F32Ext for f32 {
-    #[cfg(todo)]
     #[inline]
     fn floor(self) -> Self {
         floorf(self)
     }
 
-    #[cfg(todo)]
     #[inline]
     fn ceil(self) -> Self {
         ceilf(self)
diff --git a/library/compiler-builtins/libm/src/math/ceilf.rs b/library/compiler-builtins/libm/src/math/ceilf.rs
new file mode 100644
index 000000000000..b4f58bfb86f3
--- /dev/null
+++ b/library/compiler-builtins/libm/src/math/ceilf.rs
@@ -0,0 +1,29 @@
+use core::f32;
+
+pub fn ceilf(x: f32) -> f32 {
+    let mut ui = x.to_bits();
+    let e = (((ui >> 23) & 0xff) - 0x7f) as i32;
+
+    if e >= 23 {
+        return x;
+    }
+    if e >= 0 {
+        let m = 0x007fffff >> e;
+        if (ui & m) == 0 {
+            return x;
+        }
+        force_eval!(x + f32::from_bits(0x7b800000));
+        if ui >> 31 == 0 {
+            ui += m;
+        }
+        ui &= !m;
+    } else {
+        force_eval!(x + f32::from_bits(0x7b800000));
+        if ui >> 31 != 0 {
+            return -0.0;
+        } else if ui << 1 != 0 {
+            return 1.0;
+        }
+    }
+    return f32::from_bits(ui);
+}
diff --git a/library/compiler-builtins/libm/src/math/floorf.rs b/library/compiler-builtins/libm/src/math/floorf.rs
new file mode 100644
index 000000000000..9c263b51828b
--- /dev/null
+++ b/library/compiler-builtins/libm/src/math/floorf.rs
@@ -0,0 +1,30 @@
+use core::f32;
+
+#[inline]
+pub fn floorf(x: f32) -> f32 {
+    let mut ui = x.to_bits();
+    let e = (((ui >> 23) & 0xff) - 0x7f) as i32;
+
+    if e >= 23 {
+        return x;
+    }
+    if e >= 0 {
+        let m: u32 = 0x007fffff >> e;
+        if (ui & m) == 0 {
+            return x;
+        }
+        force_eval!(x + f32::from_bits(0x7b800000));
+        if ui >> 31 != 0 {
+            ui += m;
+        }
+        ui &= !m;
+    } else {
+        force_eval!(x + f32::from_bits(0x7b800000));
+        if ui >> 31 == 0 {
+            ui = 0;
+        } else if ui << 1 != 0 {
+            return -1.0;
+        }
+    }
+    return f32::from_bits(ui);
+}
diff --git a/library/compiler-builtins/libm/src/math/mod.rs b/library/compiler-builtins/libm/src/math/mod.rs
index 444652e81eff..2ddaa2728354 100644
--- a/library/compiler-builtins/libm/src/math/mod.rs
+++ b/library/compiler-builtins/libm/src/math/mod.rs
@@ -4,8 +4,10 @@ macro_rules! force_eval {
     }
 }
 
+mod ceilf;
 mod fabs;
 mod fabsf;
+mod floorf;
 mod fmodf;
 mod powf;
 mod round;
@@ -24,8 +26,10 @@ mod hypotf;
 //mod service;
 
 pub use self::{
+    ceilf::ceilf,
     fabs::fabs,
     fabsf::fabsf,
+    floorf::floorf,
     fmodf::fmodf,
     powf::powf,
     round::round,
diff --git a/library/compiler-builtins/libm/test-generator/src/main.rs b/library/compiler-builtins/libm/test-generator/src/main.rs
index ce20e80d1952..1d6168e4bc2a 100644
--- a/library/compiler-builtins/libm/test-generator/src/main.rs
+++ b/library/compiler-builtins/libm/test-generator/src/main.rs
@@ -652,12 +652,12 @@ fn main() -> Result<(), Box<Error>> {
 // With signature `fn(f32) -> f32`
 f32_f32! {
     // acosf,
-    // floorf,
+    floorf,
     truncf,
     // asinf,
     // atanf,
     // cbrtf,
-    // ceilf,
+    ceilf,
     // cosf,
     // coshf,
     // exp2f,