Merge softfloat_riscv into softfloat

They really aren't independent libraries.

13 files changed, 397 insertions, 1 deletions

diff --git a/softfloat/platform.h b/softfloat/platform.h
new file mode 100755
index 0000000..6c54313
--- /dev/null
+++ b/softfloat/platform.h
@@ -0,0 +1,42 @@
+
+/*============================================================================
+
+*** FIX.
+
+This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
+Arithmetic Package, Release 2b.
+
+Written by John R. Hauser.  This work was made possible in part by the
+International Computer Science Institute, located at Suite 600, 1947 Center
+Street, Berkeley, California 94704.  Funding was partially provided by the
+National Science Foundation under grant MIP-9311980.  The original version
+of this code was written as part of a project to build a fixed-point vector
+processor in collaboration with the University of California at Berkeley,
+overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
+is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
+arithmetic/SoftFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
+been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
+RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
+AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
+COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
+EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
+INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
+OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) the source code for the derivative work includes prominent notice that
+the work is derivative, and (2) the source code includes prominent notice with
+these four paragraphs for those parts of this code that are retained.
+
+=============================================================================*/
+
+/*----------------------------------------------------------------------------
+*----------------------------------------------------------------------------*/
+#define LITTLEENDIAN
+
+#ifndef UINT64_C
+# define UINT64_C(x) (x ## ULL)
+# define INT64_C(x) (x ## LL)
+#endif
diff --git a/softfloat/s_commonNaNToF32UI.c b/softfloat/s_commonNaNToF32UI.c
new file mode 100755
index 0000000..61f2735
--- /dev/null
+++ b/softfloat/s_commonNaNToF32UI.c
@@ -0,0 +1,17 @@
+

+#include <stdint.h>

+#include "platform.h"

+#include "specialize.h"

+

+/*----------------------------------------------------------------------------

+| Returns the result of converting the canonical NaN `a' to the single-

+| precision floating-point format.

+*----------------------------------------------------------------------------*/

+

+uint_fast32_t softfloat_commonNaNToF32UI( struct commonNaN a )

+{

+

+    return (uint_fast32_t) a.sign<<31 | 0x7FFFFFFF;

+

+}

+

diff --git a/softfloat/s_commonNaNToF64UI.c b/softfloat/s_commonNaNToF64UI.c
new file mode 100755
index 0000000..da36c04
--- /dev/null
+++ b/softfloat/s_commonNaNToF64UI.c
@@ -0,0 +1,18 @@
+
+#include <stdint.h>
+#include "platform.h"
+#include "specialize.h"
+
+/*----------------------------------------------------------------------------
+| Returns the result of converting the canonical NaN `a' to the double-
+| precision floating-point format.
+*----------------------------------------------------------------------------*/
+
+uint_fast64_t softfloat_commonNaNToF64UI( struct commonNaN a )
+{
+
+    return
+        (uint_fast64_t) a.sign<<63 | UINT64_C( 0x7FFFFFFFFFFFFFFF );
+
+}
+
diff --git a/softfloat/s_f32UIToCommonNaN.c b/softfloat/s_f32UIToCommonNaN.c
new file mode 100755
index 0000000..9ee0db9
--- /dev/null
+++ b/softfloat/s_f32UIToCommonNaN.c
@@ -0,0 +1,25 @@
+

+#include <stdint.h>

+#include "platform.h"

+#include "specialize.h"

+#include "softfloat.h"

+

+/*----------------------------------------------------------------------------

+| Returns the result of converting the single-precision floating-point NaN

+| `a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid

+| exception is raised.

+*----------------------------------------------------------------------------*/

+struct commonNaN softfloat_f32UIToCommonNaN( uint_fast32_t uiA )

+{

+    struct commonNaN z;

+

+    if ( softfloat_isSigNaNF32UI( uiA ) ) {

+        softfloat_raiseFlags( softfloat_flag_invalid );

+    }

+    z.sign = uiA>>31;

+    z.v64 = (uint_fast64_t) 0x7FFFF <<41;

+    z.v0 = 0;

+    return z;

+

+}

+

diff --git a/softfloat/s_f64UIToCommonNaN.c b/softfloat/s_f64UIToCommonNaN.c
new file mode 100755
index 0000000..84d8ca0
--- /dev/null
+++ b/softfloat/s_f64UIToCommonNaN.c
@@ -0,0 +1,25 @@
+

