Upgrade to SoftFloat 3e

1 files changed, 136 insertions, 90 deletions

diff --git a/softfloat/f32_mul.c b/softfloat/f32_mul.c
index 9962368..b1f8ec0 100755..100644
--- a/softfloat/f32_mul.c
+++ b/softfloat/f32_mul.c
@@ -1,91 +1,137 @@
-// See LICENSE.SoftFloat for license details.
 
-

-#include <stdbool.h>

-#include <stdint.h>

-#include "platform.h"

-#include "primitives.h"

-#include "internals.h"

-#include "specialize.h"

-#include "softfloat.h"

-

-float32_t f32_mul( float32_t a, float32_t b )

-{

-    union ui32_f32 uA;

-    uint_fast32_t uiA;

-    bool signA;

-    int_fast16_t expA;

-    uint_fast32_t sigA;

-    union ui32_f32 uB;

-    uint_fast32_t uiB;

-    bool signB;

-    int_fast16_t expB;

-    uint_fast32_t sigB;

-    bool signZ;

-    uint_fast32_t magBits;

-    struct exp16_sig32 normExpSig;

-    int_fast16_t expZ;

-    uint_fast32_t sigZ, uiZ;

-    union ui32_f32 uZ;

-

-    uA.f = a;

-    uiA = uA.ui;

-    signA = signF32UI( uiA );

-    expA = expF32UI( uiA );

-    sigA = fracF32UI( uiA );

-    uB.f = b;

-    uiB = uB.ui;

-    signB = signF32UI( uiB );

-    expB = expF32UI( uiB );

-    sigB = fracF32UI( uiB );

-    signZ = signA ^ signB;

-    if ( expA == 0xFF ) {

-        if ( sigA || ( ( expB == 0xFF ) && sigB ) ) goto propagateNaN;

-        magBits = expB | sigB;

-        goto infArg;

-    }

-    if ( expB == 0xFF ) {

-        if ( sigB ) goto propagateNaN;

-        magBits = expA | sigA;

-        goto infArg;

-    }

-    if ( ! expA ) {

-        if ( ! sigA ) goto zero;

-        normExpSig = softfloat_normSubnormalF32Sig( sigA );

-        expA = normExpSig.exp;

-        sigA = normExpSig.sig;

-    }

-    if ( ! expB ) {

-        if ( ! sigB ) goto zero;

-        normExpSig = softfloat_normSubnormalF32Sig( sigB );

-        expB = normExpSig.exp;

-        sigB = normExpSig.sig;

-    }

-    expZ = expA + expB - 0x7F;

-    sigA = ( sigA | 0x00800000 )<<7;

-    sigB = ( sigB | 0x00800000 )<<8;

-    sigZ = softfloat_shortShift64RightJam( (uint_fast64_t) sigA * sigB, 32 );

-    if ( sigZ < 0x40000000 ) {

-        --expZ;

-        sigZ <<= 1;

-    }

-    return softfloat_roundPackToF32( signZ, expZ, sigZ );

- propagateNaN:

-    uiZ = softfloat_propagateNaNF32UI( uiA, uiB );

-    goto uiZ;

- infArg:

-    if ( ! magBits ) {

-        softfloat_raiseFlags( softfloat_flag_invalid );

-        uiZ = defaultNaNF32UI;

-    } else {

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

-    }

-    goto uiZ;

- zero:

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

- 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 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"
+#include "softfloat.h"
+
+float32_t f32_mul( float32_t a, float32_t b )
+{
+    union ui32_f32 uA;
+    uint_fast32_t uiA;
+    bool signA;
+    int_fast16_t expA;
+    uint_fast32_t sigA;
+    union ui32_f32 uB;
+    uint_fast32_t uiB;
+    bool signB;
+    int_fast16_t expB;
+    uint_fast32_t sigB;
+    bool signZ;
+    uint_fast32_t magBits;
+    struct exp16_sig32 normExpSig;
+    int_fast16_t expZ;
+    uint_fast32_t sigZ, uiZ;
+    union ui32_f32 uZ;
+
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    uA.f = a;
+    uiA = uA.ui;
+    signA = signF32UI( uiA );
+    expA  = expF32UI( uiA );
+    sigA  = fracF32UI( uiA );
+    uB.f = b;
+    uiB = uB.ui;
+    signB = signF32UI( uiB );
+    expB  = expF32UI( uiB );
+    sigB  = fracF32UI( uiB );
+    signZ = signA ^ signB;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ( expA == 0xFF ) {
+        if ( sigA || ((expB == 0xFF) && sigB) ) goto propagateNaN;
+        magBits = expB | sigB;
+        goto infArg;
+    }
+    if ( expB == 0xFF ) {
+        if ( sigB ) goto propagateNaN;
+        magBits = expA | sigA;
+        goto infArg;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    if ( ! expA ) {
+        if ( ! sigA ) goto zero;
+        normExpSig = softfloat_normSubnormalF32Sig( sigA );
+        expA = normExpSig.exp;
+        sigA = normExpSig.sig;
+    }
+    if ( ! expB ) {
+        if ( ! sigB ) goto zero;
+        normExpSig = softfloat_normSubnormalF32Sig( sigB );
+        expB = normExpSig.exp;
+        sigB = normExpSig.sig;
+    }
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+    expZ = expA + expB - 0x7F;
+    sigA = (sigA | 0x00800000)<<7;
+    sigB = (sigB | 0x00800000)<<8;
+    sigZ = softfloat_shortShiftRightJam64( (uint_fast64_t) sigA * sigB, 32 );
+    if ( sigZ < 0x40000000 ) {
+        --expZ;
+        sigZ <<= 1;
+    }
+    return softfloat_roundPackToF32( signZ, expZ, sigZ );
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ propagateNaN:
+    uiZ = softfloat_propagateNaNF32UI( uiA, uiB );
+    goto uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ infArg:
+    if ( ! magBits ) {
+        softfloat_raiseFlags( softfloat_flag_invalid );
+        uiZ = defaultNaNF32UI;
+    } else {
+        uiZ = packToF32UI( signZ, 0xFF, 0 );
+    }
+    goto uiZ;
+    /*------------------------------------------------------------------------
+    *------------------------------------------------------------------------*/
+ zero:
+    uiZ = packToF32UI( signZ, 0, 0 );
+ uiZ:
+    uZ.ui = uiZ;
+    return uZ.f;
+
+}
+