From c35763081d17b3d245b48819ca9ce419fc4b4478 Mon Sep 17 00:00:00 2001 From: uros Date: Wed, 13 Jun 2012 15:23:12 +0000 Subject: [PATCH] * config/i386/32/sfp-machine.h (_FP_NANSIGN_S, _FP_NANSIGN_D, _FP_NANSIGN_E, _FP_NANSIGN_Q): Move ... * config/i386/64/sfp-machine: ... (delete here) ... * config/i386/sfp-machine.h: ... to here. (FP_EX_MASK): Remove. (FP_RND_MASK): New. (FP_INIT_ROUNDMODE): Declare asm as volatile. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188518 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgcc/ChangeLog | 10 ++++++++++ libgcc/config/i386/32/sfp-machine.h | 6 +----- libgcc/config/i386/64/sfp-machine.h | 6 +----- libgcc/config/i386/sfp-machine.h | 25 +++++++++++++++---------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 9308090..17a2122 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,13 @@ +2012-06-13 Uros Bizjak + + * config/i386/32/sfp-machine.h (_FP_NANSIGN_S, _FP_NANSIGN_D, + _FP_NANSIGN_E, _FP_NANSIGN_Q): Move ... + * config/i386/64/sfp-machine: ... (delete here) ... + * config/i386/sfp-machine.h: ... to here. + (FP_EX_MASK): Remove. + (FP_RND_MASK): New. + (FP_INIT_ROUNDMODE): Declare asm as volatile. + 2012-06-11 Sriraman Tallam * config/i386/libgcc-bsd.ver: Version symbol __cpu_indicator_init. diff --git a/libgcc/config/i386/32/sfp-machine.h b/libgcc/config/i386/32/sfp-machine.h index 6d4e5e1..7f0c099 100644 --- a/libgcc/config/i386/32/sfp-machine.h +++ b/libgcc/config/i386/32/sfp-machine.h @@ -65,7 +65,7 @@ "g" ((USItype) (y0))) -#define _FP_MUL_MEAT_Q(R,X,Y) \ +#define _FP_MUL_MEAT_Q(R,X,Y) \ _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) #define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y) @@ -76,7 +76,3 @@ 16byte since soft-fp emulation is done in 16byte. */ #define _FP_NANFRAC_E _FP_QNANBIT_E, 0, 0, 0 #define _FP_NANFRAC_Q _FP_QNANBIT_Q, 0, 0, 0 -#define _FP_NANSIGN_S 1 -#define _FP_NANSIGN_D 1 -#define _FP_NANSIGN_E 1 -#define _FP_NANSIGN_Q 1 diff --git a/libgcc/config/i386/64/sfp-machine.h b/libgcc/config/i386/64/sfp-machine.h index 469c28c..8cc982e 100644 --- a/libgcc/config/i386/64/sfp-machine.h +++ b/libgcc/config/i386/64/sfp-machine.h @@ -8,7 +8,7 @@ typedef unsigned int UTItype __attribute__ ((mode (TI))); #define TI_BITS (__CHAR_BIT__ * (int)sizeof(TItype)) -#define _FP_MUL_MEAT_Q(R,X,Y) \ +#define _FP_MUL_MEAT_Q(R,X,Y) \ _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) #define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_2_udiv(Q,R,X,Y) @@ -17,7 +17,3 @@ typedef unsigned int UTItype __attribute__ ((mode (TI))); #define _FP_NANFRAC_D _FP_QNANBIT_D #define _FP_NANFRAC_E _FP_QNANBIT_E, 0 #define _FP_NANFRAC_Q _FP_QNANBIT_Q, 0 -#define _FP_NANSIGN_S 1 -#define _FP_NANSIGN_D 1 -#define _FP_NANSIGN_E 1 -#define _FP_NANSIGN_Q 1 diff --git a/libgcc/config/i386/sfp-machine.h b/libgcc/config/i386/sfp-machine.h index f84a368..e0fb5cf 100644 --- a/libgcc/config/i386/sfp-machine.h +++ b/libgcc/config/i386/sfp-machine.h @@ -14,7 +14,12 @@ typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__))); #include "config/i386/32/sfp-machine.h" #endif -#define _FP_KEEPNANFRACP 1 +#define _FP_KEEPNANFRACP 1 + +#define _FP_NANSIGN_S 1 +#define _FP_NANSIGN_D 1 +#define _FP_NANSIGN_E 1 +#define _FP_NANSIGN_Q 1 /* Here is something Intel misdesigned: the specs don't define the case where we have two NaNs with same mantissas, but @@ -25,12 +30,12 @@ typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__))); || (_FP_FRAC_EQ_##wc(X,Y) && (OP == '+' || OP == '*'))) \ { \ R##_s = X##_s; \ - _FP_FRAC_COPY_##wc(R,X); \ + _FP_FRAC_COPY_##wc(R,X); \ } \ else \ { \ R##_s = Y##_s; \ - _FP_FRAC_COPY_##wc(R,Y); \ + _FP_FRAC_COPY_##wc(R,Y); \ } \ R##_c = FP_CLS_NAN; \ } while (0) @@ -42,13 +47,11 @@ typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__))); #define FP_EX_UNDERFLOW 0x10 #define FP_EX_INEXACT 0x20 -#define FP_EX_MASK 0x3f - void __sfp_handle_exceptions (int); #define FP_HANDLE_EXCEPTIONS \ do { \ - if (_fex & FP_EX_MASK) \ + if (_fex) \ __sfp_handle_exceptions (_fex); \ } while (0); @@ -57,15 +60,17 @@ void __sfp_handle_exceptions (int); #define FP_RND_PINF 0x800 #define FP_RND_MINF 0x400 +#define FP_RND_MASK 0xc00 + #define _FP_DECL_EX \ unsigned short _fcw __attribute__ ((unused)) = FP_RND_NEAREST -#define FP_INIT_ROUNDMODE \ - do { \ - __asm__ ("fnstcw %0" : "=m" (_fcw)); \ +#define FP_INIT_ROUNDMODE \ + do { \ + __asm__ __volatile__ ("fnstcw\t%0" : "=m" (_fcw)); \ } while (0) -#define FP_ROUNDMODE (_fcw & 0xc00) +#define FP_ROUNDMODE (_fcw & FP_RND_MASK) #define __LITTLE_ENDIAN 1234 #define __BIG_ENDIAN 4321 -- 2.7.4