* sysdeps/alpha/tcb-offsets.sym (PID_OFFSET): New. * sysdeps/unix...

2004-03-11  Richard Henderson  <rth@redhat.com>

	* sysdeps/alpha/tcb-offsets.sym (PID_OFFSET): New.
	* sysdeps/unix/sysv/linux/alpha/pt-vfork.S: Save/restore PID.
	* sysdeps/unix/sysv/linux/alpha/vfork.S: New file.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7336385..76af903 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-11  Richard Henderson  <rth@redhat.com>
+
+       * sysdeps/alpha/tcb-offsets.sym (PID_OFFSET): New.
+       * sysdeps/unix/sysv/linux/alpha/pt-vfork.S: Save/restore PID.
+       * sysdeps/unix/sysv/linux/alpha/vfork.S: New file.
+
 2004-03-11  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/s390/s390-64/vfork.S (__vfork): Use jgnl

diff --git a/nptl/sysdeps/alpha/tcb-offsets.sym b/nptl/sysdeps/alpha/tcb-offsets.sym
index 3f6433d..a1a1e45 100644 (file)
--- a/nptl/sysdeps/alpha/tcb-offsets.sym
+++ b/nptl/sysdeps/alpha/tcb-offsets.sym
@@ -10,3 +10,4 @@
 #if TLS_MULTIPLE_THREADS_IN_TCB
 MULTIPLE_THREADS_OFFSET                thread_offsetof (header.multiple_threads)
 #endif
+PID_OFFSET                     thread_offsetof (pid)

diff --git a/nptl/sysdeps/unix/sysv/linux/alpha/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/alpha/pt-vfork.S
index 4a2df42..ec5d175 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/alpha/pt-vfork.S
+++ b/nptl/sysdeps/unix/sysv/linux/alpha/pt-vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* 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
@@ -16,10 +16,28 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <sysdep-cancel.h>
+#include <sysdep.h>
+#include <tcb-offsets.h>
+
+#undef PSEUDO_PREPARE_ARGS
+#define PSEUDO_PREPARE_ARGS                                            \
+       /* Load the current cached pid value across the vfork.  */      \
+       rduniq;                                                         \
+       ldl     a2, PID_OFFSET(v0);                                     \
+       mov     v0, a1;                                                 \
+       /* Write back its negation, to indicate that the pid value is   \
+          uninitialized in the the child, and in the window between    \
+          here and the point at which we restore the value.  */        \
+       negl    a2, t0;                                                 \
+       stl     t0, PID_OFFSET(v0);
+
+PSEUDO (__vfork, vfork, 0)
+
+       /* If we're back in the parent, restore the saved pid.  */
+       beq     v0, 1f
+       stl     a2, PID_OFFSET(a1)
+1:     ret
 
-PSEUDO(__vfork, vfork, 0)
-       ret
 PSEUDO_END (__vfork)
 
 weak_alias (__vfork, vfork)

diff --git a/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S b/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S
new file mode 100644 (file)
index 0000000..8bdf0eb
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/alpha/vfork.S
@@ -0,0 +1,46 @@
+/* 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>
+#include <tcb-offsets.h>
+
+#undef PSEUDO_PREPARE_ARGS
+#define PSEUDO_PREPARE_ARGS                                            \
+       /* Load the current cached pid value across the vfork.  */      \
+       rduniq;                                                         \
+       ldl     a2, PID_OFFSET(v0);                                     \
+       mov     v0, a1;                                                 \
+       /* If the cached value is initialized (nonzero), then write     \
+          back its negation, or INT_MIN, to indicate that the pid      \
+          value is uninitialized in the the child, and in the window   \
+          between here and the point at which we restore the value.  */ \
+       ldah    t0, -0x8000;                                            \
+       negl    a2, t1;                                                 \
+       cmovne  a2, t1, t0;                                             \
+       stl     t0, PID_OFFSET(v0);
+
+PSEUDO (__vfork, vfork, 0)
+
+       /* If we're back in the parent, restore the saved pid.  */
+       beq     v0, 1f
+       stl     a2, PID_OFFSET(a1)
+1:     ret
+
+PSEUDO_END (__vfork)
+
+weak_alias (__vfork, vfork)