aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-28 16:35:33 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-28 16:35:33 +0000
commitff8fecbe4269061dac905a895e1796112297a6fa (patch)
tree483899a09f3ae7582f1d572b0ed51e5fe8f44153 /sysdeps
parentef226fecbeae89451529fc9094b4a2c2387f6884 (diff)
downloadglibc-ff8fecbe4269061dac905a895e1796112297a6fa.tar
glibc-ff8fecbe4269061dac905a895e1796112297a6fa.tar.gz
glibc-ff8fecbe4269061dac905a895e1796112297a6fa.tar.bz2
glibc-ff8fecbe4269061dac905a895e1796112297a6fa.zip
Don't confuse unwinder by loading mangled values in %rbp and %rsp registers and by wrong cfi.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/x86_64/__longjmp.S23
1 files changed, 13 insertions, 10 deletions
diff --git a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S
index dd797e8a7b..31857e44ba 100644
--- a/sysdeps/x86_64/__longjmp.S
+++ b/sysdeps/x86_64/__longjmp.S
@@ -27,18 +27,26 @@
void __longjmp (__jmp_buf env, int val). */
ENTRY(__longjmp)
/* Restore registers. */
+ movq (JB_RSP*8)(%rdi),%r8
+ movq (JB_RBP*8)(%rdi),%r9
+ movq (JB_PC*8)(%rdi),%rdx
+#ifdef PTR_DEMANGLE
+ PTR_DEMANGLE (%r8)
+ PTR_DEMANGLE (%r9)
+ PTR_DEMANGLE (%rdx)
+#endif
/* We add unwind information for the target here. */
cfi_def_cfa(%rdi, 0)
+ cfi_register(%rsp,%r8)
+ cfi_register(%rbp,%r9)
+ cfi_register(%rip,%rdx)
cfi_offset(%rbx,JB_RBX*8)
cfi_offset(%rbp,JB_RBP*8)
cfi_offset(%r12,JB_R12*8)
cfi_offset(%r13,JB_R13*8)
cfi_offset(%r14,JB_R14*8)
cfi_offset(%r15,JB_R15*8)
- cfi_offset(%rsp,JB_RSP*8)
- cfi_offset(%rip,JB_PC*8)
movq (JB_RBX*8)(%rdi),%rbx
- movq (JB_RBP*8)(%rdi),%rbp
movq (JB_R12*8)(%rdi),%r12
movq (JB_R13*8)(%rdi),%r13
movq (JB_R14*8)(%rdi),%r14
@@ -48,12 +56,7 @@ ENTRY(__longjmp)
mov $01,%eax
cmove %eax,%esi
mov %esi, %eax
- movq (JB_PC*8)(%rdi),%rdx
- movq (JB_RSP*8)(%rdi),%rsp
-#ifdef PTR_DEMANGLE
- PTR_DEMANGLE (%rbp)
- PTR_DEMANGLE (%rsp)
- PTR_DEMANGLE (%rdx)
-#endif
+ movq %r8,%rsp
+ movq %r9,%rbp
jmpq *%rdx
END (BP_SYM (__longjmp))