OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use __libc_ptf_call in _longjmp_unwind 

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

	* 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.
This commit is contained in:
H.J. Lu 2015-09-18 12:22:36 -07:00
parent 3ee578690f
commit 94afa0a5f3
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2015-09-18 H.J. Lu <hongjiu.lu@intel.com>
* 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.
2015-09-18 David Lamparter <equinox-gentoo@diac24.net>
* sysdeps/arm/setjmp.S: Change PIC to SHARED.

12
sysdeps/nptl/jmp-unwind.c
View File

@ -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);
}

10
sysdeps/unix/sysv/linux/s390/jmp-unwind.c
View File

@ -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);
}