Use __libc_ptf_call in _longjmp_unwind
Commit Message
Use __libc_ptf_call in _longjmp_unwind to avoid duplicated logic. On
x86-64, I got
jmp-unwind.os:
_longjmp_unwind:
movl __libc_pthread_functions_init(%rip), %eax
testl %eax, %eax
jne .L4
rep ret
.L4:
movq 304+__libc_pthread_functions(%rip), %rax
movq %rsp, %rsi
ror $2*8+1, %rax
xor %fs:48, %rax
jmp *%rax
jmp-unwind.o:
_longjmp_unwind:
movl $__pthread_cleanup_upto, %eax
testq %rax, %rax
je .L1
movq %rsp, %rsi
jmp __pthread_cleanup_upto
.L1:
rep ret
OK for master?
H.J.
---
* sysdeps/nptl/jmp-unwind.c: Include <libc-lock.h> instead of
<nptl/pthreadP.h>.
(_longjmp_unwind): Use __libc_ptf_call.
* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
---
sysdeps/nptl/jmp-unwind.c | 12 +++---------
sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 10 ++--------
2 files changed, 5 insertions(+), 17 deletions(-)
Comments
On 18 Sep 2015 04:29, H.J. Lu wrote:
> Use __libc_ptf_call in _longjmp_unwind to avoid duplicated logic.
ok ... looks straightforward enough
-mike
@@ -18,7 +18,7 @@
#include <setjmp.h>
#include <stddef.h>
-#include <nptl/pthreadP.h>
+#include <libc-lock.h>
extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
#pragma weak __pthread_cleanup_upto
@@ -27,12 +27,6 @@ extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
void
_longjmp_unwind (jmp_buf env, int val)
{
-#ifdef SHARED
- if (__libc_pthread_functions_init)
- PTHFCT_CALL (ptr___pthread_cleanup_upto, (env->__jmpbuf,
- CURRENT_STACK_FRAME));
-#else
- if (__pthread_cleanup_upto != NULL)
- __pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME);
-#endif
+ __libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf,
+ CURRENT_STACK_FRAME), 0);
}
@@ -18,7 +18,7 @@
#include <setjmp.h>
#include <stddef.h>
-#include <nptl/pthreadP.h>
+#include <libc-lock.h>
extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
#pragma weak __pthread_cleanup_upto
@@ -29,11 +29,5 @@ _longjmp_unwind (jmp_buf env, int val)
{
char local_var;
-#ifdef SHARED
- if (__libc_pthread_functions_init)
- PTHFCT_CALL (ptr___pthread_cleanup_upto, (env->__jmpbuf, &local_var));
-#else
- if (__pthread_cleanup_upto != NULL)
- __pthread_cleanup_upto (env->__jmpbuf, &local_var);
-#endif
+ __libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf, &local_var), 0);
}