summary refs log tree commit diff
path: root/sysdeps/i386/fpu
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386/fpu')
-rw-r--r--sysdeps/i386/fpu/bits/fenv.h6
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h24
-rw-r--r--sysdeps/i386/fpu/fesetenv.c8
3 files changed, 19 insertions, 19 deletions
diff --git a/sysdeps/i386/fpu/bits/fenv.h b/sysdeps/i386/fpu/bits/fenv.h
index 4d06b01be3..cc2aa41634 100644
--- a/sysdeps/i386/fpu/bits/fenv.h
+++ b/sysdeps/i386/fpu/bits/fenv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -52,8 +52,8 @@ enum
 #define FE_DOWNWARD	FE_DOWNWARD
     FE_UPWARD = 0x800,
 #define FE_UPWARD	FE_UPWARD
-    FE_TOWARDSZERO = 0xc00
-#define FE_TOWARDSZERO	FE_TOWARDSZERO
+    FE_TOWARDZERO = 0xc00
+#define FE_TOWARDZERO	FE_TOWARDZERO
   };
 
 
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 9917316f7a..77b6cd5e51 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -39,36 +39,36 @@
    better code.  */
 #  define isgreater(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucomip; seta %%al"					      \
+	__asm__ ("fucomip %%st(1), %%st; seta %%al"			      \
 		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st");	      \
 	__result; })
 #  define isgreaterequal(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucomip; setae %%al"					      \
+	__asm__ ("fucomip %%st(1), %%st; setae %%al"			      \
 		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st");	      \
 	__result; })
 
 #  define isless(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucomip; setb %%al"					      \
-		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st");	      \
+	__asm__ ("fucomip %%st(1), %%st; seta %%al"			      \
+		 : "=a" (__result) : "u" (x), "t" (y) : "cc", "st");	      \
 	__result; })
 
 #  define islessequal(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucomip; setbe %%al"					      \
-		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st");	      \
+	__asm__ ("fucomip %%st(1), %%st; setae %%al"			      \
+		 : "=a" (__result) : "u" (x), "t" (y) : "cc", "st");	      \
 	__result; })
 
 #  define islessgreater(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucomip; setne %%al"					      \
+	__asm__ ("fucomip %%st(1), %%st; setne %%al"			      \
 		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st");	      \
 	__result; })
 
 #  define isunordered(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucomip; setp %%al"					      \
+	__asm__ ("fucomip %%st(1), %%st; setp %%al"			      \
 		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st");	      \
 	__result; })
 # else
@@ -87,14 +87,14 @@
 
 #  define isless(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucompp; fnstsw; sahf; setb %%al"			      \
-		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st", "st(1)"); \
+	__asm__ ("fucompp; fnstsw; testb $0x45, %%ah; setz %%al"	      \
+		 : "=a" (__result) : "u" (x), "t" (y) : "cc", "st", "st(1)"); \
 	__result; })
 
 #  define islessequal(x, y) \
      ({ register char __result;						      \
-	__asm__ ("fucompp; fnstsw; sahf; setbe %%al"			      \
-		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st", "st(1)"); \
+	__asm__ ("fucompp; fnstsw; testb $0x05, %%ah; setz %%al"	      \
+		 : "=a" (__result) : "u" (x), "t" (y) : "cc", "st", "st(1)"); \
 	__result; })
 
 #  define islessgreater(x, y) \
diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c
index e7300ea1e6..3faf01a568 100644
--- a/sysdeps/i386/fpu/fesetenv.c
+++ b/sysdeps/i386/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -50,7 +50,7 @@ fesetenv (const fenv_t *envp)
     }
   else if (envp == FE_NOMASK_ENV)
     {
-      temp.control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDSZERO);
+      temp.control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDZERO);
       temp.status_word &= ~FE_ALL_EXCEPT;
       temp.eip = 0;
       temp.cs_selector = 0;
@@ -60,9 +60,9 @@ fesetenv (const fenv_t *envp)
     }
   else
     {
-      temp.control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDSZERO);
+      temp.control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDZERO);
       temp.control_word |= (envp->control_word
-			    & (FE_ALL_EXCEPT | FE_TOWARDSZERO));
+			    & (FE_ALL_EXCEPT | FE_TOWARDZERO));
       temp.status_word &= ~FE_ALL_EXCEPT;
       temp.status_word |= envp->status_word & FE_ALL_EXCEPT;
       temp.eip = envp->eip;