Changeset f1f95f2 in mainline

Timestamp:

2006-02-13T23:06:04Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

d9f51ccc

Parents:

d3ca210

Message:

Fixed bugs in 64bit float division.

Location:

softfloat/generic

Files:

• common.c (modified) (1 diff)
• div.c (modified) (5 diffs)

softfloat/generic/common.c

@@ -48 +48 @@
         };
         
-        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) {
+                if ((cexp + FLOAT64_FRACTION_SIZE + 1) < 0) { /* +1 is place for rounding */
                         result.parts.fraction = 0;
                         return result;
                 }
-                //cfrac >>= 1;
+                
                 while (cexp < 0) {
                         cexp++;
                         cfrac >>= 1;
                 }
+        
+                cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); 
+                
+                if (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_HIDDEN_BIT_MASK - 1)))) {
                         
-                result.parts.fraction = ((cfrac >>(64 - FLOAT64_FRACTION_SIZE - 2) ) & (~FLOAT64_HIDDEN_BIT_MASK)); 
-
-                return result;
+                        result.parts.fraction = ((cfrac >>(64 - FLOAT64_FRACTION_SIZE - 2) ) & (~FLOAT64_HIDDEN_BIT_MASK)); 
+                        return result;
+                }       
+        } else {
+                cfrac += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3)); 
         }
         

softfloat/generic/div.c

@@ -192 +192 @@
 {
         float64 result;
-        __s32 aexp, bexp, cexp;
+        __s64 aexp, bexp, cexp;
         __u64 afrac, bfrac, cfrac; 
         __u64 remlo, remhi;
@@ -199 +199 @@
         
         if (isFloat64NaN(a)) {
+                
+                if (isFloat64SigNaN(b)) {
+                        /*FIXME: SigNaN*/
+                        return b;
+                }
+                
                 if (isFloat64SigNaN(a)) {
                         /*FIXME: SigNaN*/
@@ -215 +221 @@
         
         if (isFloat64Infinity(a)) {
-                if (isFloat64Infinity(b)) {
+                if (isFloat64Infinity(b) || isFloat64Zero(b)) {
                         /*FIXME: inf / inf */
                         result.binary = FLOAT64_NAN;
@@ -260 +266 @@
         if (aexp == 0) {
                 if (afrac == 0) {
-                result.parts.exp = 0;
-                result.parts.fraction = 0;
-                return result;
+                        result.parts.exp = 0;
+                        result.parts.fraction = 0;
+                        return result;
                 }
                 /* normalize it*/
                 
-                afrac <<= 1;
+                aexp++;
                         /* afrac is nonzero => it must stop */  
                 while (! (afrac & FLOAT64_HIDDEN_BIT_MASK) ) {
@@ -275 +281 @@
 
         if (bexp == 0) {
-                bfrac <<= 1;
+                bexp++;
                         /* bfrac is nonzero => it must stop */  
                 while (! (bfrac & FLOAT64_HIDDEN_BIT_MASK) ) {