Changeset 03362fbd in mainline for uspace/lib/softfloat/common.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/softfloat/common.c (moved) (moved from uspace/lib/softfloat/generic/common.c ) (5 diffs)

uspace/lib/softfloat/common.c

@@ -34 +34 @@
  */
 
-#include <sftypes.h>
-#include <common.h>
+#include "sftypes.h"
+#include "common.h"
 
 /* Table for fast leading zeroes counting. */
 char zeroTable[256] = {
-        8, 7, 7, 6, 6, 6, 6, 4, 4, 4, 4, 4, 4, 4, 4, \
+        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, \
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, \
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, \
@@ -57 +57 @@
 };
 
-/** 
+/**
  * Take fraction shifted by 10 bits to the left, round it, normalize it
  * and detect exceptions
@@ -75 +75 @@
         while ((cexp > 0) && (cfrac) &&
             (!(cfrac & (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1))))) {
-                cexp--; 
+                cexp--;
                 cfrac <<= 1;
                 /* TODO: fix underflow */
@@ -110 +110 @@
                 ++cexp;
                 cfrac >>= 1;
-        }       
+        }
 
         /* check overflow */
@@ -307 +307 @@
 /**
  * Round and normalize number expressed by exponent and fraction with
- * first bit (equal to hidden bit) at 62nd bit.
+ * first bit (equal to hidden bit) at bit 62.
  *
  * @param exp Exponent part.
- * @param fraction Fraction with hidden bit shifted to 62nd bit.
+ * @param fraction Fraction with hidden bit shifted to bit 62.
  */
 void round_float64(int32_t *exp, uint64_t *fraction)
 {
-        /* rounding - if first bit after fraction is set then round up */
+        /*
+         * Rounding - if first bit after fraction is set then round up.
+         */
+
+        /*
+         * Add 1 to the least significant bit of the fraction respecting the
+         * current shift to bit 62 and see if there will be a carry to bit 63.
+         */
         (*fraction) += (0x1 << (64 - FLOAT64_FRACTION_SIZE - 3));
         
+        /* See if there was a carry to bit 63. */
         if ((*fraction) & 
-            (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 3))) {
+            (FLOAT64_HIDDEN_BIT_MASK << (64 - FLOAT64_FRACTION_SIZE - 1))) {
                 /* rounding overflow */
                 ++(*exp);