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/elf/setjmp.S | |
parent | f806546c561b08d180e6f481a2720bcbbcfb9cda (diff) | |
download | glibc-376c348c9175470e8f48a563311203cbf8bf7e80.tar.gz glibc-376c348c9175470e8f48a563311203cbf8bf7e80.tar.xz glibc-376c348c9175470e8f48a563311203cbf8bf7e80.zip |
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/elf/setjmp.S')
-rw-r--r-- | sysdeps/i386/elf/setjmp.S | 71 |
1 files changed, 4 insertions, 67 deletions
diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S index c64c9ea696..d18b5b9276 100644 --- a/sysdeps/i386/elf/setjmp.S +++ b/sysdeps/i386/elf/setjmp.S @@ -28,70 +28,6 @@ #define JMPBUF PARMS #define SIGMSK JMPBUF+PTR_SIZE - /* We include the BSD entry points here as well but we make - them weak. */ -ENTRY (BP_SYM (setjmp)) - .weak C_SYMBOL_NAME (BP_SYM (setjmp)) - /* 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) -#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 here2 -here2: popl %ecx - addl $_GLOBAL_OFFSET_TABLE_+[.-here2], %ecx - movl C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOT)(%ecx), %ecx - call *%ecx -#else - call BP_SYM (__sigjmp_save) -#endif - popl %ecx - popl %edx - ret -END (BP_SYM (setjmp)) - -ENTRY (BP_SYM (_setjmp)) - .weak C_SYMBOL_NAME (BP_SYM (_setjmp)) - 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)) - ENTRY (BP_SYM (__sigsetjmp)) ENTER @@ -115,9 +51,10 @@ ENTRY (BP_SYM (__sigsetjmp)) 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 + call L(here) +L(here): + popl %ecx + addl $_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ecx movl C_SYMBOL_NAME (BP_SYM (__sigjmp_save)@GOT)(%ecx), %ecx jmp *%ecx #else |