Changeset 4a5abddd in mainline

Timestamp:

2006-01-22T14:37:54Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

a96c570

Parents:

12c6f2d

Message:

Fixed bug in result shifting.
Some cryptic numbers replaced with constants.
Code cleaning.

Location:

softfloat

Files:

• generic/add.c (modified) (11 diffs)
• include/sftypes.h (modified) (1 diff)

softfloat/generic/add.c

@@ -38 +38 @@
         __u32 exp1, exp2,mant1, mant2;
         
-        expdiff=a.parts.exp - b.parts.exp;
-        if (expdiff<0) {
+        expdiff = a.parts.exp - b.parts.exp;
+        if (expdiff < 0) {
                 if (isFloat32NaN(b)) {
                         //TODO: fix SigNaN
@@ -48 +48 @@
                 };
                 
-                if (b.parts.exp==0xFF) { 
-                        return b;
-                }
-                
-                mant1=b.parts.mantisa;
-                exp1=b.parts.exp;
-                mant2=a.parts.mantisa;
-                exp2=a.parts.exp;
-                expdiff*=-1;
+                if (b.parts.exp == FLOAT32_MAX_EXPONENT) { 
+                        return b;
+                }
+                
+                mant1 = b.parts.mantisa;
+                exp1 = b.parts.exp;
+                mant2 = a.parts.mantisa;
+                exp2 = a.parts.exp;
+                expdiff *= -1;
         } else {
                 if (isFloat32NaN(a)) {
                         //TODO: fix SigNaN
-                        if ((isFloat32SigNaN(a))||(isFloat32SigNaN(b))) {
-                        };
-                        return a;
-                };
-                
-                if (a.parts.exp==0xFF) { 
-                        return a;
-                }
-                
-                mant1=a.parts.mantisa;
-                exp1=a.parts.exp;
-                mant2=b.parts.mantisa;
-                exp2=b.parts.exp;
+                        if (isFloat32SigNaN(a) || isFloat32SigNaN(b)) {
+                        };
+                        return a;
+                };
+                
+                if (a.parts.exp == FLOAT32_MAX_EXPONENT) { 
+                        return a;
+                }
+                
+                mant1 = a.parts.mantisa;
+                exp1 = a.parts.exp;
+                mant2 = b.parts.mantisa;
+                exp2 = b.parts.exp;
         };
         
@@ -100 +100 @@
         mant2 <<= 6;
         
-        if (expdiff > 24) {
+        if (expdiff > (FLOAT32_MANTISA_SIZE + 1) ) {
              goto done; 
              };
         
-        mant2>>=expdiff;
-        mant1+=mant2;
+        mant2 >>= expdiff;
+        mant1 += mant2;
 done:
-        if (mant1 & (FLOAT32_HIDDEN_BIT_MASK << 6) ) {
+        if (mant1 & (FLOAT32_HIDDEN_BIT_MASK << 7) ) {
                 ++exp1;
                 mant1 >>= 1;
@@ -115 +115 @@
         mant1 += (0x1 << 5);
         
-        if (mant1 & (FLOAT32_HIDDEN_BIT_MASK << 6)) { 
-                ++exp1;
-                mant1 >> =1;
+        if (mant1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) { 
+                ++exp1;
+                mant1 >>= 1;
         };
         
@@ -123 +123 @@
         
         /*Clear hidden bit and shift */
-        a.parts.mantisa = ((mant1>>6) & (~FLOAT32_HIDDEN_BIT_MASK)) ; 
+        a.parts.mantisa = ((mant1 >> 6) & (~FLOAT32_HIDDEN_BIT_MASK)) ; 
         return a;
 }
@@ -133 +133 @@
 {
         int expdiff;
-        __u64 exp1,exp2,mant1,mant2;
-        
-        expdiff=a.parts.exp - b.parts.exp;
-        if (expdiff<0) {
+        __u64 exp1, exp2, mant1, mant2;
+        
+        expdiff = a.parts.exp - b.parts.exp;
+        if (expdiff < 0) {
                 if (isFloat64NaN(b)) {
                         //TODO: fix SigNaN
@@ -146 +146 @@
                 
                 /* b is infinity and a not */   
-                if (b.parts.exp==0x8FF) { 
-                        return b;
-                }
-                
-                mant1=b.parts.mantisa;
-                exp1=b.parts.exp;
-                mant2=a.parts.mantisa;
-                exp2=a.parts.exp;
-                expdiff*=-1;
+                if (b.parts.exp == FLOAT64_MAX_EXPONENT ) { 
+                        return b;
+                }
+                
+                mant1 = b.parts.mantisa;
+                exp1 = b.parts.exp;
+                mant2 = a.parts.mantisa;
+                exp2 = a.parts.exp;
+                expdiff *= -1;
         } else {
                 if (isFloat64NaN(a)) {
                         //TODO: fix SigNaN
-                        if ((isFloat64SigNaN(a))||(isFloat64SigNaN(b))) {
+                        if (isFloat64SigNaN(a) || isFloat64SigNaN(b)) {
                         };
                         return a;
@@ -164 +164 @@
                 
                 /* a is infinity and b not */
-                if (a.parts.exp == 0x8FF) { 
+                if (a.parts.exp == FLOAT64_MAX_EXPONENT ) { 
                         return a;
                 }
@@ -201 +201 @@
         mant2 <<= 6;
         
-        if (expdiff > 53) {
+        if (expdiff > (FLOAT64_MANTISA_SIZE + 1) ) {
              goto done; 
              };
@@ -208 +208 @@
         mant1 += mant2;
 done:
-        if (mant1 & (FLOAT64_HIDDEN_BIT_MASK << 6) ) {
+        if (mant1 & (FLOAT64_HIDDEN_BIT_MASK << 7) ) {
                 ++exp1;
                 mant1 >>= 1;
@@ -216 +216 @@
         mant1 += (0x1 << 5); 
         
-        if (mant1 & (FLOAT64_HIDDEN_BIT_MASK << 6)) { 
-                ++exp1;
-                mant1 >> =1;
+        if (mant1 & (FLOAT64_HIDDEN_BIT_MASK << 7)) { 
+                ++exp1;
+                mant1 >>= 1;
         };
         
         a.parts.exp = exp1;
         /*Clear hidden bit and shift */
-        a.parts.mantisa = ( (mant1 >>6 ) & (~ (FLOAT64_HIDDEN_BIT_MASK)));
+        a.parts.mantisa = ( (mant1 >> 6 ) & (~FLOAT64_HIDDEN_BIT_MASK));
         return a;
 }

softfloat/include/sftypes.h

@@ -82 +82 @@
 
 #define FLOAT32_HIDDEN_BIT_MASK 0x800000
-#define FLOAT64_HIDDEN_BIT_MASK 0x10000000000000l
+#define FLOAT64_HIDDEN_BIT_MASK 0x10000000000000ll
+
+#define FLOAT32_MAX_EXPONENT 0xFF
+#define FLOAT64_MAX_EXPONENT 0x8FF
 
 #define FLOAT32_BIAS 0x7F