Changeset e6f5766 in mainline for uspace/lib/math/generic

Timestamp:

2015-09-05T10:11:40Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9adb61d

Parents:

01cdd5a

Message:

Use floatN_t types in generic function interfaces.

Location:

uspace/lib/math/generic

Files:

• ceil.c (modified) (3 diffs)
• exp.c (modified) (4 diffs)
• floor.c (modified) (1 diff)
• trunc.c (modified) (4 diffs)

uspace/lib/math/generic/ceil.c

@@ -43 +43 @@
  * @return Number rounded towards positive infinity.
  */
-float64 ceil_float64(float64 val)
+float64_t float64_ceil(float64_t val)
 {
         float64_u t;
@@ -49 +49 @@
         float64_u r;
         
-        v.data = val;
-        t.data = trunc_float64(val);
+        v.val = val;
+        t.val = float64_trunc(val);
         
-        if (val.parts.sign == 1 || v.val == t.val) {
+        if (v.data.parts.sign == 1 || val == t.val) {
                 r = t;
         } else {
@@ -58 +58 @@
         }
         
-        return r.data;
+        return r.val;
 }
 

uspace/lib/math/generic/exp.c

@@ -111 +111 @@
 {
         float32_t f;
-        float32_u i;
-        float32_u m;
+        float32_t i;
         float32_u r;
 
@@ -122 +121 @@
          */
 
-        m.val = arg * M_LOG2E;
-        i.data = trunc_float32(m.data);
-        f = arg * M_LOG2E - i.val;
+        i = float32_trunc(arg * M_LOG2E);
+        f = arg * M_LOG2E - i;
 
         r.val = taylor_exp_32(M_LN2 * f);
-        r.data.parts.exp += i.val;
+        r.data.parts.exp += i;
         return r.val;
 }
@@ -143 +141 @@
 {
         float64_t f;
-        float64_u i;
-        float64_u m;
+        float64_t i;
         float64_u r;
 
@@ -154 +151 @@
          */
 
-        m.val = arg * M_LOG2E;
-        i.data = trunc_float64(m.data);
-        f = arg * M_LOG2E - i.val;
+        i = float64_trunc(arg * M_LOG2E);
+        f = arg * M_LOG2E - i;
 
         r.val = taylor_exp_64(M_LN2 * f);
-        r.data.parts.exp += i.val;
+        r.data.parts.exp += i;
         return r.val;
 }

uspace/lib/math/generic/floor.c

@@ -44 +44 @@
  */
 
-float64 floor_float64(float64 val)
+float64_t float64_floor(float64_t val)
 {
-        float64_u t;
+        float64_t t;
         float64_u v;
-        float64_u r;
         
-        v.data = val;
-        t.data = trunc_float64(val);
+        v.val = val;
+        t = float64_trunc(val);
         
-        if (val.parts.sign == 0 || v.val == t.val) {
-                r = t;
-        } else {
-                r.val = t.val - 1.0;
-        }
-        
-        return r.data;
+        if (v.data.parts.sign == 0 || val == t)
+                return t;
+        else
+                return t - 1.0;
 }
 

uspace/lib/math/generic/trunc.c

@@ -51 +51 @@
  *
  */
-float32 trunc_float32(float32 val)
+float32_t float32_trunc(float32_t val)
 {
-        int32_t exp = val.parts.exp - FLOAT32_BIAS;
+        float32_u v;
+        int32_t exp;
+        
+        v.val = val;
+        exp = v.data.parts.exp - FLOAT32_BIAS;
         
         if (exp < 0) {
                 /* -1 < val < 1 => result is +0 or -0 */
-                val.parts.exp = 0;
-                val.parts.fraction = 0;
+                v.data.parts.exp = 0;
+                v.data.parts.fraction = 0;
         } else if (exp >= FLOAT32_FRACTION_SIZE) {
                 if (exp == 1024) {
@@ -68 +72 @@
         } else {
                 /* Truncate irrelevant fraction bits */
-                val.parts.fraction &= ~(UINT32_C(0x007fffff) >> exp);
+                v.data.parts.fraction &= ~(UINT32_C(0x007fffff) >> exp);
         }
         
-        return val;
+        return v.val;
 }
 
@@ -89 +93 @@
  *
  */
-float64 trunc_float64(float64 val)
+float64_t float64_trunc(float64_t val)
 {
-        int32_t exp = val.parts.exp - FLOAT64_BIAS;
+        float64_u v;
+        int32_t exp;
+        
+        v.val = val;
+        exp = v.data.parts.exp - FLOAT64_BIAS;
         
         if (exp < 0) {
                 /* -1 < val < 1 => result is +0 or -0 */
-                val.parts.exp = 0;
-                val.parts.fraction = 0;
+                v.data.parts.exp = 0;
+                v.data.parts.fraction = 0;
         } else if (exp >= FLOAT64_FRACTION_SIZE) {
                 if (exp == 1024) {
@@ -106 +114 @@
         } else {
                 /* Truncate irrelevant fraction bits */
-                val.parts.fraction &= ~(UINT64_C(0x000fffffffffffff) >> exp);
+                v.data.parts.fraction &= ~(UINT64_C(0x000fffffffffffff) >> exp);
         }
         
-        return val;
+        return v.val;
 }