Changeset d3ca210 in mainline

Timestamp:

2006-02-13T20:09:55Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

f1f95f2

Parents:

e979fea

Message:

Fixed most problems with 64bit arithmetic (but division is still buggy).

Location:

softfloat/generic

Files:

• add.c (modified) (5 diffs)
• common.c (modified) (3 diffs)

softfloat/generic/add.c

@@ -103 +103 @@
                 frac2 >>= expdiff;
                 frac1 += frac2;
-                };
+        } else {
+                a.parts.exp = exp1;
+                a.parts.fraction = (frac1 >> 6) & (~(FLOAT32_HIDDEN_BIT_MASK));
+                return a;
+        }
         
         if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7) ) {
@@ -143 +147 @@
         __u64 frac1, frac2;
         
-        expdiff = a.parts.exp - b.parts.exp;
+        expdiff = ((int )a.parts.exp) - b.parts.exp;
         if (expdiff < 0) {
                 if (isFloat64NaN(b)) {
@@ -212 +216 @@
                 frac2 >>= expdiff;
                 frac1 += frac2;
-                };
+        } else {
+                a.parts.exp = exp1;
+                a.parts.fraction = (frac1 >> 6) & (~(FLOAT64_HIDDEN_BIT_MASK));
+                return a;
+        }
         
         if (frac1 & (FLOAT64_HIDDEN_BIT_MASK << 7) ) {
@@ -228 +236 @@
         };
         
-        if ((a.parts.exp == FLOAT64_MAX_EXPONENT ) || (a.parts.exp < exp1)) {
+        if ((exp1 == FLOAT64_MAX_EXPONENT ) || (exp2 > exp1)) {
                         /* overflow - set infinity as result */
                         a.parts.exp = FLOAT64_MAX_EXPONENT;
@@ -238 +246 @@
         /*Clear hidden bit and shift */
         a.parts.fraction = ( (frac1 >> 6 ) & (~FLOAT64_HIDDEN_BIT_MASK));
+        
         return a;
 }

softfloat/generic/common.c

@@ -48 +48 @@
         };
         
-        cfrac >>= 1;
+        cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); 
+        
+        if ((cexp < 0) || ( cexp == 0 && (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1)))))) {
+                /* FIXME: underflow */
+                result.parts.exp = 0;
+                if ((cexp + FLOAT64_FRACTION_SIZE) < 0) {
+                        result.parts.fraction = 0;
+                        return result;
+                }
+                //cfrac >>= 1;
+                while (cexp < 0) {
+                        cexp++;
+                        cfrac >>= 1;
+                }
+                        
+                result.parts.fraction = ((cfrac >>(64 - FLOAT64_FRACTION_SIZE - 2) ) & (~FLOAT64_HIDDEN_BIT_MASK)); 
+
+                return result;
+        }
+        
         ++cexp;
-        cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); 
 
         if (cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1 ))) {
                 ++cexp;
                 cfrac >>= 1;
-                }       
+        }       
 
         /* check overflow */
@@ -65 +83 @@
         }
 
-        if (cexp < 0) {
-                /* FIXME: underflow */
-                result.parts.exp = 0;
-                if ((cexp + FLOAT64_FRACTION_SIZE) < 0) {
-                        result.parts.fraction = 0;
-                        return result;
-                }
-                cfrac >>= 1;
-                while (cexp < 0) {
-                        cexp ++;
-                        cfrac >>= 1;
-                }
-                return result;
-                
-        } else {
-                cexp ++; /*normalized*/
-                result.parts.exp = (__u32)cexp;
-        }
+        result.parts.exp = (__u32)cexp;
         
         result.parts.fraction = ((cfrac >>(64 - FLOAT64_FRACTION_SIZE - 2 ) ) & (~FLOAT64_HIDDEN_BIT_MASK)); 
@@ -88 +89 @@
         return result;  
 }
+