aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2004-01-22 08:17:42 +0000
committerAndreas Jaeger <aj@suse.de>2004-01-22 08:17:42 +0000
commit4ef0929571b55d93f88fa42d167804938af37fad (patch)
treeea0697c6e75ed07407c66b96bfa1e53e167b7858
parente11676dd1c81cb5a6ca39455874050a4d3fe0245 (diff)
downloadglibc-4ef0929571b55d93f88fa42d167804938af37fad.tar
glibc-4ef0929571b55d93f88fa42d167804938af37fad.tar.gz
glibc-4ef0929571b55d93f88fa42d167804938af37fad.tar.bz2
glibc-4ef0929571b55d93f88fa42d167804938af37fad.zip
Add proper unwind information.
2004-01-22 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/x86_64/setcontext.S: Add proper unwind information.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/setcontext.S18
2 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ec0799af3..854dcef7d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-22 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/x86_64/setcontext.S: Add proper unwind
+ information.
+
2004-01-20 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/sys/epoll.h: Add EPOLLONESHOT.
diff --git a/sysdeps/unix/sysv/linux/x86_64/setcontext.S b/sysdeps/unix/sysv/linux/x86_64/setcontext.S
index e3d770bcc6..65c03d8a01 100644
--- a/sysdeps/unix/sysv/linux/x86_64/setcontext.S
+++ b/sysdeps/unix/sysv/linux/x86_64/setcontext.S
@@ -1,5 +1,5 @@
/* Install given context.
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
@@ -35,6 +35,7 @@
ENTRY(__setcontext)
/* Save argument since syscall will destroy it. */
pushq %rdi
+ cfi_adjust_cfa_offset(8)
/* Set the signal mask with
rt_sigprocmask (SIG_SETMASK, mask, NULL, _NSIG/8). */
@@ -45,6 +46,7 @@ ENTRY(__setcontext)
movq $__NR_rt_sigprocmask, %rax
syscall
popq %rdi /* Reload %rdi, adjust stack. */
+ cfi_adjust_cfa_offset(-8)
cmpq $-4095, %rax /* Check %rax for error. */
jae SYSCALL_ERROR_LABEL /* Jump to error handler if error. */
@@ -57,6 +59,16 @@ ENTRY(__setcontext)
/* Load the new stack pointer, the preserved registers and
registers used for passing args. */
+ cfi_def_cfa(%rdi, 0)
+ cfi_offset(%rbx,oRBX)
+ cfi_offset(%rbp,oRBP)
+ cfi_offset(%r12,oR12)
+ cfi_offset(%r13,oR13)
+ cfi_offset(%r14,oR14)
+ cfi_offset(%r15,oR15)
+ cfi_offset(%rsp,oRSP)
+ cfi_offset(%rip,oRIP)
+
movq oRSP(%rdi), %rsp
movq oRBX(%rdi), %rbx
movq oRBP(%rdi), %rbp
@@ -79,6 +91,10 @@ ENTRY(__setcontext)
/* Setup finally %rdi. */
movq oRDI(%rdi), %rdi
+ /* End FDE here, we fall into another context. */
+ cfi_endproc
+ cfi_startproc
+
/* Clear rax to indicate success. */
xorq %rax, %rax