about summary refs log tree commit diff
path: root/src/thread
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-15 03:24:58 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-15 03:24:58 -0500
commit0b2006c8fea021b7fa1fd267bf270cb8c279f230 (patch)
tree2e00de9bc9e3fdda590ff05b64e77f0bb4e30ec3 /src/thread
parent59666802fba592a59f2f4ea4dcb053287fd55826 (diff)
downloadmusl-0b2006c8fea021b7fa1fd267bf270cb8c279f230.tar.gz
musl-0b2006c8fea021b7fa1fd267bf270cb8c279f230.tar.xz
musl-0b2006c8fea021b7fa1fd267bf270cb8c279f230.zip
begin unifying clone/thread management interface in preparation for porting
Diffstat (limited to 'src/thread')
-rw-r--r--src/thread/i386/clone.s42
-rw-r--r--src/thread/pthread_create.c6
2 files changed, 19 insertions, 29 deletions
diff --git a/src/thread/i386/clone.s b/src/thread/i386/clone.s
index 4f33366c..53405cf1 100644
--- a/src/thread/i386/clone.s
+++ b/src/thread/i386/clone.s
@@ -1,35 +1,27 @@
 .text
-.global __clone
-.type   __clone,%function
-__clone:
-	movl	8(%esp),%ecx
-	andl	$0xfffffff0, %ecx
-	subl	$28,%ecx
-	movl	16(%esp),%eax
-	movl	%eax,12(%ecx)
-	movl	4(%esp),%eax
-	movl	%eax,8(%ecx)
+.global __uniclone
+.type   __uniclone,%function
+__uniclone:
+	movl	4(%esp),%ecx
+	subl	$24,%ecx
+	movl	8(%esp),%eax
+	movl	%eax,16(%ecx)
+	movl	12(%esp),%eax
+	movl	%eax,24(%ecx)
 	pushl	%ebx
 	pushl	%esi
 	pushl	%edi
+	pushl   %ebp
+	movl    %eax,8(%eax)
+	leal    20(%eax),%edx
+	leal    4(%eax),%esi
+	movl	%edx,%edi
+	movl	$0x7d0f00,%ebx
 	movl	$120,%eax
-	movl	12+12(%esp),%ebx
-	movl	20+12(%esp),%edx
-	movl	24+12(%esp),%esi
-	movl	28+12(%esp),%edi
 	int	$128
+	popl    %ebp
 	popl	%edi
 	popl	%esi
 	popl	%ebx
-	test	%eax,%eax
-	jnz	1f
-	xorl	%ebp,%ebp
-	call	*%ebx
-	movl	%eax, %ebx
-	movl	$1, %eax
-	int	$128
-1:	
-	movl %eax, 4(%esp)
 	ret
-
-.size __clone,.-__clone
+.size __uniclone,.-__uniclone
diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index d01be551..af6ccf07 100644
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -152,8 +152,7 @@ static int start(void *p)
 	return 0;
 }
 
-#define CLONE_MAGIC 0x7d0f00
-int __clone(int (*)(void *), void *, int, void *, pid_t *, void *, pid_t *);
+int __uniclone(void *, int (*)(), void *);
 
 #define ROUND(x) (((x)+PAGE_SIZE-1)&-PAGE_SIZE)
 
@@ -203,8 +202,7 @@ int pthread_create(pthread_t *res, const pthread_attr_t *attr, void *(*entry)(vo
 	while (rs.lock) __wait(&rs.lock, 0, 1, 1);
 
 	a_inc(&libc.threads_minus_1);
-	ret = __clone(start, stack, CLONE_MAGIC, new,
-		&new->tid, &new->tlsdesc, &new->tid);
+	ret = __uniclone(stack, start, new);
 
 	a_dec(&rs.blocks);
 	if (rs.lock) __wake(&rs.blocks, 1, 1);