Changeset efdfebc in mainline for uspace/lib/softfloat/add.c

Timestamp:

2012-11-06T21:03:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/add.c (moved) (moved from uspace/lib/softfloat/generic/add.c ) (7 diffs)

uspace/lib/softfloat/add.c

@@ -34 +34 @@
  */
 
-#include <sftypes.h>
-#include <add.h>
-#include <comparison.h>
-#include <common.h>
+#include "sftypes.h"
+#include "add.h"
+#include "comparison.h"
+#include "common.h"
 
 /** Add two single-precision floats with the same sign.
@@ -90 +90 @@
                 /* both are denormalized */
                 frac1 += frac2;
-                if (frac1 & FLOAT32_HIDDEN_BIT_MASK ) {
+                if (frac1 & FLOAT32_HIDDEN_BIT_MASK) {
                         /* result is not denormalized */
                         a.parts.exp = 1;
@@ -112 +112 @@
         frac2 <<= 6;
         
-        if (expdiff < (FLOAT32_FRACTION_SIZE + 2) ) {
+        if (expdiff < (FLOAT32_FRACTION_SIZE + 2)) {
                 frac2 >>= expdiff;
                 frac1 += frac2;
@@ -121 +121 @@
         }
         
-        if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7) ) {
+        if (frac1 & (FLOAT32_HIDDEN_BIT_MASK << 7)) {
                 ++exp1;
                 frac1 >>= 1;
@@ -135 +135 @@
         }
         
-        if ((exp1 == FLOAT32_MAX_EXPONENT ) || (exp2 > exp1)) {
+        if ((exp1 == FLOAT32_MAX_EXPONENT) || (exp2 > exp1)) {
                 /* overflow - set infinity as result */
                 a.parts.exp = FLOAT32_MAX_EXPONENT;
@@ -250 +250 @@
         }
         
-        if ((exp1 == FLOAT64_MAX_EXPONENT ) || (exp2 > exp1)) {
+        if ((exp1 == FLOAT64_MAX_EXPONENT) || (exp2 > exp1)) {
                 /* overflow - set infinity as result */
                 a.parts.exp = FLOAT64_MAX_EXPONENT;
@@ -259 +259 @@
         a.parts.exp = exp1;
         /* Clear hidden bit and shift */
-        a.parts.fraction = ((frac1 >> 6 ) & (~FLOAT64_HIDDEN_BIT_MASK));
+        a.parts.fraction = ((frac1 >> 6) & (~FLOAT64_HIDDEN_BIT_MASK));
         return a;
 }