summaryrefslogtreecommitdiff
path: root/sysdeps/i386/bsd-_setjmp.S
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-16 23:37:51 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-16 23:37:51 +0000
commit376c348c9175470e8f48a563311203cbf8bf7e80 (patch)
tree1725ce297747e29ea09e6b324404caf594332e5b /sysdeps/i386/bsd-_setjmp.S
parentf806546c561b08d180e6f481a2720bcbbcfb9cda (diff)
Update.
* sysdeps/i386/elf/bsd-setjmp.S: Real implementation. * sysdeps/i386/elf/bsd-_setjmp.S: Removed. * sysdeps/i386/elf/setjmp.S (setjmp): Removed here. * sysdeps/i386/bsd-_setjmp.S: Real implementation. * sysdeps/i386/bsd-setjmp.S: Real implementation. * sysdeps/i386/bits/setjmp.h: Remove PUSH_SIGNAL_MASK definition. * sysdeps/i386/setjmp.S: Remove PIC support. This is the non-ELF version. * stdio-common/tstscanf.c (main): Add two testcases for '*' modifier.
Diffstat (limited to 'sysdeps/i386/bsd-_setjmp.S')
-rw-r--r--sysdeps/i386/bsd-_setjmp.S36
1 files changed, 21 insertions, 15 deletions
diff --git a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S
index 0983ba8e97..aa9b8edfd8 100644
--- a/sysdeps/i386/bsd-_setjmp.S
+++ b/sysdeps/i386/bsd-_setjmp.S
@@ -1,5 +1,5 @@
/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version.
- Copyright (C) 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1994,1995,1996,1997,2000,2001 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
@@ -28,19 +28,25 @@
#include "bp-sym.h"
#include "bp-asm.h"
+#define PARMS LINKAGE /* no space for saved regs */
+#define JMPBUF PARMS
+#define SIGMSK JMPBUF+PTR_SIZE
+
ENTRY (BP_SYM (_setjmp))
- PUSH_SIGNAL_MASK (0)
-#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 (BP_SYM (__sigsetjmp)@GOT)(%ecx), %ecx
- jmp *%ecx
-#else
- jmp BP_SYM (__sigsetjmp)
-#endif
+ ENTER
+
+ movl JMPBUF(%esp), %eax
+ CHECK_BOUNDS_BOTH_WIDE (%eax, JMPBUF(%esp), $JB_SIZE)
+
+ /* Save registers. */
+ movl %ebx, (JB_BX*4)(%eax)
+ movl %esi, (JB_SI*4)(%eax)
+ movl %edi, (JB_DI*4)(%eax)
+ leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
+ movl %ecx, (JB_SP*4)(%eax)
+ movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
+ movl %ecx, (JB_PC*4)(%eax)
+ LEAVE
+ movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
+ ret
END (BP_SYM (_setjmp))