WebSVN – HelenOS-historic – Path Comparison – / – /uspace/ Rev 834 and /uspace/ Rev 835

Ignore whitespace Rev 834 → Rev 835

 /uspace/trunk/softfloat/generic/div.c
 ,7 → 191,7
 float64 divFloat64(float64 a, float64 b)
 {
     float64 result;
-    __s32 aexp, bexp, cexp;
+    __s64 aexp, bexp, cexp;
     __u64 afrac, bfrac, cfrac;
     __u64 remlo, remhi;
 ,6 → 198,12
     result.parts.sign = a.parts.sign ^ b.parts.sign;
     if (isFloat64NaN(a)) {
+        if (isFloat64SigNaN(b)) {
+            /*FIXME: SigNaN*/
+            return b;
+        }
         if (isFloat64SigNaN(a)) {
             /*FIXME: SigNaN*/
         }
 ,7 → 220,7
     }
     if (isFloat64Infinity(a)) {
-        if (isFloat64Infinity(b)) {
+        if (isFloat64Infinity(b) || isFloat64Zero(b)) {
             /*FIXME: inf / inf */
             result.binary = FLOAT64_NAN;
             return result;
 ,13 → 265,13
     /* denormalized numbers */
     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) ) {
             afrac <<= 1;
 ,7 → 280,7
     }
     if (bexp == 0) {
-        bfrac <<= 1;
+        bexp++;
             /* bfrac is nonzero => it must stop */
         while (! (bfrac & FLOAT64_HIDDEN_BIT_MASK) ) {
             bfrac <<= 1;

 /uspace/trunk/softfloat/generic/common.c
 ,24 → 47,28
             /* TODO: fix underflow */
     };
-    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));
     }
     ++cexp;