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/elf/bsd-_setjmp.S1
-rw-r--r--sysdeps/i386/elf/bsd-setjmp.S1
-rw-r--r--sysdeps/i386/elf/setjmp.S72
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h71
4 files changed, 125 insertions, 20 deletions
diff --git a/sysdeps/i386/elf/bsd-_setjmp.S b/sysdeps/i386/elf/bsd-_setjmp.S
new file mode 100644
index 0000000000..1417270201
--- /dev/null
+++ b/sysdeps/i386/elf/bsd-_setjmp.S
@@ -0,0 +1 @@
+/* We don't need any code here since the setjmp.S file contains it.  */
diff --git a/sysdeps/i386/elf/bsd-setjmp.S b/sysdeps/i386/elf/bsd-setjmp.S
new file mode 100644
index 0000000000..1417270201
--- /dev/null
+++ b/sysdeps/i386/elf/bsd-setjmp.S
@@ -0,0 +1 @@
+/* We don't need any code here since the setjmp.S file contains it.  */
diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S
new file mode 100644
index 0000000000..d73e84364f
--- /dev/null
+++ b/sysdeps/i386/elf/setjmp.S
@@ -0,0 +1,72 @@
+/* setjmp for i386, ELF version.
+   Copyright (C) 1995, 1996, 1997 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#define _ASM
+#include <bits/setjmp.h>
+
+	/* We include the BSD entry points here as well but we make
+	   them weak.  */
+ENTRY (setjmp)
+	.weak C_SYMBOL_NAME (setjmp)
+	popl %eax		/* Pop return PC.  */
+	popl %ecx		/* Pop jmp_buf argument.  */
+	pushl $1		/* Push second argument of zero.  */
+	pushl %ecx		/* Push back first argument.  */
+	pushl %eax		/* Push back return PC.  */
+	jmp __sigsetjmp
+END (setjmp)
+
+	/* Binary compatibility entry point.  */
+ENTRY (_setjmp)
+	.weak C_SYMBOL_NAME (_setjmp)
+ENTRY (__setjmp)
+	popl %eax		/* Pop return address.  */
+	popl %ecx		/* Pop jmp_buf.  */
+	pushl $0		/* Push zero argument.  */
+	pushl %ecx		/* Push jmp_buf.  */
+	pushl %eax		/* Push back return address.  */
+
+ENTRY (__sigsetjmp)
+	movl 4(%esp), %eax	/* User's jmp_buf in %eax.  */
+     	/* Save registers.  */
+	movl %ebx, (JB_BX*4)(%eax)
+	movl %esi, (JB_SI*4)(%eax)
+	movl %edi, (JB_DI*4)(%eax)
+	movl %ebp, (JB_BP*4)(%eax)
+	leal 4(%esp), %ecx	/* Save SP as it will be after we return.  */
+     	movl %ecx, (JB_SP*4)(%eax)
+	movl 0(%esp), %ecx	/* Save PC we are returning to now.  */
+     	movl %ecx, (JB_PC*4)(%eax)
+
+	/* Make a tail call to __sigjmp_save; it takes the same args.  */
+#ifdef	PIC
+	/* We cannot use the PLT, because it requires that %ebx be set, but
+           we can't save and restore our caller's value.  Instead, we do an
+           indirect jump through the GOT, using for the temporary register
+           %ecx, which is call-clobbered.  */
+	call here
+here:	popl %ecx
+	addl $_GLOBAL_OFFSET_TABLE_+[.-here], %ecx
+	movl C_SYMBOL_NAME(__sigjmp_save@GOT)(%ecx), %ecx
+	jmp *%ecx
+#else
+	jmp __sigjmp_save
+#endif
+END (__sigsetjmp)
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 2fc5baf81e..b3736f8417 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -29,7 +29,7 @@
    all floating-point types.  */
 # define isgreater(x, y) \
      ({ int __result;							      \
-	__asm__ ("fucompp; fnstsw; andb $0x45, %%ah; setz %%al;"	      \
+	__asm__ ("fucompp; fnstsw; testb $0x45, %%ah; setz %%al;"	      \
 		 "andl $0x01, %0"					      \
 		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st", "st(1)"); \
 	__result; })
@@ -118,11 +118,11 @@
 #endif
 
 #define __inline_mathop_decl_(float_type, func, op, params...) \
-  __MATHINLINE float_type func (float_type);				      \
-  __MATHINLINE float_type func (float_type __x)				      \
+  __MATH_INLINE float_type func (float_type);				      \
+  __MATH_INLINE float_type func (float_type __x)			      \
   {									      \
     register float_type __result;					      \
-    __asm __volatile__ (op : "=t" (__results) : params);		      \
+    __asm __volatile__ (op : "=t" (__result) : params);			      \
     return __result;							      \
   }
 
@@ -163,8 +163,9 @@
   }
 
 
-/* Optimized inline implementation, sometimes woth reduced precision
+/* Optimized inline implementation, sometimes with reduced precision
    and/or argument range.  */
+
 #define __expm1_code \
   register long double __value;						      \
   register long double __exponent;					      \
@@ -266,7 +267,7 @@ __inline_mathcode2 (pow, __x, __y, \
       /* NOTREACHED */							      \
     }									      \
   __asm __volatile__							      \
-    ("fyl2x" : "=t" (__value) : "0" (__x), "u" (1.0) : "st1");		      \
+    ("fyl2x" : "=t" (__value) : "0" (__x), "u" (1.0) : "st(1)");	      \
   __asm __volatile__							      \
     ("fmul	%%st(1)		# y * log2(x)\n\t"			      \
      "fst	%%st(1)\n\t"						      \
@@ -285,26 +286,34 @@ __inline_mathcode2 (pow, __x, __y, \
 __inline_mathop (sqrt, "fsqrt")
 __inline_mathop_ (long double, __sqrtl, "fsqrt")
 
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+__inline_mathcode_ (fabs, __x, return __builtin_fabs (__x))
+__inline_mathcode_ (fabsf, __x, return __builtin_fabsf (__x))
+__inline_mathcode_ (fabsl, __x, return __builtin_fabsl (__x))
+__inline_mathcode_ (__fabsl, __x, return __builtin_fabsl (__x))
+#else
 __inline_mathop (fabs, "fabs")
+__inline_mathop_ (long double, __fabsl, "fabs")
+#endif
 
 /* The argument range of this inline version is reduced.  */
 __inline_mathop (sin, "fsin")
 /* The argument range of this inline version is reduced.  */
 __inline_mathop (cos, "fcos")
 
-__inline_mathop (atan, "fld1; fpatan")
+__inline_mathop_decl (atan, "fpatan", "u" (__x), "0" (1.0) : "st(1)")
 __inline_mathop (log, "fldln2; fxch; fyl2x")
 __inline_mathop (log10, "fldlg2; fxch; fyl2x")
 
 __inline_mathcode (asin, __x, return __atan2l (__x, __sqrtl (1.0 - __x * __x)))
 __inline_mathcode (acos, __x, return __atan2l (__sqrtl (1.0 - __x * __x), __x))
 
-__inline_mathcode (__sgn1, __x, return __x >= 0.0 ? 1.0 : -1.0)
+__inline_mathcode_ (long double, __sgn1l, __x, return __x >= 0.0 ? 1.0 : -1.0)
 
 
 /* The argument range of the inline version of sinhl is slightly reduced.  */
 __inline_mathcode (sinh, __x, \
-  register long double __exm1 = __expm1l (__builtin_fabsl (__x));	      \
+  register long double __exm1 = __expm1l (__fabsl (__x));		      \
   return 0.5 * (__exm1 / (__exm1 + 1.0) + __exm1) * __sgn1l (__x))
 
 __inline_mathcode (cosh, __x, \
@@ -312,7 +321,7 @@ __inline_mathcode (cosh, __x, \
   return 0.5 * (__ex + 1.0 / __ex))
 
 __inline_mathcode (tanh, __x, \
-  register long double __exm1 = __expm1l (-__builtin_fabsl (__x + __x));      \
+  register long double __exm1 = __expm1l (-__fabsl (__x + __x));	      \
   return __exm1 / (__exm1 + 2.0) * __sgn1l (-__x))
 
 
@@ -338,6 +347,20 @@ __inline_mathcode (ceil, __x, \
   __asm __volatile ("fldcw %0" : : "m" (__cw));				      \
   return __value)
 
+#define __ldexp_code \
+  register long double __value;						      \
+  __asm __volatile__							      \
+    ("fscale"								      \
+     : "=t" (__value) : "0" (__x), "u" ((long double) __y));		      \
+  return __value
+
+__MATH_INLINE double ldexp (double __x, int __y);
+__MATH_INLINE double
+ldexp (double __x, int __y)
+{
+  __ldexp_code;
+}
+
 
 /* Optimized versions for some non-standardized functions.  */
 #if defined __USE_ISOC9X || defined __USE_MISC
@@ -352,7 +375,7 @@ __inline_mathcode (expm1, __x, __expm1_code)
 
 __inline_mathcode (log1p, __x, \
   register long double __value;						      \
-  if (__builtin_fabsl (__x) >= 1.0 - 0.5 * __M_SQRT2)			      \
+  if (__fabsl (__x) >= 1.0 - 0.5 * __M_SQRT2)				      \
     __value = logl (1.0 + __x);						      \
   else									      \
     __asm __volatile__							      \
@@ -365,7 +388,7 @@ __inline_mathcode (log1p, __x, \
 
 /* The argument range of the inline version of asinhl is slightly reduced.  */
 __inline_mathcode (asinh, __x, \
-  register long double  __y = __builtin_fabsl (__x);			      \
+  register long double  __y = __fabsl (__x);				      \
   return (log1pl (__y * __y / (__sqrtl (__y * __y + 1.0) + 1.0) + __y)	      \
 	  * __sgn1l (__x))
 
@@ -373,7 +396,7 @@ __inline_mathcode (acosh, __x, \
   return logl (__x + __sqrtl (__x - 1.0) * __sqrtl (__x + 1.0)))
 
 __inline_mathcode (atanh, __x, \
-  register long double __y = __builtin_fabsl (__x);			      \
+  register long double __y = __fabsl (__x);				      \
   return (-0.5 * log1pl (-(__y + __y) / (1.0 + __y)) *			      \
 	  __sgn1l (__x)))
 
@@ -389,17 +412,25 @@ __inline_mathcode(logb, __x, \
      : "=t" (__junk), "=u" (__value) : "0" (__x));			      \
   return __value)
 
+__MATH_INLINE float ldexpf (float __x, int __y);
+__MATH_INLINE float
+ldexpf (float __x, int __y)
+{
+  __ldexp_code;
+}
+
+__MATH_INLINE long double ldexpl (long double __x, int __y);
+__MATH_INLINE long double
+ldexpl (long double __x, int __y)
+{
+  __ldexp_code;
+}
 
-__inline_mathcode2 (ldexp, __x, __y, \
-  register long double __value;						      \
-  __asm __volatile__							      \
-    ("fscale"								      \
-     : "=t" (__value) : "0" (__x), "u" ((long double) __y));		      \
-  return __value)
 #endif
 
 
 #ifdef __USE_MISC
+
 __inline_mathcode2 (drem, __x, __y, \
   register double __value;						      \
   __asm __volatile__							      \
@@ -431,7 +462,7 @@ __inline_mathcode (__sgn, __x, \
   return __x == 0.0 ? 0.0 : (__x > 0.0 ? 1.0 : -1.0))
 
 __inline_mathcode (__coshm1, __x, \
-  register long double __exm1 = __expm1l (__builtin_fabsl (__x));	      \
+  register long double __exm1 = __expm1l (__fabsl (__x));		      \
   return 0.5 * (__exm1 / (__exm1 + 1.0)) * __exm1)
 
 __inline_mathcode (__acosh1p, __x, \