+#include <stdint.h>

+#include "platform.h"

+#include "specialize.h"

+#include "softfloat.h"

+

+/*----------------------------------------------------------------------------

+| Returns the result of converting the double-precision floating-point NaN

+| `a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid

+| exception is raised.

+*----------------------------------------------------------------------------*/

+struct commonNaN softfloat_f64UIToCommonNaN( uint_fast64_t uiA )

+{

+    struct commonNaN z;

+

+    if ( softfloat_isSigNaNF64UI( uiA ) ) {

+        softfloat_raiseFlags( softfloat_flag_invalid );

+    }

+    z.sign = uiA>>63;

+    z.v64 = (uint_fast64_t) 0xFFFFFFFFFFFFF <<12;

+    z.v0 = 0;

+    return z;

+

+}

+

diff --git a/softfloat/s_isSigNaNF32UI.c b/softfloat/s_isSigNaNF32UI.c
new file mode 100755
index 0000000..0a9c33f
--- /dev/null
+++ b/softfloat/s_isSigNaNF32UI.c
@@ -0,0 +1,13 @@
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "platform.h"
+#include "specialize.h"
+
+bool softfloat_isSigNaNF32UI( uint_fast32_t ui )
+{
+
+    return ( ( ui>>22 & 0x1FF ) == 0x1FE ) && ( ui & 0x003FFFFF );
+
+}
+
diff --git a/softfloat/s_isSigNaNF64UI.c b/softfloat/s_isSigNaNF64UI.c
new file mode 100755
index 0000000..d255213
--- /dev/null
+++ b/softfloat/s_isSigNaNF64UI.c
@@ -0,0 +1,15 @@
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "platform.h"
+#include "specialize.h"
+
+bool softfloat_isSigNaNF64UI( uint_fast64_t ui )
+{
+
+    return
+        ( ( ui>>51 & 0xFFF ) == 0xFFE )
+            && ( ui & UINT64_C( 0x0007FFFFFFFFFFFF ) );
+
+}
+
diff --git a/softfloat/s_propagateNaNF32UI.c b/softfloat/s_propagateNaNF32UI.c
new file mode 100755
index 0000000..d8738d1
--- /dev/null
+++ b/softfloat/s_propagateNaNF32UI.c
@@ -0,0 +1,25 @@
+

+/*** UPDATE COMMENTS. ***/

+

+#include <stdbool.h>

+#include <stdint.h>

+#include "platform.h"

+#include "internals.h"

+#include "specialize.h"

+#include "softfloat.h"

+

+/*----------------------------------------------------------------------------

+| Takes two single-precision floating-point values `a' and `b', one of which

+| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a

+| signaling NaN, the invalid exception is raised.

+*----------------------------------------------------------------------------*/

+

+uint_fast32_t

+ softfloat_propagateNaNF32UI( uint_fast32_t uiA, uint_fast32_t uiB )

+{

+    if ( softfloat_isSigNaNF32UI( uiA ) | softfloat_isSigNaNF32UI( uiB ) ) {

+        softfloat_raiseFlags( softfloat_flag_invalid );

+    }

+    return defaultNaNF32UI;

+}

+

diff --git a/softfloat/s_propagateNaNF64UI.c b/softfloat/s_propagateNaNF64UI.c
new file mode 100755
index 0000000..871989d
--- /dev/null
+++ b/softfloat/s_propagateNaNF64UI.c
@@ -0,0 +1,25 @@
+
+/*** UPDATE COMMENTS. ***/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "platform.h"
+#include "internals.h"
+#include "specialize.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Takes two double-precision floating-point values `a' and `b', one of which
+| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
+| signaling NaN, the invalid exception is raised.
+*----------------------------------------------------------------------------*/
+
+uint_fast64_t
+ softfloat_propagateNaNF64UI( uint_fast64_t uiA, uint_fast64_t uiB )
+{
+    if ( softfloat_isSigNaNF64UI( uiA ) | softfloat_isSigNaNF64UI( uiB ) ) {
+        softfloat_raiseFlags( softfloat_flag_invalid );
+    }
+    return defaultNaNF64UI;
+}
+
diff --git a/softfloat/softfloat.mk.in b/softfloat/softfloat.mk.in
index 59993cb..2b29f92 100644
--- a/softfloat/softfloat.mk.in
+++ b/softfloat/softfloat.mk.in
@@ -1,10 +1,12 @@
 softfloat_subproject_deps = \
