soft-fp: split FP_INIT_EXCEPTIONS from FP_INIT_ROUNDMODE.

diff --git a/ChangeLog b/ChangeLog
index 7367bab60ed4ec8b75c351662428782b18329c76..521f675c60cd059b5bbc922a4734b4a8f9b53b74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2013-10-10  Joseph Myers  <joseph@codesourcery.com>
 
+       * soft-fp/soft-fp.h (FP_INIT_EXCEPTIONS): New macro.
+       * soft-fp/extenddftf2.c (__extenddftf2): Use FP_INIT_EXCEPTIONS
+       instead of FP_INIT_ROUNDMODE.
+       * soft-fp/extendsfdf2.c (__extendsfdf2): Likewise.
+       * soft-fp/extendsftf2.c (__extendsftf2): Likewise.
+
        [BZ #16034]
        * soft-fp/op-common.h (_FP_NEG): Document input as raw.  Do not
        copy class of input value.

diff --git a/soft-fp/extenddftf2.c b/soft-fp/extenddftf2.c
index ff76a8cc2ff5676f238f1ea6d5d6e684c1f22b5f..fd4f9dd96012f2a0621004e9bcabad1f01e9c5f8 100644 (file)
--- a/soft-fp/extenddftf2.c
+++ b/soft-fp/extenddftf2.c
@@ -39,7 +39,7 @@ TFtype __extenddftf2(DFtype a)
   FP_DECL_Q(R);
   TFtype r;
 
-  FP_INIT_ROUNDMODE;
+  FP_INIT_EXCEPTIONS;
   FP_UNPACK_RAW_D(A, a);
 #if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
   FP_EXTEND(Q,D,4,2,R,A);

diff --git a/soft-fp/extendsfdf2.c b/soft-fp/extendsfdf2.c
index 7fc4046f8ae96737e351697101a8186c97a23fc7..614da79d9e9df5b6568efcae35541e71cd7d43ed 100644 (file)
--- a/soft-fp/extendsfdf2.c
+++ b/soft-fp/extendsfdf2.c
@@ -39,7 +39,7 @@ DFtype __extendsfdf2(SFtype a)
   FP_DECL_D(R);
   DFtype r;
 
-  FP_INIT_ROUNDMODE;
+  FP_INIT_EXCEPTIONS;
   FP_UNPACK_RAW_S(A, a);
 #if _FP_W_TYPE_SIZE < _FP_FRACBITS_D
   FP_EXTEND(D,S,2,1,R,A);

diff --git a/soft-fp/extendsftf2.c b/soft-fp/extendsftf2.c
index 8271a88466b926395857141cbc65c2a534c82be6..b1ab5935e334c8d4ed7fa9065dd03d5fbf937511 100644 (file)
--- a/soft-fp/extendsftf2.c
+++ b/soft-fp/extendsftf2.c
@@ -39,7 +39,7 @@ TFtype __extendsftf2(SFtype a)
   FP_DECL_Q(R);
   TFtype r;
 
-  FP_INIT_ROUNDMODE;
+  FP_INIT_EXCEPTIONS;
   FP_UNPACK_RAW_S(A, a);
 #if (2 * _FP_W_TYPE_SIZE) < _FP_FRACBITS_Q
   FP_EXTEND(Q,S,4,1,R,A);

diff --git a/soft-fp/soft-fp.h b/soft-fp/soft-fp.h
index b1c6e619b5eed8f88355c27d29c64ba29b023313..8a22a11e20d3fdcf8c46e42095494d0a5421f810 100644 (file)
--- a/soft-fp/soft-fp.h
+++ b/soft-fp/soft-fp.h
@@ -101,10 +101,18 @@
 #define FP_DECL_EX int _fex = 0
 #endif
 
+/* Initialize any machine-specific state used in FP_ROUNDMODE,
+   FP_TRAPPING_EXCEPTIONS or FP_HANDLE_EXCEPTIONS.  */
 #ifndef FP_INIT_ROUNDMODE
 #define FP_INIT_ROUNDMODE do {} while (0)
 #endif
 
+/* Initialize any machine-specific state used in
+   FP_HANDLE_EXCEPTIONS.  */
+#ifndef FP_INIT_EXCEPTIONS
+#define FP_INIT_EXCEPTIONS FP_INIT_ROUNDMODE
+#endif
+
 #ifndef FP_HANDLE_EXCEPTIONS
 #define FP_HANDLE_EXCEPTIONS do {} while (0)
 #endif