diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-01-16 23:37:51 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-16 23:37:51 +0000 |
| commit | 376c348c9175470e8f48a563311203cbf8bf7e80 (patch) | |
| tree | 1725ce297747e29ea09e6b324404caf594332e5b /sysdeps/i386/bsd-setjmp.S | |
| parent | f806546c561b08d180e6f481a2720bcbbcfb9cda (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.S | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/sysdeps/i386/bsd-setjmp.S b/sysdeps/i386/bsd-setjmp.S index b26b0e1186..8fd69d6c6a 100644 --- a/sysdeps/i386/bsd-setjmp.S +++ b/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,5 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. 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 @@ -29,18 +29,30 @@ #include "bp-asm.h" ENTRY (BP_SYM (setjmp)) - PUSH_SIGNAL_MASK (1) -#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 + /* Note that we have to use a non-exported symbol in the next + jump since otherwise gas will emit it as a jump through the + PLT which is what we cannot use here. */ + 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 /* pop frame pointer to prepare for tail-call. */ + movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */ + + /* Call __sigjmp_save. */ + pushl $1 + pushl 8(%esp) + call BP_SYM (__sigjmp_save) + popl %ecx + popl %edx + ret END (BP_SYM (setjmp)) |