Changeset cf4a823 in mainline

Timestamp:

2005-12-22T12:11:35Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

75a23abf

Parents:

ef0aa999

Message:

Fixed some bugs in softfloat after tests.

Location:

softfloat

Files:

• generic/arithmetic.c (modified) (1 diff)
• generic/comparison.c (modified) (3 diffs)
• generic/softfloat.c (modified) (4 diffs)
• include/comparison.h (modified) (1 diff)

softfloat/generic/arithmetic.c

@@ -29 +29 @@
 #include<sftypes.h>
 #include<arithmetic.h>
+#include<comparison.h>
 
 /** Add two Float32 numbers with same signs

softfloat/generic/comparison.c

@@ -50 +50 @@
 inline int isFloat32eq(float32 a, float32 b)
 {
-        return ((a==b)||(((a.binary| b.binary)&0x7FFFFFFF)==0)); /* a equals to b or both are zeros (with any sign) */
+        return ((a.binary==b.binary)||(((a.binary| b.binary)&0x7FFFFFFF)==0)); /* a equals to b or both are zeros (with any sign) */
 }
 
@@ -59 +59 @@
 {
         if (((a.binary| b.binary)&0x7FFFFFFF)==0) {
-                return 0;
+                return 0; /* +- zeroes */
         };
-        a.parts.sign^=a.parts.sign;
-        b.parts.sign^=b.parts.sign;
+        
+        if ((a.parts.sign)&&(b.parts.sign)) {
+                /*if both are negative, smaller is that with greater binary value*/
+                return (a.binary>b.binary);
+                };
+        
+        /* lets negate signs - now will be positive numbers allways bigger than negative (first bit will be set for unsigned integer comparison)*/
+        a.parts.sign=!a.parts.sign;
+        b.parts.sign=!b.parts.sign;
         return (a.binary<b.binary);
                         
@@ -73 +80 @@
 {
         if (((a.binary| b.binary)&0x7FFFFFFF)==0) {
-                return 0;
+                return 0; /* zeroes are equal with any sign */
         };
-        a.parts.sign^=a.parts.sign;
-        b.parts.sign^=b.parts.sign;
+        
+        if ((a.parts.sign)&&(b.parts.sign)) {
+                /*if both are negative, greater is that with smaller binary value*/
+                return (a.binary<b.binary);
+                };
+        
+        /* lets negate signs - now will be positive numbers allways bigger than negative (first bit will be set for unsigned integer comparison)*/
+        a.parts.sign=!a.parts.sign;
+        b.parts.sign=!b.parts.sign;
         return (a.binary>b.binary);
                         

softfloat/generic/softfloat.c

@@ -58 +58 @@
         fb.f=b;
         if (fa.parts.sign!=fb.parts.sign) {
-                fb.parts.sign!=fb.parts.sign;
+                fb.parts.sign=!fb.parts.sign;
                 return addFloat32(fa,fb).f;
         }
@@ -89 +89 @@
  * */
 
-int __cmpsf2(double a, double b) 
+int __cmpsf2(float a, float b) 
 {
         float32 fa,fb;
@@ -146 +146 @@
         if ((isFloat32NaN(fa))||(isFloat32NaN(fb))) {
                 /* TODO: sigNaNs*/
-                return 1;
+                return -1;
                 };
         
@@ -199 +199 @@
 
 /** Return positive value, if a>b and neither is NaN*/
-int __ltsf2(float a, float b)
-{
-        float32 fa,fb;
-        fa.f=a;
-        fb.f=b;
-        if ((isFloat32NaN(fa))||(isFloat32NaN(fb))) {
-                /* TODO: sigNaNs*/
-                return 1;
+int __gtsf2(float a, float b)
+{
+        float32 fa,fb;
+        fa.f=a;
+        fb.f=b;
+        if ((isFloat32NaN(fa))||(isFloat32NaN(fb))) {
+                /* TODO: sigNaNs*/
+                return -1;
                 };
         if (isFloat32gt(fa, fb)) {

softfloat/include/comparison.h

@@ -33 +33 @@
 inline int isFloat32SigNaN(float32 f);
 
-inline int isFloat32Infinity(float32 f) 
+inline int isFloat32Infinity(float32 f);
 
 inline int isFloat32eq(float32 a, float32 b);