-	sotfloat_riscv \
 
 softfloat_hdrs = \
 	internals.h \
 	primitives.h \
 	softfloat.h \
+	softfloat_types.h \
+	platform.h \
+	specialize.h \
 
 softfloat_c_srcs = \
 	f32_add.c                      \
@@ -107,6 +109,15 @@ softfloat_c_srcs = \
 	ui32_to_f64.c                  \
 	ui64_to_f32.c                  \
 	ui64_to_f64.c                  \
+	softfloat_raiseFlags.c         \
+	s_commonNaNToF32UI.c           \
+	s_commonNaNToF64UI.c           \
+	s_f32UIToCommonNaN.c           \
+	s_f64UIToCommonNaN.c           \
+	s_isSigNaNF32UI.c              \
+	s_isSigNaNF64UI.c              \
+	s_propagateNaNF32UI.c          \
+	s_propagateNaNF64UI.c          \
 
 softfloat_test_srcs =
 
diff --git a/softfloat/softfloat_raiseFlags.c b/softfloat/softfloat_raiseFlags.c
new file mode 100755
index 0000000..c0c0dc8
--- /dev/null
+++ b/softfloat/softfloat_raiseFlags.c
@@ -0,0 +1,51 @@
+
+/*============================================================================
+
+*** FIX.
+
+This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
+Arithmetic Package, Release 2b.
+
+Written by John R. Hauser.  This work was made possible in part by the
+International Computer Science Institute, located at Suite 600, 1947 Center
+Street, Berkeley, California 94704.  Funding was partially provided by the
+National Science Foundation under grant MIP-9311980.  The original version
+of this code was written as part of a project to build a fixed-point vector
+processor in collaboration with the University of California at Berkeley,
+overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
+is available through the Web page `http://www.cs.berkeley.edu/~jhauser/
+arithmetic/SoftFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has
+been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES
+RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS
+AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,
+COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE
+EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE
+INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR
+OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) the source code for the derivative work includes prominent notice that
+the work is derivative, and (2) the source code includes prominent notice with
+these four paragraphs for those parts of this code that are retained.
+
+=============================================================================*/
+
+#include "platform.h"
+#include "softfloat.h"
+
+/*----------------------------------------------------------------------------
+| Raises the exceptions specified by `flags'.  Floating-point traps can be
+| defined here if desired.  It is currently not possible for such a trap
+| to substitute a result value.  If traps are not implemented, this routine
+| should be simply `float_exception_flags |= flags;'.
+*----------------------------------------------------------------------------*/
+
+void softfloat_raiseFlags( int_fast8_t flags )
+{
+
+    softfloat_exceptionFlags |= flags;
+
+}
+
diff --git a/softfloat/softfloat_types.h b/softfloat/softfloat_types.h
new file mode 100755
index 0000000..9fada89
--- /dev/null
+++ b/softfloat/softfloat_types.h
@@ -0,0 +1,16 @@
+
+#ifndef softfloat_types_h
+#define softfloat_types_h
+
+/*** COMMENTS. ***/
+
+#include <stdbool.h>
+#include <stdint.h>
+
+typedef uint32_t float32_t;
+typedef uint64_t float64_t;
+typedef struct { uint64_t v; uint16_t x; } floatx80_t;
+typedef struct { uint64_t v[ 2 ]; } float128_t;
+
+#endif
+
diff --git a/softfloat/specialize.h b/softfloat/specialize.h
new file mode 100755
index 0000000..1793c46
--- /dev/null
+++ b/softfloat/specialize.h
@@ -0,0 +1,113 @@
+

