This is my initial working version.

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

12 files changed, 216 insertions, 0 deletions

diff --git a/libpthread/sysdeps/l4/hurd/CVS/Entries b/libpthread/sysdeps/l4/hurd/CVS/Entries
new file mode 100644
index 00000000..280c2c1f
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Entries
@@ -0,0 +1,3 @@
+/pt-sysdep.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-sysdep.h/1.2/Tue Jan 18 10:08:52 2005//Tzhengda-soc2008-virt-branch
+D/i386////
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Repository b/libpthread/sysdeps/l4/hurd/CVS/Repository
new file mode 100644
index 00000000..751f5e08
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Repository
@@ -0,0 +1 @@
+hurd/libpthread/sysdeps/l4/hurd
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Root b/libpthread/sysdeps/l4/hurd/CVS/Root
new file mode 100644
index 00000000..a10aa66d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Root
@@ -0,0 +1 @@
+:ext:zhengda@cvs.savannah.gnu.org:/sources/hurd
diff --git a/libpthread/sysdeps/l4/hurd/CVS/Tag b/libpthread/sysdeps/l4/hurd/CVS/Tag
new file mode 100644
index 00000000..7e454c6d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/CVS/Tag
@@ -0,0 +1 @@
+Tzhengda-soc2008-virt-branch
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Entries b/libpthread/sysdeps/l4/hurd/i386/CVS/Entries
new file mode 100644
index 00000000..867e57ea
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Entries
@@ -0,0 +1,3 @@
+/pt-machdep.c/1.1/Thu Oct 10 23:05:05 2002//Tzhengda-soc2008-virt-branch
+/pt-setup.c/1.3/Tue Jul  1 11:43:17 2008//Tzhengda-soc2008-virt-branch
+D
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Repository b/libpthread/sysdeps/l4/hurd/i386/CVS/Repository
new file mode 100644
index 00000000..c8d46d8c
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Repository
@@ -0,0 +1 @@
+hurd/libpthread/sysdeps/l4/hurd/i386
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Root b/libpthread/sysdeps/l4/hurd/i386/CVS/Root
new file mode 100644
index 00000000..a10aa66d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Root
@@ -0,0 +1 @@
+:ext:zhengda@cvs.savannah.gnu.org:/sources/hurd
diff --git a/libpthread/sysdeps/l4/hurd/i386/CVS/Tag b/libpthread/sysdeps/l4/hurd/i386/CVS/Tag
new file mode 100644
index 00000000..7e454c6d
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/CVS/Tag
@@ -0,0 +1 @@
+Tzhengda-soc2008-virt-branch
diff --git a/libpthread/sysdeps/l4/hurd/i386/pt-machdep.c b/libpthread/sysdeps/l4/hurd/i386/pt-machdep.c
new file mode 100644
index 00000000..dbf5cd7e
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/i386/pt-machdep.c
@@ -0,0 +1,20 @@
+/* Machine dependent pthreads code.  Hurd/i386 version.
+   Copyright (C) 2000 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.  */
+
+/* Nothing to do.  */
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;
+}
diff --git a/libpthread/sysdeps/l4/hurd/pt-sysdep.c b/libpthread/sysdeps/l4/hurd/pt-sysdep.c
new file mode 100644
index 00000000..265592ca
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/pt-sysdep.c
@@ -0,0 +1,58 @@
+/* System dependent pthreads code.  Hurd version.
+   Copyright (C) 2000 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 <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <pt-internal.h>
+
+/* Forward.  */
+static void *init_routine (void);
+
+/* OK, the name of this variable isn't really appropriate, but I don't
+   want to change it yet.  */
+void *(*_pthread_init_routine)(void) = &init_routine;
+
+/* This function is called from the Hurd-specific startup code.  It
+   should return a new stack pointer for the main thread.  The caller
+   will switch to this new stack before doing anything serious.  */
+static void * 
+init_routine (void)
+{
+  struct __pthread *thread;
+  int err;
+
+  /* Initialize the library.  */
+  __pthread_initialize ();
+
+  /* Create the pthread structure for the main thread (i.e. us).  */
+  err = __pthread_create_internal (&thread, 0, 0, 0);
+  assert_perror (err);
+
+  __pthread_initialize ();
+
+  /* Decrease the number of threads, to take into account that the
+     signal thread (which will be created by the startup code when we
+     return from here) shouldn't be seen as a user thread.  */
+#warning Need to implement the signal thread.
+  // __pthread_total--;
+
+  return (void *) thread->mcontext.sp;
+}
diff --git a/libpthread/sysdeps/l4/hurd/pt-sysdep.h b/libpthread/sysdeps/l4/hurd/pt-sysdep.h
new file mode 100644
index 00000000..87175330
--- /dev/null
+++ b/libpthread/sysdeps/l4/hurd/pt-sysdep.h
@@ -0,0 +1,52 @@
+/* Internal defenitions for pthreads library.
+   Copyright (C) 2000, 2002 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.  */
+
+#ifndef _PT_SYSDEP_H
+#define _PT_SYSDEP_H	1
+
+#include <l4/l4.h>
+#include <task_client.h>
+#include <machine/vmparam.h>
+
+/* XXX */
+#define _POSIX_THREAD_THREADS_MAX	64
+
+/* The default stack size.  */
+#define PTHREAD_STACK_DEFAULT	(PAGE_SIZE)
+
+#define PTHREAD_SYSDEP_MEMBERS \
+  L4_ThreadId_t threadid; \
+  L4_Word_t my_errno;
+
+extern inline struct __pthread *
+__attribute__((__always_inline__))
+_pthread_self (void)
+{
+  return (struct __pthread *) L4_MyUserDefinedHandle ();
+}
+
+extern inline void
+__pthread_stack_dealloc (void *stackaddr, size_t stacksize)
+__attribute__((__always_inline__))
+{
+  /* XXX: can only implement this once we have a working memory manager.  */
+  return;
+}
+
+#endif /* pt-sysdep.h */