This is my initial working version.

There is a bug in boot in this version: subhurd sometimes cannot boot.

1 files changed, 74 insertions, 0 deletions

diff --git a/libpthread/sysdeps/l4/hurd/i386/pt-setup.c b/libpthread/sysdeps/l4/hurd/i386/pt-setup.c
new file mode 100644
index 00000000..6540ee5b
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/pt-setup.c
@@ -0,0 +1,74 @@
+/* Setup thread stack.  Hurd/i386 version.
+   Copyright (C) 2000, 2002, 2008 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 Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <l4/l4.h>
+
+#include <pt-internal.h>
+
+/* The stack layout used on the i386 is:
+
+    -----------------
+   |  ARG            |
+    -----------------
+   |  START_ROUTINE  |
+    -----------------
+   |  0              |
+   -----------------  */
+
+/* Set up the stack for THREAD, such that it appears as if
+   START_ROUTINE and ARG were passed to the new thread's entry-point.
+   Return the stack pointer for the new thread.  We also take the
+   opportunity to install THREAD in our utcb.  */
+static void *
+stack_setup (struct __pthread *thread,
+	     void *(*start_routine)(void *), void *arg)
+{
+  L4_Word_t *top;
+
+  /* Calculate top of the new stack.  */
+  top = (L4_Word_t *) ((L4_Word_t) thread->stackaddr + thread->stacksize);
+
+  if (start_routine)
+    {
+      /* Set up call frame.  */
+      top -= 2*sizeof(L4_Word_t);
+      top = (unsigned long) top & ~0xf;
+      top[1] = (L4_Word_t) arg;	/* Argument to START_ROUTINE.  */
+      top[0] = (L4_Word_t) start_routine;
+      *--top = 0;		/* Fake return address.  */
+    }
+
+  return top;
+}
+
+int
+__pthread_setup (struct __pthread *thread,
+		 void (*entry_point)(void *(*)(void *), void *),
+		 void *(*start_routine)(void *), void *arg)
+{
+  thread->mcontext.pc = entry_point;
+  thread->mcontext.sp = stack_setup (thread, start_routine, arg);
+
+  if (L4_SameThreads (thread->threadid, L4_Myself ()))
+    L4_Set_MyUserDefinedHandle (thread);
+  else
+    L4_Set_UserDefinedHandle (thread->threadid, thread);
+
+  return 0;
+}