diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 77d86bfe2..c0abf4d7e 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,11 @@ +2003-07-03 Danny Smith + + * mingwex/math/trunc.c (trunc): Provide lvalue for memory input constraint. + * mingwex/math/truncf.c (truncf): Likewise. + * mingwex/math/truncl.c (truncl): Likewise. + * mingwex/math/modff.c (modff): Likewise. + * mingwex/math/modfl.c (modfl): Likewise. + 2003-07-03 Danny Smith * include/search.h: New file. diff --git a/winsup/mingw/mingwex/math/modff.c b/winsup/mingw/mingwex/math/modff.c index 9e34c7c95..072faace0 100644 --- a/winsup/mingw/mingwex/math/modff.c +++ b/winsup/mingw/mingwex/math/modff.c @@ -9,10 +9,11 @@ modff (float value, float* iptr) { float int_part; unsigned short saved_cw; + unsigned short tmp_cw; /* truncate */ asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */ - asm ("fldcw %0;" : : "m" ((saved_cw & ~FE_ROUNDING_MASK) - | FE_TOWARDZERO)); + tmp_cw = (saved_cw & ~FE_ROUNDING_MASK) | FE_TOWARDZERO; + asm ("fldcw %0;" : : "m" (tmp_cw)); asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */ asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */ if (iptr) diff --git a/winsup/mingw/mingwex/math/modfl.c b/winsup/mingw/mingwex/math/modfl.c index 5663956f0..c7ea2cbce 100644 --- a/winsup/mingw/mingwex/math/modfl.c +++ b/winsup/mingw/mingwex/math/modfl.c @@ -9,10 +9,11 @@ modfl (long double value, long double* iptr) { long double int_part; unsigned short saved_cw; + unsigned short tmp_cw; /* truncate */ asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */ - asm ("fldcw %0;" : : "m" ((saved_cw & ~FE_ROUNDING_MASK) - | FE_TOWARDZERO)); + tmp_cw = (saved_cw & ~FE_ROUNDING_MASK) | FE_TOWARDZERO; + asm ("fldcw %0;" : : "m" (tmp_cw)); asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */ asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */ if (iptr) diff --git a/winsup/mingw/mingwex/math/trunc.c b/winsup/mingw/mingwex/math/trunc.c index 2b9931255..5c7dc68cb 100644 --- a/winsup/mingw/mingwex/math/trunc.c +++ b/winsup/mingw/mingwex/math/trunc.c @@ -5,12 +5,11 @@ double trunc (double _x){ double retval; unsigned short saved_cw; - __asm__ ("fnstcw %0;": "=m" (saved_cw)); /* save FPU control word */ - __asm__ ("fldcw %0;" - : - : "m" ((saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD - | FE_TOWARDZERO)) | FE_TOWARDZERO) - ); + unsigned short tmp_cw; + __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */ + tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)) + | FE_TOWARDZERO; + __asm__ ("fldcw %0;" : : "m" (tmp_cw)); __asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */ __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */ return retval; diff --git a/winsup/mingw/mingwex/math/truncf.c b/winsup/mingw/mingwex/math/truncf.c index 53fccb153..8869e377f 100644 --- a/winsup/mingw/mingwex/math/truncf.c +++ b/winsup/mingw/mingwex/math/truncf.c @@ -2,15 +2,15 @@ #include float -truncf (float _x){ +truncf (float _x) +{ float retval; unsigned short saved_cw; - __asm__ ("fnstcw %0;": "=m" (saved_cw)); /* save FPU control word */ - __asm__ ("fldcw %0;" - : - : "m" ((saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD - | FE_TOWARDZERO)) | FE_TOWARDZERO) - ); + unsigned short tmp_cw; + __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */ + tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)) + | FE_TOWARDZERO; + __asm__ ("fldcw %0;" : : "m" (tmp_cw)); __asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */ __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */ return retval; diff --git a/winsup/mingw/mingwex/math/truncl.c b/winsup/mingw/mingwex/math/truncl.c index 908197acc..e34b21ba9 100644 --- a/winsup/mingw/mingwex/math/truncl.c +++ b/winsup/mingw/mingwex/math/truncl.c @@ -5,12 +5,11 @@ long double truncl (long double _x){ long double retval; unsigned short saved_cw; - __asm__ ("fnstcw %0;": "=m" (saved_cw)); /* save FPU control word */ - __asm__ ("fldcw %0;" - : - : "m" ((saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD - | FE_TOWARDZERO)) | FE_TOWARDZERO) - ); + unsigned short tmp_cw; + __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */ + tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)) + | FE_TOWARDZERO; + __asm__ ("fldcw %0;" : : "m" (tmp_cw)); __asm__ ("frndint;" : "=t" (retval) : "0" (_x)); /* round towards zero */ __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */ return retval;