generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am e9797ac6: Merge "Fix clone.S for x86_64."

Browse Source 
* commit 'e9797ac6756481c0c219eb6b99f9062fd6dfb770':
  Fix clone.S for x86_64.
This commit is contained in:
Elliott Hughes 2013-10-17 22:56:03 -07:00 committed by Android Git Automerger
commit b956f3ce7a
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libc/arch-x86_64/bionic/clone.S
View File

@ -31,24 +31,24 @@
// int __pthread_clone(void* (*fn)(void*), void* tls, int flags, void* arg); // int __pthread_clone(void* (*fn)(void*), void* tls, int flags, void* arg);
ENTRY(__pthread_clone) ENTRY(__pthread_clone)
# save tls # Save tls.
movq %rsi, %r11 movq %rsi, %r11
# 16-byte alignment on child stack # 16-byte alignment for child stack.
andq $~15, %rsi andq $~15, %rsi
# insert arguments onto the child stack # Copy arguments onto the child stack.
movq %rdi, -32(%rsi) movq %rdi, -32(%rsi) # fn
movq %rcx, -24(%rsi) movq %rcx, -24(%rsi) # arg
movq %r11, -16(%rsi) movq %r11, -16(%rsi) # tls
subq $32, %rsi subq $32, %rsi
movq %rdx, %rdi movq %rdx, %rdi
movl $__NR_clone, %eax movl $__NR_clone, %eax
syscall syscall
testl %eax, %eax testl %eax, %eax
jns 1f jns 1f
# an error occurred, set errno and return -1 # An error occurred, set errno and return -1.
negl %eax negl %eax
movl %eax, %edi movl %eax, %edi
call __set_errno call __set_errno
@ -57,9 +57,12 @@ ENTRY(__pthread_clone)
1: 1:
jnz 2f jnz 2f
# we're in the child thread now, call __thread_entry # We're in the child thread now, call __thread_entry
# with the appropriate arguments on the child stack # with the arguments from the child stack moved into
# we already placed most of them # the appropriate registers.
popq %rdi
popq %rsi
popq %rdx
call __thread_entry call __thread_entry
hlt hlt
2: 2:
@ -103,6 +106,7 @@ ENTRY(__bionic_clone)
# we're in the child now, call __bionic_clone_entry # we're in the child now, call __bionic_clone_entry
# with the appropriate arguments on the child stack # with the appropriate arguments on the child stack
# we already placed most of them # we already placed most of them
# TODO: write a test for __bionic_clone and then fix this too (see above).
call __bionic_clone_entry call __bionic_clone_entry
hlt hlt