Correct the FE_INEXACT and FE_UNDERFLOW cases.

diff --git a/sysdeps/m68k/fpu/fraiseexcpt.c b/sysdeps/m68k/fpu/fraiseexcpt.c
index 51411dd29238ba9de4e81629719ad8ba93826c55..d509604e2812f3feec0b0369d1c68f8209d5a37e 100644 (file)
--- a/sysdeps/m68k/fpu/fraiseexcpt.c
+++ b/sysdeps/m68k/fpu/fraiseexcpt.c
@@ -48,15 +48,43 @@ feraiseexcept (int excepts)
   /* Next: overflow.  */
   if (excepts & FE_OVERFLOW)
     {
+      /* We cannot raise the overflow exception without also setting the
+        inexact flag.  Restore it after the operation, unless it should
+        be set anyway.  */
       long double d = LDBL_MAX;
-      __asm__ __volatile__ ("fmul%.x %0,%0; fnop" : "=f" (d) : "0" (d));
+      fexcept_t fpsr;
+
+      __asm__ ("fmove%.l %/fpsr,%0" : "=dm" (fpsr));
+      __asm__ __volatile__ ("fmul%.x %0,%0" : "=f" (d) : "0" (d));
+      if (!((excepts | fpsr) & FE_INEXACT))
+       {
+         __asm__ ("fmove%.l %/fpsr,%0" : "=dm" (fpsr));
+         fpsr &= ~FE_INEXACT;
+         __asm__ __volatile__ ("fmove%.l %0,%/fpsr" : : "dm" (fpsr));
+       }
+      else
+       __asm__ ("fnop");
     }
 
   /* Next: underflow.  */
   if (excepts & FE_UNDERFLOW)
     {
-      long double d = LDBL_MIN;
-      __asm__ __volatile__ ("fdiv%.s %#0r16,%0; fnop" : "=f" (d) : "0" (d));
+      /* We cannot raise the underflow exception without also setting the
+        inexact flag.  Restore it after the operation, unless it should
+        be set anyway.  */
+      long double d = -LDBL_MAX;
+      fexcept_t fpsr;
+
+      __asm__ ("fmove%.l %/fpsr,%0" : "=dm" (fpsr));
+      __asm__ __volatile__ ("fetox%.x %0" : "=f" (d) : "0" (d));
+      if (!((excepts | fpsr) & FE_INEXACT))
+       {
+         __asm__ ("fmove%.l %/fpsr,%0" : "=dm" (fpsr));
+         fpsr &= ~FE_INEXACT;
+         __asm__ __volatile__ ("fmove%.l %0,%/fpsr" : : "dm" (fpsr));
+       }
+      else
+       __asm__ ("fnop");
     }
 
   /* Last: inexact.  */