git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fpu-387.h: Use __asm__ and __volatile__ consistently. 

* config/fpu-387.h: Use __asm__ and __volatile__ consistently.
	(get_fpu_except_flags): Initialize result.

From-SVN: r200187
This commit is contained in:
Uros Bizjak 2013-06-19 08:38:16 +02:00 committed by Uros Bizjak
parent 2fceae711a
commit e8e694715e
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgfortran/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-19 Uros Bizjak <ubizjak@gmail.com>
* config/fpu-387.h: Use __asm__ and __volatile__ consistently.
(get_fpu_except_flags): Initialize result.
2013-06-17 Tobias Burnus <burnus@net-b.de> 2013-06-17 Tobias Burnus <burnus@net-b.de>
* libgfortran.h (compile_options_t) Add fpe_summary. * libgfortran.h (compile_options_t) Add fpe_summary.

37
libgfortran/config/fpu-387.h
View File

@ -73,7 +73,7 @@ has_sse (void)
/* We need a single SSE instruction here so the handler can safely skip /* We need a single SSE instruction here so the handler can safely skip
over it. */ over it. */
__asm__ volatile ("movaps %xmm0,%xmm0"); __asm__ __volatile__ ("movaps\t%xmm0,%xmm0");
sigaction (SIGILL, &oact, NULL); sigaction (SIGILL, &oact, NULL);
@ -100,7 +100,7 @@ void set_fpu (void)
{ {
unsigned short cw; unsigned short cw;
asm volatile ("fnstcw %0" : "=m" (cw)); __asm__ __volatile__ ("fnstcw\t%0" : "=m" (cw));
cw |= (_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM | _FPU_MASK_OM cw |= (_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM | _FPU_MASK_OM
| _FPU_MASK_UM | _FPU_MASK_PM); | _FPU_MASK_UM | _FPU_MASK_PM);
@ -112,13 +112,13 @@ void set_fpu (void)
if (options.fpe & GFC_FPE_UNDERFLOW) cw &= ~_FPU_MASK_UM; if (options.fpe & GFC_FPE_UNDERFLOW) cw &= ~_FPU_MASK_UM;
if (options.fpe & GFC_FPE_INEXACT) cw &= ~_FPU_MASK_PM; if (options.fpe & GFC_FPE_INEXACT) cw &= ~_FPU_MASK_PM;
asm volatile ("fldcw %0" : : "m" (cw)); __asm__ __volatile__ ("fldcw\t%0" : : "m" (cw));
if (has_sse()) if (has_sse())
{ {
unsigned int cw_sse; unsigned int cw_sse;
asm volatile ("%vstmxcsr %0" : "=m" (cw_sse)); __asm__ __volatile__ ("%vstmxcsr\t%0" : "=m" (cw_sse));
cw_sse &= 0xffff0000; cw_sse &= 0xffff0000;
cw_sse |= (_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM | _FPU_MASK_OM cw_sse |= (_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM | _FPU_MASK_OM
@ -131,7 +131,7 @@ void set_fpu (void)
if (options.fpe & GFC_FPE_UNDERFLOW) cw_sse &= ~(_FPU_MASK_UM << 7); if (options.fpe & GFC_FPE_UNDERFLOW) cw_sse &= ~(_FPU_MASK_UM << 7);
if (options.fpe & GFC_FPE_INEXACT) cw_sse &= ~(_FPU_MASK_PM << 7); if (options.fpe & GFC_FPE_INEXACT) cw_sse &= ~(_FPU_MASK_PM << 7);
asm volatile ("%vldmxcsr %0" : : "m" (cw_sse)); __asm__ __volatile__ ("%vldmxcsr\t%0" : : "m" (cw_sse));
} }
} }
@ -139,7 +139,7 @@ void set_fpu (void)
int int
get_fpu_except_flags (void) get_fpu_except_flags (void)
{ {
int result; int result = 0;
unsigned short cw; unsigned short cw;
__asm__ __volatile__ ("fnstsw\t%0" : "=a" (cw)); __asm__ __volatile__ ("fnstsw\t%0" : "=a" (cw));
@ -147,27 +147,18 @@ get_fpu_except_flags (void)
if (has_sse()) if (has_sse())
{ {
unsigned int cw_sse; unsigned int cw_sse;
__asm__ __volatile__ ("%vstmxcsr\t%0" : "=m" (cw_sse)); __asm__ __volatile__ ("%vstmxcsr\t%0" : "=m" (cw_sse));
cw |= cw_sse; cw |= cw_sse;
} }
if (cw & _FPU_MASK_IM) if (cw & _FPU_MASK_IM) result |= GFC_FPE_INVALID;
result |= GFC_FPE_INVALID; if (cw & _FPU_MASK_DM) result |= GFC_FPE_DENORMAL;
if (cw & _FPU_MASK_ZM) result |= GFC_FPE_ZERO;
if (cw & _FPU_MASK_ZM) if (cw & _FPU_MASK_OM) result |= GFC_FPE_OVERFLOW;
result |= GFC_FPE_ZERO; if (cw & _FPU_MASK_UM) result |= GFC_FPE_UNDERFLOW;
if (cw & _FPU_MASK_PM) result |= GFC_FPE_INEXACT;
if (cw & _FPU_MASK_OM)
result |= GFC_FPE_OVERFLOW;
if (cw & _FPU_MASK_UM)
result |= GFC_FPE_UNDERFLOW;
if (cw & _FPU_MASK_DM)
result |= GFC_FPE_DENORMAL;
if (cw & _FPU_MASK_PM)
result |= GFC_FPE_INEXACT;
return result; return result;
} }