Update.

2004-03-11  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/sh/tcb-offsets.sym: Add PID.
	* sysdeps/unix/sysv/linux/sh/pt-vfork.S: Properly handle PID cache.
	* sysdeps/unix/sysv/linux/sh/vfork.S: New file.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 267736a7fbbae78f289fc8c23db92795f0a9df1d..2b83bc076af07acdea9606b0513db1ba027fc772 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-11  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+       * sysdeps/sh/tcb-offsets.sym: Add PID.
+       * sysdeps/unix/sysv/linux/sh/pt-vfork.S: Properly handle PID cache.
+       * sysdeps/unix/sysv/linux/sh/vfork.S: New file.
+
 2004-03-10  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S: No need to

diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/nptl/sysdeps/sh/tcb-offsets.sym
index e96daf980f86e0a4a5d7d78b493419fd0d2b67a1..539789a8170f65fac72d66c214b0619b7c98d6f8 100644 (file)
--- a/nptl/sysdeps/sh/tcb-offsets.sym
+++ b/nptl/sysdeps/sh/tcb-offsets.sym
@@ -3,6 +3,7 @@
 
 RESULT                 offsetof (struct pthread, result)
 TID                    offsetof (struct pthread, tid)
+PID                    offsetof (struct pthread, pid)
 CANCELHANDLING         offsetof (struct pthread, cancelhandling)
 CLEANUP_JMP_BUF                offsetof (struct pthread, cleanup_jmp_buf)
 MULTIPLE_THREADS_OFFSET        offsetof (struct pthread, header.multiple_threads)

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S
index 5b13639c7774bf7be272f1d55a0871ca6668e516..2d1148daa591b2bad2a693267c78b84d95d4c5a1 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pt-vfork.S
@@ -1 +1,66 @@
-#include <sysdeps/unix/sysv/linux/sh/vfork.S>
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#define _ERRNO_H       1
+#include <bits/errno.h>
+#include <tcb-offsets.h>
+
+/* Clone the calling process, but without copying the whole address space.
+   The calling process is suspended until the new process exits or is
+   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
+   and the process ID of the new process to the old process.  */
+
+ENTRY (__vfork)
+       /* Save the PID value.  */
+       stc     gbr, r2
+       mov.w   .L2, r0
+       mov.l   @(r0,r2), r4
+       neg     r4, r1
+       mov.l   r1, @(r0,r2)
+
+       mov.w   .L1, r3
+       trapa   #0x10
+       mov     r0, r1
+
+       /* Restore the old PID value in the parent.  */
+       tst     r0, r0
+       bt/s    2f
+        stc    gbr, r2
+       mov.w   .L2, r0
+       mov.l   r4, @(r0,r2)
+       mov     r1, r0
+2:
+       mov     #-12, r2
+       shad    r2, r1
+       not     r1, r1                  // r1=0 means r0 = -1 to -4095
+       tst     r1, r1                  // i.e. error in linux
+       bf      .Lpseudo_end
+       SYSCALL_ERROR_HANDLER
+.Lpseudo_end:
+       rts
+        nop
+.L1:
+       .word   __NR_vfork
+.L2:
+       .word   PID - TLS_PRE_TCB_SIZE
+
+PSEUDO_END (__vfork)
+libc_hidden_def (__vfork)
+
+weak_alias (__vfork, vfork)

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/vfork.S b/nptl/sysdeps/unix/sysv/linux/sh/vfork.S
new file mode 100644 (file)
index 0000000..5433eac
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/sh/vfork.S
@@ -0,0 +1,71 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#define _ERRNO_H       1
+#include <bits/errno.h>
+#include <tcb-offsets.h>
+
+/* Clone the calling process, but without copying the whole address space.
+   The calling process is suspended until the new process exits or is
+   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
+   and the process ID of the new process to the old process.  */
+
+ENTRY (__vfork)
+       /* Save the PID value.  */
+       stc     gbr, r2
+       mov.w   .L2, r0
+       mov.l   @(r0,r2), r4
+       neg     r4, r1
+       tst     r1, r1
+       bf      1f
+       mov     #1, r1
+       rotr    r1
+1:
+       mov.l   r1, @(r0,r2)
+
+       mov.w   .L1, r3
+       trapa   #0x10
+       mov     r0, r1
+
+       /* Restore the old PID value in the parent.  */
+       tst     r0, r0
+       bt.s    2f
+        stc    gbr, r2
+       mov.w   .L2, r0
+       mov.l   r4, @(r0,r2)
+       mov     r1, r0
+2:
+       mov     #-12, r2
+       shad    r2, r1
+       not     r1, r1                  // r1=0 means r0 = -1 to -4095
+       tst     r1, r1                  // i.e. error in linux
+       bf      .Lpseudo_end
+       SYSCALL_ERROR_HANDLER
+.Lpseudo_end:
+       rts
+        nop
+.L1:
+       .word   __NR_vfork
+.L2:
+       .word   PID - TLS_PRE_TCB_SIZE
+       .align  2
+PSEUDO_END (__vfork)
+libc_hidden_def (__vfork)
+
+weak_alias (__vfork, vfork)