Changeset aa59fa0 in mainline for softfloat/generic/conversion.c

Timestamp:

2006-03-16T00:32:41Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

585819d

Parents:

69cdeec

Message:

SoftFloat integrated into HelenOS uspace.

File:

• softfloat/generic/conversion.c (modified) (24 diffs)

softfloat/generic/conversion.c

@@ -35 +35 @@
 {
         float64 result;
-        __u64 frac;
+        uint64_t frac;
         
         result.parts.sign = a.parts.sign;
@@ -74 +74 @@
 {
         float32 result;
-        __s32 exp;
-        __u64 frac;
+        int32_t exp;
+        uint64_t frac;
         
         result.parts.sign = a.parts.sign;
@@ -84 +84 @@
                 
                 if (isFloat64SigNaN(a)) {
-                        result.parts.fraction = 0x800000; /* set first bit of fraction nonzero */
+                        result.parts.fraction = 0x400000; /* set first bit of fraction nonzero */
                         return result;
                 }
@@ -145 +145 @@
  * @return unsigned integer
  */
-static __u32 _float32_to_uint32_helper(float32 a)
-{
-        __u32 frac;
+static uint32_t _float32_to_uint32_helper(float32 a)
+{
+        uint32_t frac;
         
         if (a.parts.exp < FLOAT32_BIAS) {
@@ -173 +173 @@
  *      - now its the biggest or the smallest int
  */ 
-__u32 float32_to_uint32(float32 a)
+uint32_t float32_to_uint32(float32 a)
 {
         if (isFloat32NaN(a)) {
@@ -193 +193 @@
  *      - now its the biggest or the smallest int
  */ 
-__s32 float32_to_int32(float32 a)
+int32_t float32_to_int32(float32 a)
 {
         if (isFloat32NaN(a)) {
@@ -213 +213 @@
  * @return unsigned integer
  */
-static __u64 _float64_to_uint64_helper(float64 a)
-{
-        __u64 frac;
+static uint64_t _float64_to_uint64_helper(float64 a)
+{
+        uint64_t frac;
         
         if (a.parts.exp < FLOAT64_BIAS) {
@@ -241 +241 @@
  *      - now its the biggest or the smallest int
  */ 
-__u64 float64_to_uint64(float64 a)
+uint64_t float64_to_uint64(float64 a)
 {
         if (isFloat64NaN(a)) {
@@ -261 +261 @@
  *      - now its the biggest or the smallest int
  */ 
-__s64 float64_to_int64(float64 a)
+int64_t float64_to_int64(float64 a)
 {
         if (isFloat64NaN(a)) {
@@ -284 +284 @@
  * @return unsigned integer
  */
-static __u64 _float32_to_uint64_helper(float32 a)
-{
-        __u64 frac;
+static uint64_t _float32_to_uint64_helper(float32 a)
+{
+        uint64_t frac;
         
         if (a.parts.exp < FLOAT32_BIAS) {
@@ -312 +312 @@
  *      - now its the biggest or the smallest int
  */ 
-__u64 float32_to_uint64(float32 a)
+uint64_t float32_to_uint64(float32 a)
 {
         if (isFloat32NaN(a)) {
@@ -332 +332 @@
  *      - now its the biggest or the smallest int
  */ 
-__s64 float32_to_int64(float32 a)
+int64_t float32_to_int64(float32 a)
 {
         if (isFloat32NaN(a)) {
@@ -352 +352 @@
  *      - now its the biggest or the smallest int
  */ 
-__u32 float64_to_uint32(float64 a)
+uint32_t float64_to_uint32(float64 a)
 {
         if (isFloat64NaN(a)) {
@@ -365 +365 @@
         }
         
-        return (__u32)_float64_to_uint64_helper(a);     
+        return (uint32_t)_float64_to_uint64_helper(a);  
 }
 
@@ -372 +372 @@
  *      - now its the biggest or the smallest int
  */ 
-__s32 float64_to_int32(float64 a)
+int32_t float64_to_int32(float64 a)
 {
         if (isFloat64NaN(a)) {
@@ -384 +384 @@
                 return MAX_INT32;
         }
-        return (__s32)_float64_to_uint64_helper(a);
+        return (int32_t)_float64_to_uint64_helper(a);
 }       
 
@@ -391 +391 @@
  *
  */
-float32 uint32_to_float32(__u32 i)
+float32 uint32_to_float32(uint32_t i)
 {
         int counter;
-        __s32 exp;
+        int32_t exp;
         float32 result;
         
@@ -423 +423 @@
 }
 
-float32 int32_to_float32(__s32 i) 
+float32 int32_to_float32(int32_t i) 
 {
         float32 result;
 
         if (i < 0) {
-                result = uint32_to_float32((__u32)(-i));
-        } else {
-                result = uint32_to_float32((__u32)i);
+                result = uint32_to_float32((uint32_t)(-i));
+        } else {
+                result = uint32_to_float32((uint32_t)i);
         }
         
@@ -439 +439 @@
 
 
-float32 uint64_to_float32(__u64 i) 
+float32 uint64_to_float32(uint64_t i) 
 {
         int counter;
-        __s32 exp;
+        int32_t exp;
+        int32_t j;
         float32 result;
         
@@ -463 +464 @@
                 i >>= 1 + 32 - counter;
         }
-
-        roundFloat32(&exp, &i);
-
-        result.parts.fraction = i >> 7;
+        
+        j = (uint32_t)i;
+        roundFloat32(&exp, &j);
+
+        result.parts.fraction = j >> 7;
         result.parts.exp = exp;
         return result;
 }
 
-float32 int64_to_float32(__s64 i) 
+float32 int64_to_float32(int64_t i) 
 {
         float32 result;
 
         if (i < 0) {
-                result = uint64_to_float32((__u64)(-i));
-        } else {
-                result = uint64_to_float32((__u64)i);
+                result = uint64_to_float32((uint64_t)(-i));
+        } else {
+                result = uint64_to_float32((uint64_t)i);
         }
         
@@ -490 +492 @@
  *
  */
-float64 uint32_to_float64(__u32 i)
+float64 uint32_to_float64(uint32_t i)
 {
         int counter;
-        __s32 exp;
+        int32_t exp;
         float64 result;
-        __u64 frac;
+        uint64_t frac;
         
         result.parts.sign = 0;
@@ -520 +522 @@
 }
 
-float64 int32_to_float64(__s32 i) 
+float64 int32_to_float64(int32_t i) 
 {
         float64 result;
 
         if (i < 0) {
-                result = uint32_to_float64((__u32)(-i));
-        } else {
-                result = uint32_to_float64((__u32)i);
+                result = uint32_to_float64((uint32_t)(-i));
+        } else {
+                result = uint32_to_float64((uint32_t)i);
         }
         
@@ -536 +538 @@
 
 
-float64 uint64_to_float64(__u64 i) 
+float64 uint64_to_float64(uint64_t i) 
 {
         int counter;
-        __s32 exp;
+        int32_t exp;
         float64 result;
         
@@ -567 +569 @@
 }
 
-float64 int64_to_float64(__s64 i) 
+float64 int64_to_float64(int64_t i) 
 {
         float64 result;
 
         if (i < 0) {
-                result = uint64_to_float64((__u64)(-i));
-        } else {
-                result = uint64_to_float64((__u64)i);
+                result = uint64_to_float64((uint64_t)(-i));
+        } else {
+                result = uint64_to_float64((uint64_t)i);
         }