Changeset 9b0a6b4 in mainline for uspace/lib/softfloat/generic/add.c

Timestamp:

2012-04-13T06:36:25Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

90f067d9

Parents:

e61aa80 (diff), d11a181 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/softfloat/generic/add.c (modified) (12 diffs)

uspace/lib/softfloat/generic/add.c

@@ -39 +39 @@
 #include <common.h>
 
-/**
- * Add two single-precision floats with the same signs.
+/** Add two single-precision floats with the same sign.
  *
  * @param a First input operand.
@@ -46 +45 @@
  * @return Result of addition.
  */
-float32 addFloat32(float32 a, float32 b)
+float32 add_float32(float32 a, float32 b)
 {
         int expdiff;
@@ -53 +52 @@
         expdiff = a.parts.exp - b.parts.exp;
         if (expdiff < 0) {
-                if (isFloat32NaN(b)) {
-                        /* TODO: fix SigNaN */
-                        if (isFloat32SigNaN(b)) {
+                if (is_float32_nan(b)) {
+                        /* TODO: fix SigNaN */
+                        if (is_float32_signan(b)) {
                         }
 
@@ -71 +70 @@
                 expdiff *= -1;
         } else {
-                if ((isFloat32NaN(a)) || (isFloat32NaN(b))) {
-                        /* TODO: fix SigNaN */
-                        if (isFloat32SigNaN(a) || isFloat32SigNaN(b)) {
-                        }
-                        return (isFloat32NaN(a) ? a : b);
+                if ((is_float32_nan(a)) || (is_float32_nan(b))) {
+                        /* TODO: fix SigNaN */
+                        if (is_float32_signan(a) || is_float32_signan(b)) {
+                        }
+                        return (is_float32_nan(a) ? a : b);
                 }
                 
@@ -150 +149 @@
 }
 
-/**
- * Add two double-precision floats with the same signs.
+/** Add two double-precision floats with the same sign.
  *
  * @param a First input operand.
@@ -157 +155 @@
  * @return Result of addition.
  */
-float64 addFloat64(float64 a, float64 b)
+float64 add_float64(float64 a, float64 b)
 {
         int expdiff;
@@ -165 +163 @@
         expdiff = ((int) a.parts.exp) - b.parts.exp;
         if (expdiff < 0) {
-                if (isFloat64NaN(b)) {
-                        /* TODO: fix SigNaN */
-                        if (isFloat64SigNaN(b)) {
-                        }
-
-                        return b;
-                }
-                
-                /* b is infinity and a not */   
-                if (b.parts.exp == FLOAT64_MAX_EXPONENT) { 
+                if (is_float64_nan(b)) {
+                        /* TODO: fix SigNaN */
+                        if (is_float64_signan(b)) {
+                        }
+
+                        return b;
+                }
+                
+                /* b is infinity and a not */
+                if (b.parts.exp == FLOAT64_MAX_EXPONENT) {
                         return b;
                 }
@@ -184 +182 @@
                 expdiff *= -1;
         } else {
-                if (isFloat64NaN(a)) {
-                        /* TODO: fix SigNaN */
-                        if (isFloat64SigNaN(a) || isFloat64SigNaN(b)) {
+                if (is_float64_nan(a)) {
+                        /* TODO: fix SigNaN */
+                        if (is_float64_signan(a) || is_float64_signan(b)) {
                         }
                         return a;
@@ -265 +263 @@
 }
 
-/**
- * Add two quadruple-precision floats with the same signs.
+/** Add two quadruple-precision floats with the same sign.
  *
  * @param a First input operand.
@@ -272 +269 @@
  * @return Result of addition.
  */
-float128 addFloat128(float128 a, float128 b)
+float128 add_float128(float128 a, float128 b)
 {
         int expdiff;
@@ -280 +277 @@
         expdiff = ((int) a.parts.exp) - b.parts.exp;
         if (expdiff < 0) {
-                if (isFloat128NaN(b)) {
-                        /* TODO: fix SigNaN */
-                        if (isFloat128SigNaN(b)) {
+                if (is_float128_nan(b)) {
+                        /* TODO: fix SigNaN */
+                        if (is_float128_signan(b)) {
                         }
 
@@ -301 +298 @@
                 expdiff *= -1;
         } else {
-                if (isFloat128NaN(a)) {
-                        /* TODO: fix SigNaN */
-                        if (isFloat128SigNaN(a) || isFloat128SigNaN(b)) {
+                if (is_float128_nan(a)) {
+                        /* TODO: fix SigNaN */
+                        if (is_float128_signan(a) || is_float128_signan(b)) {
                         }
                         return a;