Upgrade to latest SoftFloat

1 files changed, 64 insertions, 31 deletions

diff --git a/softfloat/ui64_to_f32.c b/softfloat/ui64_to_f32.c
index 82afbdc..d67c6f9 100755..100644
--- a/softfloat/ui64_to_f32.c
+++ b/softfloat/ui64_to_f32.c
@@ -1,31 +1,64 @@
-

-#include <stdint.h>

-#include "platform.h"

-#include "primitives.h"

-#include "internals.h"

-#include "softfloat.h"

-

-float32_t ui64_to_f32( uint_fast64_t a )

-{

-    int shiftCount;

-    union ui32_f32 u;

-    uint_fast32_t sig;

-

-    shiftCount = softfloat_countLeadingZeros64( a ) - 40;

-    if ( 0 <= shiftCount ) {

-        u.ui =

-            a ? packToF32UI(

-                    0, 0x95 - shiftCount, (uint_fast32_t) a<<shiftCount )

-                : 0;

-        return u.f;

-    } else {

-        shiftCount += 7;

-        sig =

-            ( shiftCount < 0 )

-                ? softfloat_shortShift64RightJam( a, - shiftCount )

-                : (uint_fast32_t) a<<shiftCount;

-        return softfloat_roundPackToF32( 0, 0x9C - shiftCount, sig );

-    }

-

-}

-

+
+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3a, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014 The Regents of the University of California.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions, and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. Neither the name of the University nor the names of its contributors may
+    be used to endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS", AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=============================================================================*/
+
+#include <stdint.h>
+#include "platform.h"
+#include "internals.h"
+#include "softfloat.h"
+
+float32_t ui64_to_f32( uint64_t a )
+{
+    int_fast8_t shiftCount;
+    union ui32_f32 u;
+    uint_fast32_t sig;
+
+    shiftCount = softfloat_countLeadingZeros64( a ) - 40;
+    if ( 0 <= shiftCount ) {
+        u.ui =
+            a ? packToF32UI(
+                    0, 0x95 - shiftCount, (uint_fast32_t) a<<shiftCount )
+                : 0;
+        return u.f;
+    } else {
+        shiftCount += 7;
+        sig =
+            (shiftCount < 0) ? softfloat_shortShiftRightJam64( a, -shiftCount )
+                : (uint_fast32_t) a<<shiftCount;
+        return softfloat_roundPackToF32( 0, 0x9C - shiftCount, sig );
+    }
+
+}
+