+/*============================================================================

+

+*** FIX.

+

+This C source fragment is part of the SoftFloat IEC/IEEE Floating-point

+Arithmetic Package, Release 2b.

+

+Written by John R. Hauser.  This work was made possible in part by the

+International Computer Science Institute, located at Suite 600, 1947 Center

+Street, Berkeley, California 94704.  Funding was partially provided by the

+National Science Foundation under grant MIP-9311980.  The original version

+of this code was written as part of a project to build a fixed-point vector

+processor in collaboration with the University of California at Berkeley,

+overseen by Profs. Nelson Morgan and John Wawrzynek.  More information

+is available through the Web page `http://www.cs.berkeley.edu/~jhauser/

+arithmetic/SoftFloat.html'.

+

+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort has

+been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT TIMES

+RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO PERSONS

+AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL LOSSES,

+COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO FURTHERMORE

+EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER SCIENCE

+INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, COSTS, OR

+OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE SOFTWARE.

+

+Derivative works are acceptable, even for commercial purposes, so long as

+(1) the source code for the derivative work includes prominent notice that

+the work is derivative, and (2) the source code includes prominent notice with

+these four paragraphs for those parts of this code that are retained.

+

+=============================================================================*/

+

+#include <stdbool.h>

+#include <stdint.h>

+

+/*----------------------------------------------------------------------------

+*----------------------------------------------------------------------------*/

+#define init_detectTininess softfloat_tininess_beforeRounding;

+

+/*----------------------------------------------------------------------------

+| Structure used to transfer NaN representations from one format to another.

+*----------------------------------------------------------------------------*/

+struct commonNaN {

+    bool sign;

+    uint64_t v64, v0;

+};

+

+/*----------------------------------------------------------------------------

+| The pattern for a default generated single-precision NaN.

+*----------------------------------------------------------------------------*/

+#define defaultNaNF32UI 0xFFFFFFFF

+

+/*----------------------------------------------------------------------------

+| Returns 1 if the single-precision floating-point value `a' is a signaling

+| NaN; otherwise, returns 0.

+*----------------------------------------------------------------------------*/

+#if defined INLINE_LEVEL && ( 1 <= INLINE_LEVEL )

+INLINE bool softfloat_isSigNaNF32UI( uint_fast32_t ui )

+    { return ( ( ui>>22 & 0x1FF ) == 0x1FE ) && ( ui & 0x003FFFFF ); }

+#else

+bool softfloat_isSigNaNF32UI( uint_fast32_t );

+#endif

+

+/*----------------------------------------------------------------------------

+*----------------------------------------------------------------------------*/

+struct commonNaN softfloat_f32UIToCommonNaN( uint_fast32_t );

+#if defined INLINE_LEVEL && ( 1 <= INLINE_LEVEL )

+INLINE uint_fast32_t softfloat_commonNaNToF32UI( struct commonNaN a )

+    { return (uint_fast32_t) a.sign<<31 | 0x7FFFFFFF; }

+#else

+uint_fast32_t softfloat_commonNaNToF32UI( struct commonNaN );

+#endif

+

+/*----------------------------------------------------------------------------

+| Takes two single-precision floating-point values `a' and `b', one of which

+| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a

+| signaling NaN, the invalid exception is raised.

+*----------------------------------------------------------------------------*/

+uint_fast32_t softfloat_propagateNaNF32UI( uint_fast32_t, uint_fast32_t );

+

+/*----------------------------------------------------------------------------

+| The pattern for a default generated double-precision NaN.

+*----------------------------------------------------------------------------*/

+#define defaultNaNF64UI UINT64_C(0xFFFFFFFFFFFFFFFF)

+

+/*----------------------------------------------------------------------------

+*----------------------------------------------------------------------------*/

+#if defined INLINE_LEVEL && ( 1 <= INLINE_LEVEL )

+INLINE bool softfloat_isSigNaNF64UI( uint_fast64_t ui )

+{

+    return

+        ( ( ui>>51 & 0xFFF ) == 0xFFE )

+            && ( ui & UINT64_C( 0x0007FFFFFFFFFFFF ) );

+}

+#else

+bool softfloat_isSigNaNF64UI( uint_fast64_t );

+#endif

+

+/*----------------------------------------------------------------------------

+*----------------------------------------------------------------------------*/

+/*** MIGHT BE INLINE'D. ***/

+struct commonNaN softfloat_f64UIToCommonNaN( uint_fast64_t );

+uint_fast64_t softfloat_commonNaNToF64UI( struct commonNaN );

+

+/*----------------------------------------------------------------------------

+| Takes two double-precision floating-point values `a' and `b', one of which

+| is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a

+| signaling NaN, the invalid exception is raised.

+*----------------------------------------------------------------------------*/

+uint_fast64_t softfloat_propagateNaNF64UI( uint_fast64_t, uint_fast64_t );

+