about summary refs log tree commit diff
path: root/sysdeps/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/fpu/bits/fenv.h18
-rw-r--r--sysdeps/i386/fpu/fclrexcpt.c4
-rw-r--r--sysdeps/i386/fpu/feholdexcpt.c4
-rw-r--r--sysdeps/i386/fpu/fesetenv.c52
-rw-r--r--sysdeps/i386/fpu/fraiseexcpt.c8
-rw-r--r--sysdeps/i386/fpu/fsetexcptflg.c6
6 files changed, 46 insertions, 46 deletions
diff --git a/sysdeps/i386/fpu/bits/fenv.h b/sysdeps/i386/fpu/bits/fenv.h
index cc2aa41634..08bf67609c 100644
--- a/sysdeps/i386/fpu/bits/fenv.h
+++ b/sysdeps/i386/fpu/bits/fenv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999 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
@@ -65,18 +65,18 @@ typedef unsigned short int fexcept_t;
    to the layout of the block written by the `fstenv'.  */
 typedef struct
   {
-    unsigned short int control_word;
+    unsigned short int __control_word;
     unsigned short int __unused1;
-    unsigned short int status_word;
+    unsigned short int __status_word;
     unsigned short int __unused2;
-    unsigned short int tags;
+    unsigned short int __tags;
     unsigned short int __unused3;
-    unsigned int eip;
-    unsigned short int cs_selector;
-    unsigned int opcode:11;
+    unsigned int __eip;
+    unsigned short int __cs_selector;
+    unsigned int __opcode:11;
     unsigned int __unused4:5;
-    unsigned int data_offset;
-    unsigned short int data_selector;
+    unsigned int __data_offset;
+    unsigned short int __data_selector;
     unsigned short int __unused5;
   }
 fenv_t;
diff --git a/sysdeps/i386/fpu/fclrexcpt.c b/sysdeps/i386/fpu/fclrexcpt.c
index 0b43776f54..8bf53d9cfc 100644
--- a/sysdeps/i386/fpu/fclrexcpt.c
+++ b/sysdeps/i386/fpu/fclrexcpt.c
@@ -1,5 +1,5 @@
 /* Clear given exceptions in current floating-point environment.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -33,7 +33,7 @@ feclearexcept (int excepts)
   __asm__ ("fnstenv %0" : "=m" (*&temp));
 
   /* Clear the relevant bits.  */
-  temp.status_word &= excepts ^ FE_ALL_EXCEPT;
+  temp.__status_word &= excepts ^ FE_ALL_EXCEPT;
 
   /* Put the new data in effect.  */
   __asm__ ("fldenv %0" : : "m" (*&temp));
diff --git a/sysdeps/i386/fpu/feholdexcpt.c b/sysdeps/i386/fpu/feholdexcpt.c
index c9a0f73489..f056abb27c 100644
--- a/sysdeps/i386/fpu/feholdexcpt.c
+++ b/sysdeps/i386/fpu/feholdexcpt.c
@@ -1,5 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -29,7 +29,7 @@ feholdexcept (fenv_t *envp)
   __asm__ ("fnstenv %0" : "=m" (*envp));
 
   /* Now set all exceptions to non-stop.  */
-  work = envp->control_word | 0x3f;
+  work = envp->__control_word | 0x3f;
   __asm__ ("fldcw %0" : : "m" (*&work));
 
   return 1;
diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c
index 3641bb82d3..4a9cbed43f 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, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -39,37 +39,37 @@ fesetenv (const fenv_t *envp)
 
   if (envp == FE_DFL_ENV)
     {
-      temp.control_word |= FE_ALL_EXCEPT;
-      temp.control_word &= ~FE_TOWARDZERO;
-      temp.status_word &= ~FE_ALL_EXCEPT;
-      temp.eip = 0;
-      temp.cs_selector = 0;
-      temp.opcode = 0;
-      temp.data_offset = 0;
-      temp.data_selector = 0;
+      temp.__control_word |= FE_ALL_EXCEPT;
+      temp.__control_word &= ~FE_TOWARDZERO;
+      temp.__status_word &= ~FE_ALL_EXCEPT;
+      temp.__eip = 0;
+      temp.__cs_selector = 0;
+      temp.__opcode = 0;
+      temp.__data_offset = 0;
+      temp.__data_selector = 0;
     }
   else if (envp == FE_NOMASK_ENV)
     {
-      temp.control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDZERO);
-      temp.status_word &= ~FE_ALL_EXCEPT;
-      temp.eip = 0;
-      temp.cs_selector = 0;
-      temp.opcode = 0;
-      temp.data_offset = 0;
-      temp.data_selector = 0;
+      temp.__control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDZERO);
+      temp.__status_word &= ~FE_ALL_EXCEPT;
+      temp.__eip = 0;
+      temp.__cs_selector = 0;
+      temp.__opcode = 0;
+      temp.__data_offset = 0;
+      temp.__data_selector = 0;
     }
   else
     {
-      temp.control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDZERO);
-      temp.control_word |= (envp->control_word
-			    & (FE_ALL_EXCEPT | FE_TOWARDZERO));
-      temp.status_word &= ~FE_ALL_EXCEPT;
-      temp.status_word |= envp->status_word & FE_ALL_EXCEPT;
-      temp.eip = envp->eip;
-      temp.cs_selector = envp->cs_selector;
-      temp.opcode = envp->opcode;
-      temp.data_offset = envp->data_offset;
-      temp.data_selector = envp->data_selector;
+      temp.__control_word &= ~(FE_ALL_EXCEPT | FE_TOWARDZERO);
+      temp.__control_word |= (envp->__control_word
+			      & (FE_ALL_EXCEPT | FE_TOWARDZERO));
+      temp.__status_word &= ~FE_ALL_EXCEPT;
+      temp.__status_word |= envp->__status_word & FE_ALL_EXCEPT;
+      temp.__eip = envp->__eip;
+      temp.__cs_selector = envp->__cs_selector;
+      temp.__opcode = envp->__opcode;
+      temp.__data_offset = envp->__data_offset;
+      temp.__data_selector = envp->__data_selector;
     }
 
   __asm__ ("fldenv %0" : : "m" (temp));
diff --git a/sysdeps/i386/fpu/fraiseexcpt.c b/sysdeps/i386/fpu/fraiseexcpt.c
index d468449873..f39ab53b67 100644
--- a/sysdeps/i386/fpu/fraiseexcpt.c
+++ b/sysdeps/i386/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -59,7 +59,7 @@ feraiseexcept (int excepts)
       __asm__ __volatile__ ("fnstenv %0" : "=m" (*&temp));
 
       /* Set the relevant bits.  */
-      temp.status_word |= FE_OVERFLOW;
+      temp.__status_word |= FE_OVERFLOW;
 
       /* Put the new data in effect.  */
       __asm__ __volatile__ ("fldenv %0" : : "m" (*&temp));
@@ -80,7 +80,7 @@ feraiseexcept (int excepts)
       __asm__ __volatile__ ("fnstenv %0" : "=m" (*&temp));
 
       /* Set the relevant bits.  */
-      temp.status_word |= FE_UNDERFLOW;
+      temp.__status_word |= FE_UNDERFLOW;
 
       /* Put the new data in effect.  */
       __asm__ __volatile__ ("fldenv %0" : : "m" (*&temp));
@@ -101,7 +101,7 @@ feraiseexcept (int excepts)
       __asm__ __volatile__ ("fnstenv %0" : "=m" (*&temp));
 
       /* Set the relevant bits.  */
-      temp.status_word |= FE_INEXACT;
+      temp.__status_word |= FE_INEXACT;
 
       /* Put the new data in effect.  */
       __asm__ __volatile__ ("fldenv %0" : : "m" (*&temp));
diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c
index 598b8d2233..5861b4ee8a 100644
--- a/sysdeps/i386/fpu/fsetexcptflg.c
+++ b/sysdeps/i386/fpu/fsetexcptflg.c
@@ -1,5 +1,5 @@
 /* Set floating-point environment exception handling.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -30,8 +30,8 @@ fesetexceptflag (const fexcept_t *flagp, int excepts)
      separately set the status word.  */
   __asm__ ("fnstenv %0" : "=m" (*&temp));
 
-  temp.status_word &= ~(excepts & FE_ALL_EXCEPT);
-  temp.status_word |= *flagp & excepts & FE_ALL_EXCEPT;
+  temp.__status_word &= ~(excepts & FE_ALL_EXCEPT);
+  temp.__status_word |= *flagp & excepts & FE_ALL_EXCEPT;
 
   /* Store the new status word (along with the rest of the environment.
      Possibly new exceptions are set but they won't get executed unless