RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-12-15 03:05:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

match glibc/lsb cancellation abi on i386

Browse Source 
glibc made the ridiculous choice to use pass-by-register calling
convention for these functions, which is impossible to duplicate
directly on non-gcc compilers. instead, we use ugly asm to wrap and
convert the calling convention. presumably this works with every
compiler anyone could potentially want to use.
This commit is contained in:
Rich Felker 2011-03-25 22:13:57 -04:00
parent 92b52b70e8
commit ea343364a7
8 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/i386/bits/pthread.h
View File

@ -4,3 +4,22 @@ struct __ptcb {
struct __ptcb *__next;
void *__ptrs[3];
};
static inline void __pthread_register_cancel_2(struct __ptcb *__cb)
{
__asm__ __volatile__( "call __pthread_register_cancel" : : "a"(__cb) );
}
static inline void __pthread_unregister_cancel_2(struct __ptcb *__cb)
{
__asm__ __volatile__( "call __pthread_unregister_cancel" : : "a"(__cb) );
}
static inline void __pthread_unwind_next_2(struct __ptcb *__cb)
{
__asm__ __volatile__( "call __pthread_unwind_next" : : "a"(__cb) );
}
#define __pthread_register_cancel __pthread_register_cancel_2
#define __pthread_unregister_cancel __pthread_unregister_cancel_2
#define __pthread_unwind_next __pthread_unwind_next_2

2
include/pthread.h
View File

@ -181,9 +181,11 @@ int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
#include <bits/pthread.h>
int __setjmp(void *);
#ifndef __pthread_register_cancel
void __pthread_register_cancel(struct __ptcb *);
void __pthread_unregister_cancel(struct __ptcb *);
void __pthread_unwind_next(struct __ptcb *);
#endif
#define pthread_cleanup_push(f, x) \
do { struct __ptcb __cb; void (*__f)(void *) = (f); void *__x = (x); \

7
src/thread/cancellation.c
View File

@ -1,5 +1,12 @@
#include "pthread_impl.h"
#ifdef __pthread_register_cancel
#undef __pthread_register_cancel
#undef __pthread_unregister_cancel
#define __pthread_register_cancel __pthread_register_cancel_3
#define __pthread_unregister_cancel __pthread_unregister_cancel_3
#endif
void __pthread_register_cancel(struct __ptcb *cb)
{
struct pthread *self = pthread_self();

0
src/thread/cancellation2.c Normal file
View File

0
src/thread/cancellation3.c Normal file
View File

16
src/thread/i386/cancellation2.s Normal file
View File

@ -0,0 +1,16 @@
.text
.global __pthread_register_cancel
.type __pthread_register_cancel,%function
__pthread_register_cancel:
pushl %eax
call __pthread_register_cancel_3
popl %eax
ret
.global __pthread_unregister_cancel
.type __pthread_unregister_cancel,%function
__pthread_unregister_cancel:
pushl %eax
call __pthread_unregister_cancel_3
popl %eax
ret

8
src/thread/i386/cancellation3.s Normal file
View File

@ -0,0 +1,8 @@
.text
.global __pthread_unwind_next
.type __pthread_unwind_next,%function
__pthread_unwind_next:
pushl %eax
call __pthread_unwind_next_3
popl %eax
ret

5
src/thread/pthread_create.c
View File

@ -1,5 +1,10 @@
#include "pthread_impl.h"
#ifdef __pthread_unwind_next
#undef __pthread_unwind_next
#define __pthread_unwind_next __pthread_unwind_next_3
#endif
void __pthread_unwind_next(struct __ptcb *cb)
{
int i, j, not_finished;