New syscall interface

diff --git a/libc/sysdeps/linux/h8300/clone.S b/libc/sysdeps/linux/h8300/clone.S
index 554a297..7c5a530 100644 (file)
--- a/libc/sysdeps/linux/h8300/clone.S
+++ b/libc/sysdeps/linux/h8300/clone.S
@@ -1,5 +1,4 @@
-/* Adapted from glibc */
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. */
+/* Copyright 2015 Yoshinori Sato <ysato@users.sourceforge.jp> */
 
 /* clone is even more special than fork as it mucks with stacks
    and invokes a function in the right context after its all over.  */
@@ -8,7 +7,8 @@
 #include <bits/errno.h>
 #include <sys/syscall.h>
 
-/* int _clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
+/* int _clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg
+               void *parent_tidptr, void *tls, void *child_tidptr)  */
 
 #ifdef __H8300H__
        .h8300h
@@ -18,8 +18,8 @@
 #endif
 
 .text
-.globl _clone
-_clone:
+.globl clone
+clone:
        /* Sanity check arguments.  */
        mov.l   #-EINVAL,er3
        mov.l   er0,er0                 /* no NULL function pointers */
@@ -31,13 +31,25 @@ _clone:
        mov.l   @(4:16,sp),er3
        mov.l   er3,@-er1
 
-       /* Do the system call */
+       /* setup argument */
        mov.l   er0,er3                 /* er3 = child entry */
-       mov.l   er1,er0
-       mov.l   er2,er1                 /* er1 = flags */
-       mov.l   er0,er2                 /* er2 = child sp */
-       mov.l   #__NR_clone,r0
+       sub.l   #20,sp
+       mov.l   er2,@sp                 /* flags */
+       mov.l   er1,@(4,sp)             /* new sp */
+       mov.l   sp,er1
+       mov.l   @(20+8,sp),er0
+       mov.l   er0,@er1                /* parent tid */
+       adds    #4,er1
+       mov.l   @(20+16,sp),er0
+       mov.l   er0,@er1                /* child tid */
+       adds    #4,er1
+       mov.l   @(20+12,sp),er0
+       mov.l   er0,@er1                /* tls */
+       /* do the system call */
+       mov.l   sp,er1
+       mov.l   #__NR_clone,er0
        trapa   #0
+       add.l   #20,sp
        mov.l   er0,er0
        bmi     __syscall_error
        beq     thread_start
@@ -66,3 +78,5 @@ thread_start:
        mov.l   er0,er1
        mov.l   #__NR_exit,er0
        trapa   #0
+
+       .end

diff --git a/libc/sysdeps/linux/h8300/vfork.S b/libc/sysdeps/linux/h8300/vfork.S
index 9b65f4f..dc43c34 100644 (file)
--- a/libc/sysdeps/linux/h8300/vfork.S
+++ b/libc/sysdeps/linux/h8300/vfork.S
@@ -1,3 +1,4 @@
+/* Copyright 2002, 2015 Yoshinori Sato <ysato@users.sourceforge.jp> */
 
 #include <sys/syscall.h>
 
@@ -12,14 +13,16 @@
 #endif
        .text
        .align 2
-       .globl  ___vfork
-       .hidden ___vfork
-       .type   ___vfork,@function
-___vfork:
+       .globl  __vfork
+       .hidden __vfork
+       .type   __vfork,@function
+__vfork:
+#ifdef __NR_vfork
        mov.l   @sp+, er1
        sub.l   er0,er0
        mov.b   #__NR_vfork,r0l
        trapa   #0
+
        mov.l   #-4096, er2
        cmp.l   er0,er2
        bcs     fix_errno
@@ -27,14 +30,43 @@ ___vfork:
 fix_errno:
        neg.l   er0
 #if !defined(__PIC__)
-       mov.l   er0,@_errno
+       mov.l   er0,@errno
 #else
-       mov.l   @(_errno@GOTOFF,er5),er2
+       mov.l   @(errno@GOTOFF,er5),er2
        mov.l   er0,@er2
 #endif
        sub.l   er0,er0
        dec.l   #1,er0
        jmp     @er1                     /* don't return,  just jmp directly */
+#else
+       mov.l   @sp+,er2                /* er2 = return address */
+       mov.l   #vfork_args,er1
+       sub.l   er0,er0
+       mov.b   #__NR_clone,r0l
+       trapa   #0
+       mov.l   #-4096,er1
+       cmp.l   er0,er1
+       bcc     done
+       neg.l   er0
+#if !defined(__PIC__)
+       mov.l   er0,@errno
+#else
+       mov.l   @(errno@GOTOFF,er5),er2
+       mov.l   er0,@er2
+#endif
+       sub.l   er0,er0
+       dec.l   #1,er0
+done:
+       jmp     @er1
+
+vfork_args:
+       .long   CLONE_VFORK | CLONE_VM | SIGCHLD
+       .long   0
+       .long   0
+       .long   0
+       .long   0
+#endif
 
 weak_alias(__vfork,vfork)
 libc_hidden_def(vfork)
+       .end