Upgrade to SoftFloat 3e

1 files changed, 125 insertions, 76 deletions

diff --git a/softfloat/s_addMagsF32.c b/softfloat/s_addMagsF32.c
index c968bc6..ed85bb0 100755..100644
--- a/softfloat/s_addMagsF32.c
+++ b/softfloat/s_addMagsF32.c
@@ -1,77 +1,126 @@
-// See LICENSE.SoftFloat for license details.
 
-

-#include <stdbool.h>

-#include <stdint.h>

-#include "platform.h"

-#include "primitives.h"

-#include "internals.h"

-#include "specialize.h"

-

-float32_t

- softfloat_addMagsF32( uint_fast32_t uiA, uint_fast32_t uiB, bool signZ )

-{

-    int_fast16_t expA;

-    uint_fast32_t sigA;

-    int_fast16_t expB;

-    uint_fast32_t sigB;

-    int_fast16_t expDiff;

-    uint_fast32_t uiZ;

-    int_fast16_t expZ;

-    uint_fast32_t sigZ;

-    union ui32_f32 uZ;

-

-    expA = expF32UI( uiA );

-    sigA = fracF32UI( uiA );

-    expB = expF32UI( uiB );

-    sigB = fracF32UI( uiB );

-    expDiff = expA - expB;

-    sigA <<= 6;

-    sigB <<= 6;

-    if ( ! expDiff ) {

-        if ( expA == 0xFF ) {

-            if ( sigA | sigB ) goto propagateNaN;

-            uiZ = uiA;

-            goto uiZ;

-        }

-        if ( ! expA ) {

-            uiZ = packToF32UI( signZ, 0, ( uiA + uiB ) & 0x7FFFFFFF );

-            goto uiZ;

-        }

-        expZ = expA;

-        sigZ = 0x40000000 + sigA + sigB;

-    } else {

-        if ( expDiff < 0 ) {

-            if ( expB == 0xFF ) {

-                if ( sigB ) goto propagateNaN;

-                uiZ = packToF32UI( signZ, 0xFF, 0 );

-                goto uiZ;

-            }

-            expZ = expB;

-            sigA += expA ? 0x20000000 : sigA;

-            sigA = softfloat_shift32RightJam( sigA, - expDiff );

-        } else {

-            if ( expA == 0xFF ) {

-                if ( sigA ) goto propagateNaN;

-                uiZ = uiA;

-                goto uiZ;

-            }

-            expZ = expA;

-            sigB += expB ? 0x20000000 : sigB;

-            sigB = softfloat_shift32RightJam( sigB, expDiff );

-        }

-        sigZ = 0x20000000 + sigA + sigB;

-        if ( sigZ < 0x40000000 ) {

-            --expZ;

-            sigZ <<= 1;

-        }

-    }

-    return softfloat_roundPackToF32( signZ, expZ, sigZ );

- propagateNaN:

-    uiZ = softfloat_propagateNaNF32UI( uiA, uiB );

- uiZ:

-    uZ.ui = uiZ;

-    return uZ.f;

-

-}

-

+/*============================================================================
+
+This C source file is part of the SoftFloat IEEE Floating-Point Arithmetic
+Package, Release 3e, by John R. Hauser.
+
+Copyright 2011, 2012, 2013, 2014, 2015, 2016 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 <stdbool.h>
+#include <stdint.h>
+#include "platform.h"
+#include "internals.h"
+#include "specialize.h"
+
+float32_t softfloat_addMagsF32( uint_fast32_t uiA, uint_fast32_t uiB )
+{
+    int_fast16_t expA;
+    uint_fast32_t sigA;
+    int_fast16_t expB;
+    uint_fast32_t sigB;
+    int_fast16_t expDiff;
+    uint_fast32_t uiZ;
+    bool signZ;
+    int_fast16_t expZ;
+    uint_fast32_t sigZ;
+    union ui32_f32 uZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expA = expF32UI( uiA );
+    sigA = fracF32UI( uiA );
+    expB = expF32UI( uiB );
+    sigB = fracF32UI( uiB );
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expDiff = expA - expB;
+    if ( ! expDiff ) {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        if ( ! expA ) {
+            uiZ = uiA + sigB;
+            goto uiZ;
+        }
+        if ( expA == 0xFF ) {
+            if ( sigA | sigB ) goto propagateNaN;
+            uiZ = uiA;
+            goto uiZ;
+        }
+        signZ = signF32UI( uiA );
+        expZ = expA;
+        sigZ = 0x01000000 + sigA + sigB;
+        if ( ! (sigZ & 1) && (expZ < 0xFE) ) {
+            uiZ = packToF32UI( signZ, expZ, sigZ>>1 );
+            goto uiZ;
+        }
+        sigZ <<= 6;
+    } else {
+        /*--------------------------------------------------------------------
+        *--------------------------------------------------------------------*/
+        signZ = signF32UI( uiA );
+        sigA <<= 6;
+        sigB <<= 6;
+        if ( expDiff < 0 ) {
+            if ( expB == 0xFF ) {
+                if ( sigB ) goto propagateNaN;
+                uiZ = packToF32UI( signZ, 0xFF, 0 );
+                goto uiZ;
+            }
+            expZ = expB;
+            sigA += expA ? 0x20000000 : sigA;
+            sigA = softfloat_shiftRightJam32( sigA, -expDiff );
+        } else {
+            if ( expA == 0xFF ) {
+                if ( sigA ) goto propagateNaN;
+                uiZ = uiA;
+                goto uiZ;
+            }
+            expZ = expA;
+            sigB += expB ? 0x20000000 : sigB;
+            sigB = softfloat_shiftRightJam32( sigB, expDiff );
+        }
+        sigZ = 0x20000000 + sigA + sigB;
+        if ( sigZ < 0x40000000 ) {
+            --expZ;
+            sigZ <<= 1;
+        }
+    }
+    return softfloat_roundPackToF32( signZ, expZ, sigZ );
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    uiZ = softfloat_propagateNaNF32UI( uiA, uiB );
+ uiZ:
+    uZ.ui = uiZ;
+    return uZ.f;
+
+}
+