From 1b7a0148f070deb07455f06a15ff13834c92f17b Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 3 Jun 2011 10:36:21 -0700 Subject: [PATCH] gcc: * config/i386/crtfastmath.c [!__x86_64__ && __sun__ && __svr4__] (sigill_hdlr): Correct insn, insn size. (set_fast_math) [!__x86_64__ && __sun__ && __svr4__]: Use movaps. gcc/testsuite: * lib/target-supports.exp (check_sse_os_support_available): Use movaps. libgfortran. * config/fpu-387.h [__sun__ && __svr4__] (sigill_hdlr): Correct insn, insn size. (has_sse) [!__x86_64__ && __sun__ && __svr4__]: Use movaps. Co-Authored-By: Rainer Orth From-SVN: r174609 --- gcc/ChangeLog | 7 +++++++ gcc/config/i386/crtfastmath.c | 8 ++++---- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/lib/target-supports.exp | 2 +- libgfortran/ChangeLog | 7 +++++++ libgfortran/config/fpu-387.h | 8 ++++---- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 05c1dd0ced6..9feb8fdb87b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-06-03 Richard Henderson + Rainer Orth + + * config/i386/crtfastmath.c [!__x86_64__ && __sun__ && __svr4__] + (sigill_hdlr): Correct insn, insn size. + (set_fast_math) [!__x86_64__ && __sun__ && __svr4__]: Use movaps. + 2011-06-03 Rainer Orth * config.gcc (mips-sgi-irix6.5*): Set tmake_file to mips/t-irix6 diff --git a/gcc/config/i386/crtfastmath.c b/gcc/config/i386/crtfastmath.c index a80e2ede3ee..7abe500e981 100644 --- a/gcc/config/i386/crtfastmath.c +++ b/gcc/config/i386/crtfastmath.c @@ -30,7 +30,7 @@ #include "cpuid.h" #endif -#if !defined __x86_64 && defined __sun__ && defined __svr4__ +#if !defined __x86_64__ && defined __sun__ && defined __svr4__ #include #include @@ -43,9 +43,9 @@ sigill_hdlr (int sig __attribute((unused)), { sigill_caught = 1; /* Set PC to the instruction after the faulting one to skip over it, - otherwise we enter an infinite loop. 4 is the size of the stmxcsr + otherwise we enter an infinite loop. 3 is the size of the movaps instruction. */ - ucp->uc_mcontext.gregs[EIP] += 4; + ucp->uc_mcontext.gregs[EIP] += 3; setcontext (ucp); } #endif @@ -83,7 +83,7 @@ set_fast_math (void) /* We need a single SSE instruction here so the handler can safely skip over it. */ - __asm__ volatile ("movss %xmm2,%xmm1"); + __asm__ volatile ("movaps %xmm0,%xmm0"); sigaction (SIGILL, &oact, NULL); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0883052df3c..4eeb347aca7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-06-03 Richard Henderson + Rainer Orth + + * lib/target-supports.exp (check_sse_os_support_available): Use + movaps. + 2011-06-03 Nicola Pero * objc.dg/headers.m: Do not include objc-list.h. diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 53990f60631..37dd6b8dceb 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -1059,7 +1059,7 @@ proc check_sse_os_support_available { } { check_runtime_nocache sse_os_support_available { int main () { - __asm__ volatile ("movss %xmm2,%xmm1"); + __asm__ volatile ("movaps %xmm0,%xmm0"); return 0; } } "-msse" diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 90929219d8c..5a22cd32bc7 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2011-06-03 Richard Henderson + Rainer Orth + + * config/fpu-387.h [__sun__ && __svr4__] (sigill_hdlr): Correct + insn, insn size. + (has_sse) [!__x86_64__ && __sun__ && __svr4__]: Use movaps. + 2011-05-29 Janne Blomqvist PR libfortran/48931 diff --git a/libgfortran/config/fpu-387.h b/libgfortran/config/fpu-387.h index c3e57cba39b..8bf55b28a61 100644 --- a/libgfortran/config/fpu-387.h +++ b/libgfortran/config/fpu-387.h @@ -1,5 +1,5 @@ /* FPU-related code for x86 and x86_64 processors. - Copyright 2005, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright 2005, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by Francois-Xavier Coudert This file is part of the GNU Fortran 95 runtime library (libgfortran). @@ -40,9 +40,9 @@ sigill_hdlr (int sig __attribute((unused)), { sigill_caught = 1; /* Set PC to the instruction after the faulting one to skip over it, - otherwise we enter an infinite loop. 4 is the size of the stmxcsr + otherwise we enter an infinite loop. 3 is the size of the movaps instruction. */ - ucp->uc_mcontext.gregs[EIP] += 4; + ucp->uc_mcontext.gregs[EIP] += 3; setcontext (ucp); } #endif @@ -73,7 +73,7 @@ has_sse (void) /* We need a single SSE instruction here so the handler can safely skip over it. */ - __asm__ volatile ("movss %xmm2,%xmm1"); + __asm__ volatile ("movaps %xmm0,%xmm0"); sigaction (SIGILL, &oact, NULL);