mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
* sysdeps/i386/__longjmp.S [PTR_DEMANGLE]: Also demangle stack
pointer. Add CFI. * sysdeps/i386/bsd-_setjmp.S [PTR_MANGLE]: Also mangle stack pointer. * sysdeps/i386/bsd-setjmp.S: Likewise. * sysdeps/i386/setjmp.S: Likewise.
This commit is contained in:
parent
4973f31953
commit
272b289859
@ -1,5 +1,11 @@
|
|||||||
2005-12-28 Ulrich Drepper <drepper@redhat.com>
|
2005-12-28 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* sysdeps/i386/__longjmp.S [PTR_DEMANGLE]: Also demangle stack
|
||||||
|
pointer. Add CFI.
|
||||||
|
* sysdeps/i386/bsd-_setjmp.S [PTR_MANGLE]: Also mangle stack pointer.
|
||||||
|
* sysdeps/i386/bsd-setjmp.S: Likewise.
|
||||||
|
* sysdeps/i386/setjmp.S: Likewise.
|
||||||
|
|
||||||
* sysdeps/x86_64/__longjmp.S: No need to make sure return value is
|
* sysdeps/x86_64/__longjmp.S: No need to make sure return value is
|
||||||
!= 0, the caller did that.
|
!= 0, the caller did that.
|
||||||
|
|
||||||
|
@ -32,6 +32,36 @@
|
|||||||
ENTRY (BP_SYM (__longjmp))
|
ENTRY (BP_SYM (__longjmp))
|
||||||
ENTER
|
ENTER
|
||||||
|
|
||||||
|
#ifdef PTR_DEMANGLE
|
||||||
|
movl JBUF(%esp), %eax /* User's jmp_buf in %eax. */
|
||||||
|
CHECK_BOUNDS_BOTH_WIDE (%eax, JBUF(%esp), $JB_SIZE)
|
||||||
|
|
||||||
|
/* Save the return address now. */
|
||||||
|
movl (JB_PC*4)(%eax), %edx
|
||||||
|
/* Get the stack pointer. */
|
||||||
|
movl (JB_SP*4)(%eax), %ecx
|
||||||
|
PTR_DEMANGLE (%edx)
|
||||||
|
PTR_DEMANGLE (%ecx)
|
||||||
|
cfi_def_cfa(%eax, 0)
|
||||||
|
cfi_register(%eip, %edx)
|
||||||
|
cfi_register(%esp, %ecx)
|
||||||
|
cfi_offset(%ebx, JB_BX*4)
|
||||||
|
cfi_offset(%esi, JB_SI*4)
|
||||||
|
cfi_offset(%edi, JB_DI*4)
|
||||||
|
cfi_offset(%ebp, JB_BP*4)
|
||||||
|
/* Restore registers. */
|
||||||
|
movl (JB_BX*4)(%eax), %ebx
|
||||||
|
movl (JB_SI*4)(%eax), %esi
|
||||||
|
movl (JB_DI*4)(%eax), %edi
|
||||||
|
movl (JB_BP*4)(%eax), %ebp
|
||||||
|
cfi_restore(%ebx)
|
||||||
|
cfi_restore(%esi)
|
||||||
|
cfi_restore(%edi)
|
||||||
|
cfi_restore(%ebp)
|
||||||
|
|
||||||
|
movl VAL(%esp), %eax /* Second argument is return value. */
|
||||||
|
movl %ecx, %esp
|
||||||
|
#else
|
||||||
movl JBUF(%esp), %ecx /* User's jmp_buf in %ecx. */
|
movl JBUF(%esp), %ecx /* User's jmp_buf in %ecx. */
|
||||||
CHECK_BOUNDS_BOTH_WIDE (%ecx, JBUF(%esp), $JB_SIZE)
|
CHECK_BOUNDS_BOTH_WIDE (%ecx, JBUF(%esp), $JB_SIZE)
|
||||||
|
|
||||||
@ -44,8 +74,6 @@ ENTRY (BP_SYM (__longjmp))
|
|||||||
movl (JB_DI*4)(%ecx), %edi
|
movl (JB_DI*4)(%ecx), %edi
|
||||||
movl (JB_BP*4)(%ecx), %ebp
|
movl (JB_BP*4)(%ecx), %ebp
|
||||||
movl (JB_SP*4)(%ecx), %esp
|
movl (JB_SP*4)(%ecx), %esp
|
||||||
#ifdef PTR_DEMANGLE
|
|
||||||
PTR_DEMANGLE (%edx)
|
|
||||||
#endif
|
#endif
|
||||||
/* Jump to saved PC. */
|
/* Jump to saved PC. */
|
||||||
jmp *%edx
|
jmp *%edx
|
||||||
|
@ -44,6 +44,9 @@ ENTRY (BP_SYM (_setjmp))
|
|||||||
movl %esi, (JB_SI*4)(%edx)
|
movl %esi, (JB_SI*4)(%edx)
|
||||||
movl %edi, (JB_DI*4)(%edx)
|
movl %edi, (JB_DI*4)(%edx)
|
||||||
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
|
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
|
||||||
|
#ifdef PTR_MANGLE
|
||||||
|
PTR_MANGLE (%ecx)
|
||||||
|
#endif
|
||||||
movl %ecx, (JB_SP*4)(%edx)
|
movl %ecx, (JB_SP*4)(%edx)
|
||||||
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
|
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
|
||||||
#ifdef PTR_MANGLE
|
#ifdef PTR_MANGLE
|
||||||
|
@ -46,6 +46,9 @@ ENTRY (BP_SYM (setjmp))
|
|||||||
movl %esi, (JB_SI*4)(%eax)
|
movl %esi, (JB_SI*4)(%eax)
|
||||||
movl %edi, (JB_DI*4)(%eax)
|
movl %edi, (JB_DI*4)(%eax)
|
||||||
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
|
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
|
||||||
|
#ifdef PTR_MANGLE
|
||||||
|
PTR_MANGLE (%ecx)
|
||||||
|
#endif
|
||||||
movl %ecx, (JB_SP*4)(%eax)
|
movl %ecx, (JB_SP*4)(%eax)
|
||||||
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
|
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
|
||||||
#ifdef PTR_MANGLE
|
#ifdef PTR_MANGLE
|
||||||
|
@ -40,6 +40,9 @@ ENTRY (BP_SYM (__sigsetjmp))
|
|||||||
movl %esi, (JB_SI*4)(%eax)
|
movl %esi, (JB_SI*4)(%eax)
|
||||||
movl %edi, (JB_DI*4)(%eax)
|
movl %edi, (JB_DI*4)(%eax)
|
||||||
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
|
leal JMPBUF(%esp), %ecx /* Save SP as it will be after we return. */
|
||||||
|
#ifdef PTR_MANGLE
|
||||||
|
PTR_MANGLE (%ecx)
|
||||||
|
#endif
|
||||||
movl %ecx, (JB_SP*4)(%eax)
|
movl %ecx, (JB_SP*4)(%eax)
|
||||||
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
|
movl PCOFF(%esp), %ecx /* Save PC we are returning to now. */
|
||||||
#ifdef PTR_MANGLE
|
#ifdef PTR_MANGLE
|
||||||
|
Loading…
Reference in New Issue
Block a user