13 files changed, 786 insertions, 466 deletions

diff --git a/lib/libpthread/arch/amd64/Makefile.inc b/lib/libpthread/arch/amd64/Makefile.inc
index c0e4c47..c8b0362 100644
--- a/lib/libpthread/arch/amd64/Makefile.inc
+++ b/lib/libpthread/arch/amd64/Makefile.inc
@@ -2,4 +2,4 @@
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+=	context.S enter_uts.S
+SRCS+=	context.S enter_uts.S pthread_md.c
diff --git a/lib/libpthread/arch/amd64/amd64/pthread_md.c b/lib/libpthread/arch/amd64/amd64/pthread_md.c
new file mode 100644
index 0000000..374b6d8
--- /dev/null
+++ b/lib/libpthread/arch/amd64/amd64/pthread_md.c
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2003 Daniel Eischen <deischen@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of the author nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <stdlib.h>
+#include <strings.h>
+#include "pthread_md.h"
+
+/*
+ * The constructors.
+ */
+struct tcb *
+_tcb_ctor(struct pthread *thread)
+{
+	struct tcb *tcb;
+
+	if ((tcb = malloc(sizeof(struct tcb))) != NULL) {
+		bzero(tcb, sizeof(struct tcb));
+		tcb->tcb_thread = thread;
+		/* Allocate TDV */
+	}
+	return (tcb);
+}
+
+void
+_tcb_dtor(struct tcb *tcb)
+{
+	/* Free TDV */
+	free(tcb);
+}
+
+struct kcb *
+_kcb_ctor(struct kse *kse)
+{
+	struct kcb *kcb;
+
+	if ((kcb = malloc(sizeof(struct kcb))) != NULL) {
+		bzero(kcb, sizeof(struct kcb));
+		kcb->kcb_kse = kse;
+	}
+	return (kcb);
+}
+
+void
+_kcb_dtor(struct kcb *kcb)
+{
+	free(kcb);
+}
diff --git a/lib/libpthread/arch/amd64/include/ksd.h b/lib/libpthread/arch/amd64/include/ksd.h
deleted file mode 100644
index 843d184..0000000
--- a/lib/libpthread/arch/amd64/include/ksd.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * Copyright (C) 2003 David Xu <davidxu@freebsd.org>
- * Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Neither the name of the author nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $FreeBSD$
- */
-
-#ifndef	_KSD_H_
-#define	_KSD_H_
-
-#include <sys/types.h>
-#include <machine/sysarch.h>
-extern int sysarch(int, void *);
-
-struct kse;
-struct pthread;
-
-/*
- * Evaluates to the byte offset of the per-kse variable name.
- */
-#define	__ksd_offset(name)	__offsetof(struct kse, name)
-
-/*
- * Evaluates to the type of the per-kse variable name.
- */
-#define	__ksd_type(name)	__typeof(((struct kse *)0)->name)
-
-
-/*
- * Evaluates to the value of the per-kse variable name.
- */
-#define	KSD_GET64(name) ({					\
-	__ksd_type(name) __result;				\
-								\
-	u_long __i;						\
-	__asm __volatile("movq %%fs:%1, %0"			\
-	    : "=r" (__i)					\
-	    : "m" (*(u_long *)(__ksd_offset(name))));		\
-	__result = *(__ksd_type(name) *)&__i;			\
-								\
-	__result;						\
-})
-
-/*
- * Sets the value of the per-cpu variable name to value val.
- */
-#define	KSD_SET64(name, val) ({					\
-	__ksd_type(name) __val = (val);				\
-								\
-	u_long __i;						\
-	__i = *(u_long *)&__val;					\
-	__asm __volatile("movq %1,%%fs:%0"			\
-	    : "=m" (*(u_long *)(__ksd_offset(name)))		\
-	    : "r" (__i));					\
-})
-
-static __inline u_long
-__ksd_readandclear64(volatile u_long *addr)
-{
-	u_long result;
-
-	__asm __volatile (
-	    "	xorq	%0, %0;"
-	    "	xchgq	%%fs:%1, %0;"
-	    "# __ksd_readandclear64"
-	    : "=&r" (result)
-	    : "m" (*addr));
-	return (result);
-}
-
-#define	KSD_READANDCLEAR64(name) ({				\
-	__ksd_type(name) __result;				\
-								\
-	__result = (__ksd_type(name))				\
-	    __ksd_readandclear64((u_long *)__ksd_offset(name)); \
-	__result;						\
-})
-
-
-#define	_ksd_curkse()		((struct kse *)KSD_GET64(k_mbx.km_udata))
-#define	_ksd_curthread()	KSD_GET64(k_curthread)
-#define	_ksd_get_tmbx()		KSD_GET64(k_mbx.km_curthread)
-#define	_ksd_set_tmbx(value)	KSD_SET64(k_mbx.km_curthread, (void *)value);
-#define	_ksd_readandclear_tmbx() KSD_READANDCLEAR64(k_mbx.km_curthread)
-
-
-static __inline int
-_ksd_create(struct ksd *ksd, void *base, int size)
-{
-	ksd->base = base;
-	ksd->size = size;
-	return (0);
-}
-
-static __inline void
-_ksd_destroy(struct ksd *ksd)
-{
-	ksd->base = 0;
-	ksd->size = 0;
-}
-
-static __inline int
-_ksd_setprivate(struct ksd *ksd)
-{
-	return (sysarch(AMD64_SET_FSBASE, &ksd->base));
-}
-
-#endif
diff --git a/lib/libpthread/arch/amd64/include/pthread_md.h b/lib/libpthread/arch/amd64/include/pthread_md.h
index 3c7cd03..27a07cc 100644
--- a/lib/libpthread/arch/amd64/include/pthread_md.h
+++ b/lib/libpthread/arch/amd64/include/pthread_md.h
@@ -1,27 +1,28 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
+/*-
+ * Copyright (C) 2003 David Xu <davidxu@freebsd.org>
+ * Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+ * 2. Neither the name of the author nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
@@ -31,52 +32,224 @@
 #ifndef _PTHREAD_MD_H_
 #define	_PTHREAD_MD_H_
 
+#include <sys/types.h>
+#include <sys/kse.h>
+#include <machine/sysarch.h>
 #include <ucontext.h>
 
+/* <machine/sysarch.h> should define this, but doesn't. */
+extern int sysarch(int, void *);
+
 #define	THR_GETCONTEXT(ucp)	\
 	(void)_amd64_save_context(&(ucp)->uc_mcontext)
 #define	THR_SETCONTEXT(ucp)	\
-	(void)_amd64_restore_context(&(ucp)->uc_mcontext, NULL, NULL)
+	(void)_amd64_restore_context(&(ucp)->uc_mcontext, 0, NULL)
+
 
-#define	THR_ALIGNBYTES	15
-#define	THR_ALIGN(td)	(((uintptr_t)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES)
+#define	PER_KSE
+#undef	PER_THREAD
+
+struct kse;
+struct pthread;
+struct tdv;
 
 /*
- * KSE Specific Data.
+ * %fs points to a struct kcb.
  */
-struct ksd {
-	void	*base;
-	long	size;
+struct kcb {
+	struct tcb		*kcb_curtcb;
+	struct kcb		*kcb_self;	/* self reference */
+	struct kse		*kcb_kse;
+	struct kse_mailbox	kcb_kmbx;
+};
+
+struct tcb {
+	struct tdv		*tcb_tdv;
+	struct pthread		*tcb_thread;
+	void			*tcb_spare[2];	/* align tcb_tmbx to 16 bytes */
+	struct kse_thr_mailbox	tcb_tmbx;
 };
 
+/*
+ * Evaluates to the byte offset of the per-kse variable name.
+ */
+#define	__kcb_offset(name)	__offsetof(struct kcb, name)
+
+/*
+ * Evaluates to the type of the per-kse variable name.
+ */
+#define	__kcb_type(name)	__typeof(((struct kcb *)0)->name)
+
+/*
+ * Evaluates to the value of the per-kse variable name.
+ */
+#define	KCB_GET64(name) ({					\
+	__kcb_type(name) __result;				\
+								\
+	u_long __i;						\
+	__asm __volatile("movq %%fs:%1, %0"			\
+	    : "=r" (__i)					\
+	    : "m" (*(u_long *)(__kcb_offset(name))));		\
+	__result = *(__kcb_type(name) *)&__i;			\
+								\
+	__result;						\
+})
+
+/*
+ * Sets the value of the per-kse variable name to value val.
+ */
+#define	KCB_SET64(name, val) ({					\
+	__kcb_type(name) __val = (val);				\
+								\
+	u_long __i;						\
+	__i = *(u_long *)&__val;				\
+	__asm __volatile("movq %1,%%fs:%0"			\
+	    : "=m" (*(u_long *)(__kcb_offset(name)))		\
+	    : "r" (__i));					\
+})
+
+static __inline u_long
+__kcb_readandclear64(volatile u_long *addr)
+{
+	u_long result;
+
+	__asm __volatile (
+	    "	xorq	%0, %0;"
+	    "	xchgq	%%fs:%1, %0;"
+	    "# __kcb_readandclear64"
+	    : "=&r" (result)
+	    : "m" (*addr));
+	return (result);
+}
+
+#define	KCB_READANDCLEAR64(name) ({				\
+	__kcb_type(name) __result;				\
+								\
+	__result = (__kcb_type(name))				\
+	    __kcb_readandclear64((u_long *)__kcb_offset(name)); \
+	__result;						\
+})
+
+
+#define	_kcb_curkcb()		KCB_GET64(kcb_self)
+#define	_kcb_curtcb()		KCB_GET64(kcb_curtcb)
+#define	_kcb_curkse()		((struct kse *)KCB_GET64(kcb_kmbx.km_udata))
+#define	_kcb_get_tmbx()		KCB_GET64(kcb_kmbx.km_curthread)
+#define	_kcb_set_tmbx(value)	KCB_SET64(kcb_kmbx.km_curthread, (void *)value)
+#define	_kcb_readandclear_tmbx() KCB_READANDCLEAR64(kcb_kmbx.km_curthread)
+
+/*
+ * The constructors.
+ */
+struct tcb	*_tcb_ctor(struct pthread *);
+void		_tcb_dtor(struct tcb *tcb);
+struct kcb	*_kcb_ctor(struct kse *);
+void		_kcb_dtor(struct kcb *);
+
+/* Called from the KSE to set its private data. */
+static __inline void
+_kcb_set(struct kcb *kcb)
+{
+	void *addr = kcb;
+
+	sysarch(AMD64_SET_FSBASE, &addr);
+}
+
+/* Get the current kcb. */
+static __inline struct kcb *
+_kcb_get(void)
+{
+	return (_kcb_curkcb());
+}
+
+static __inline struct kse_thr_mailbox *
+_kcb_critical_enter(void)
+{
+	struct kse_thr_mailbox *crit;
+
+	crit = _kcb_readandclear_tmbx();
+	return (crit);
+}
+
+static __inline void
+_kcb_critical_leave(struct kse_thr_mailbox *crit)
+{
+	_kcb_set_tmbx(crit);
+}
+
+static __inline int
+_kcb_in_critical(void)
+{
+	return (_kcb_get_tmbx() == NULL);
+}
+
+static __inline void
+_tcb_set(struct kcb *kcb, struct tcb *tcb)
+{
+	kcb->kcb_curtcb = tcb;
+}
+
+static __inline struct tcb *
+_tcb_get(void)
+{
+	return (_kcb_curtcb());
+}
+
+static __inline struct pthread *
+_get_curthread(void)
+{
+	struct tcb *tcb;
+
+	tcb = _kcb_curtcb();
+	if (tcb != NULL)
+		return (tcb->tcb_thread);
+	else
+		return (NULL);
+}
+
+static __inline struct kse *
+_get_curkse(void)
+{
+	return ((struct kse *)_kcb_curkse());
+}
+
 void _amd64_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack,
     size_t stacksz);
 int _amd64_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc);
 int _amd64_save_context(mcontext_t *mc);
 
 static __inline int
-_thread_enter_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km)
+_thread_enter_uts(struct tcb *tcb, struct kcb *kcb)
 {
-	if (tm == NULL)
-		return (-1);
-	if (!_amd64_save_context(&tm->tm_context.uc_mcontext)) {
-		_amd64_enter_uts(km, km->km_func, km->km_stack.ss_sp,
-		    km->km_stack.ss_size);
+	int ret;
+
+	ret = _amd64_save_context(&tcb->tcb_tmbx.tm_context.uc_mcontext);
+	if (ret == 0) {
+		_amd64_enter_uts(&kcb->kcb_kmbx, kcb->kcb_kmbx.km_func,
+		    kcb->kcb_kmbx.km_stack.ss_sp,
+		    kcb->kcb_kmbx.km_stack.ss_size);
 		/* We should not reach here. */
 		return (-1);
 	}
+	else if (ret < 0)
+		return (-1);
 	return (0);
 }
 
 static __inline int
-_thread_switch(struct kse_thr_mailbox *tm, struct kse_thr_mailbox **thrp)
+_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
 {
-	if (tm == NULL)
+	if ((kcb == NULL) || (tcb == NULL))
 		return (-1);
-	_amd64_restore_context(&tm->tm_context.uc_mcontext, (intptr_t)tm,
-	    (intptr_t*)thrp);
+	kcb->kcb_curtcb = tcb;
+	if (setmbox != 0)
+		_amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
+		    (intptr_t)&tcb->tcb_tmbx,
+		    (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+	else
+		_amd64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
+		    0, NULL);
 	/* We should not reach here. */
 	return (-1);
 }
-
 #endif
diff --git a/lib/libpthread/arch/i386/Makefile.inc b/lib/libpthread/arch/i386/Makefile.inc
index c5cbe18..73a9a8a 100644
--- a/lib/libpthread/arch/i386/Makefile.inc
+++ b/lib/libpthread/arch/i386/Makefile.inc
@@ -2,4 +2,4 @@
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+=	ksd.c thr_enter_uts.S thr_getcontext.S
+SRCS+=	thr_enter_uts.S thr_getcontext.S pthread_md.c
diff --git a/lib/libpthread/arch/i386/i386/ksd.c b/lib/libpthread/arch/i386/i386/pthread_md.c
index 4e95959..aeaa649 100644
--- a/lib/libpthread/arch/i386/i386/ksd.c
+++ b/lib/libpthread/arch/i386/i386/pthread_md.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <ucontext.h>
 
 #include "pthread_md.h"
-#include "ksd.h"
 
 #define LDT_ENTRIES 8192
 #define LDT_WORDS   (8192/sizeof(unsigned int))
@@ -94,76 +93,79 @@ free_ldt_entry(u_int index)
 	ldt_mask[i] |= (1 << j);
 }
 
-/*
- * Initialize KSD.  This also includes setting up the LDT.
- */
-int
-_ksd_create(struct ksd *ksd, void *base, int size)
+struct tcb *
+_tcb_ctor(struct pthread *thread)
 {
-	union descriptor ldt;
+	struct tcb *tcb;
+	void *addr;
 
-	if (initialized == 0)
-		initialize();
-	ksd->ldt = alloc_ldt_entry();
-	if (ksd->ldt == 0)
-		return (-1);
-	ksd->base = base;
-	ksd->size = size;
-	ldt.sd.sd_hibase = (unsigned int)ksd->base >> 24;
-	ldt.sd.sd_lobase = (unsigned int)ksd->base & 0xFFFFFF;
-	ldt.sd.sd_hilimit = (size >> 16) & 0xF;
-	ldt.sd.sd_lolimit = ksd->size & 0xFFFF;
-	ldt.sd.sd_type = SDT_MEMRWA;
-	ldt.sd.sd_dpl = SEL_UPL;
-	ldt.sd.sd_p = 1;
-	ldt.sd.sd_xx = 0;
-	ldt.sd.sd_def32 = 1;
-	ldt.sd.sd_gran = 0;	/* no more than 1M */
-	if (i386_set_ldt(ksd->ldt, &ldt, 1) < 0) {
-		free_ldt_entry(ksd->ldt);
-		return (-1);
+	addr = malloc(sizeof(struct tcb) + 15);
+	if (addr == NULL)
+		tcb = NULL;
+	else {
+		tcb = (struct tcb *)(((uintptr_t)(addr) + 15) & ~15);
+		bzero(tcb, sizeof(struct tcb));
+		tcb->tcb_addr = addr;
+		tcb->tcb_thread = thread;
+		/* XXX - Allocate tdv/tls */
 	}
-	ksd->flags = KSDF_INITIALIZED;
-	return (0);
+	return (tcb);
 }
 
 void
-_ksd_destroy(struct ksd *ksd)
-{
-	if ((ksd->flags & KSDF_INITIALIZED) != 0) {
-		free_ldt_entry(ksd->ldt);
-	}
-}
-
-int
-_ksd_getprivate(struct ksd *ksd, void **base, int *size)
+_tcb_dtor(struct tcb *tcb)
 {
+	void *addr;
 
-	if ((ksd == NULL) || ((ksd->flags & KSDF_INITIALIZED) == 0))
-		return (-1);
-	else {
-		*base = ksd->base;
-		*size = ksd->size;
-		return (0);
-	}
+	addr = tcb->tcb_addr;
+	tcb->tcb_addr = NULL;
+	free(addr);
 }
 
 /*
- * This assumes that the LDT is already setup.  Just set %gs to
- * reference it.
+ * Initialize KSD.  This also includes setting up the LDT.
  */
-int
-_ksd_setprivate(struct ksd *ksd)
+struct kcb *
+_kcb_ctor(struct kse *kse)
 {
-	int val;
-	int ret;
+	union descriptor ldt;
+	struct kcb *kcb;
 
-	if ((ksd->flags & KSDF_INITIALIZED) == 0)
-		ret = -1;
-	else {
-		val = (ksd->ldt << 3) | 7;
-		__asm __volatile("movl %0, %%gs" : : "r" (val));
-		ret = 0;
+	if (initialized == 0)
+		initialize();
+	kcb = malloc(sizeof(struct kcb));
+	if (kcb != NULL) {
+		bzero(kcb, sizeof(struct kcb));
+		kcb->kcb_self = kcb;
+		kcb->kcb_kse = kse;
+		kcb->kcb_ldt = alloc_ldt_entry();
+		if (kcb->kcb_ldt == 0) {
+			free(kcb);
+			return (NULL);
+		}
+		ldt.sd.sd_hibase = (unsigned int)kcb >> 24;
+		ldt.sd.sd_lobase = (unsigned int)kcb & 0xFFFFFF;
+		ldt.sd.sd_hilimit = (sizeof(struct kcb) >> 16) & 0xF;
+		ldt.sd.sd_lolimit = sizeof(struct kcb) & 0xFFFF;
+		ldt.sd.sd_type = SDT_MEMRWA;
+		ldt.sd.sd_dpl = SEL_UPL;
+		ldt.sd.sd_p = 1;
+		ldt.sd.sd_xx = 0;
+		ldt.sd.sd_def32 = 1;
+		ldt.sd.sd_gran = 0;	/* no more than 1M */
+		if (i386_set_ldt(kcb->kcb_ldt, &ldt, 1) < 0) {
+			free_ldt_entry(kcb->kcb_ldt);
+			free(kcb);
+			return (NULL);
+		}
 	}
-	return (ret);
+	return (kcb);
+}
+
+void
+_kcb_dtor(struct kcb *kcb)
+{
+	if (kcb->kcb_ldt != -1)
+		free_ldt_entry(kcb->kcb_ldt);
+	free(kcb);
 }
diff --git a/lib/libpthread/arch/i386/i386/thr_getcontext.S b/lib/libpthread/arch/i386/i386/thr_getcontext.S
index 19afd06..7f58dce 100644
--- a/lib/libpthread/arch/i386/i386/thr_getcontext.S
+++ b/lib/libpthread/arch/i386/i386/thr_getcontext.S
@@ -74,7 +74,7 @@ ENTRY(__thr_setcontext)
 	movl	72(%edx), %esp		/* switch to context defined stack */
 	pushl	60(%edx)		/* push return address on stack */
 	pushl	44(%edx)		/* push ecx on stack */
-	push	48(%edx)		/* push eax on stack */
+	pushl	48(%edx)		/* push eax on stack */
 	/*
 	 * if (mc_fpowned == MC_OWNEDFP_FPU || mc_fpowned == MC_OWNEDFP_PCB) {
 	 *    if (mc_fpformat == MC_FPFMT_387)
diff --git a/lib/libpthread/arch/i386/include/ksd.h b/lib/libpthread/arch/i386/include/ksd.h
deleted file mode 100644
index f7f728f..0000000
--- a/lib/libpthread/arch/i386/include/ksd.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (C) 2003 David Xu <davidxu@freebsd.org>
- * Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Neither the name of the author nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * $FreeBSD$
- */
-
-#ifndef	_KSD_H_
-#define	_KSD_H_
-
-#include <sys/types.h>
-
-struct kse;
-
-/*
- * Evaluates to the byte offset of the per-kse variable name.
- */
-#define	__ksd_offset(name)	__offsetof(struct kse, name)
-
-/*
- * Evaluates to the type of the per-kse variable name.
- */
-#define	__ksd_type(name)	__typeof(((struct kse *)0)->name)
-
-
-/*
- * Evaluates to the value of the per-kse variable name.
- */
-#define	KSD_GET32(name) ({					\
-	__ksd_type(name) __result;				\
-								\
-	u_int __i;						\
-	__asm __volatile("movl %%gs:%1, %0"			\
-	    : "=r" (__i)					\
-	    : "m" (*(u_int *)(__ksd_offset(name))));		\
-	__result = *(__ksd_type(name) *)&__i;			\
-								\
-	__result;						\
-})
-
-/*
- * Sets the value of the per-cpu variable name to value val.
- */
-#define	KSD_SET32(name, val) ({					\
-	__ksd_type(name) __val = (val);				\
-								\
-	u_int __i;						\
-	__i = *(u_int *)&__val;					\
-	__asm __volatile("movl %1,%%gs:%0"			\
-	    : "=m" (*(u_int *)(__ksd_offset(name)))		\
-	    : "r" (__i));					\
-})
-
-static __inline u_long
-__ksd_readandclear32(volatile u_long *addr)
-{
-	u_long result;
-
-	__asm __volatile (
-	    "	xorl	%0, %0;"
-	    "	xchgl	%%gs:%1, %0;"
-	    "# __ksd_readandclear32"
-	    : "=&r" (result)
-	    : "m" (*addr));
-	return (result);
-}
-
-#define	KSD_READANDCLEAR32(name) ({				\
-	__ksd_type(name) __result;				\
-								\
-	__result = (__ksd_type(name))				\
-	    __ksd_readandclear32((u_long *)__ksd_offset(name)); \
-	__result;						\
-})
-
-
-#define	_ksd_curkse()		((struct kse *)KSD_GET32(k_mbx.km_udata))
-#define	_ksd_curthread()	KSD_GET32(k_curthread)
-#define	_ksd_get_tmbx()		KSD_GET32(k_mbx.km_curthread)
-#define	_ksd_set_tmbx(value)	KSD_SET32(k_mbx.km_curthread, (void *)value);
-#define	_ksd_readandclear_tmbx() KSD_READANDCLEAR32(k_mbx.km_curthread)
-
-int	_ksd_create(struct ksd *ksd, void *base, int size);
-void	_ksd_destroy(struct ksd *ksd);
-int	_ksd_getprivate(struct ksd *ksd, void **base, int *size);
-int	_ksd_setprivate(struct ksd *ksd);
-#endif
diff --git a/lib/libpthread/arch/i386/include/pthread_md.h b/lib/libpthread/arch/i386/include/pthread_md.h
index 980680a..9718562 100644
--- a/lib/libpthread/arch/i386/include/pthread_md.h
+++ b/lib/libpthread/arch/i386/include/pthread_md.h
@@ -37,34 +37,193 @@
 extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *);
 extern int _thr_getcontext(mcontext_t *);
 
-#define	THR_GETCONTEXT(ucp)	_thr_getcontext(&(ucp)->uc_mcontext);
-#define	THR_SETCONTEXT(ucp)	_thr_setcontext(&(ucp)->uc_mcontext, NULL, NULL);
+#define	THR_GETCONTEXT(ucp)	_thr_getcontext(&(ucp)->uc_mcontext)
+#define	THR_SETCONTEXT(ucp)	_thr_setcontext(&(ucp)->uc_mcontext, 0, NULL)
 
-#define	THR_ALIGNBYTES	15
-#define	THR_ALIGN(td)	(((unsigned)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES)
+#define	PER_KSE
+#undef	PER_THREAD
+
+struct kse;
+struct pthread;
+struct tdv;
 
 /*
- * KSE Specific Data.
+ * %gs points to a struct kcb.
  */
-struct ksd {
-	int	ldt;
-#define	KSDF_INITIALIZED	0x01
-	long	flags;
-	void	*base;
-	long	size;
+struct kcb {
+	struct tcb		*kcb_curtcb;
+	struct kcb		*kcb_self;	/* self reference */
+	int			kcb_ldt;
+	struct kse		*kcb_kse;
+	struct kse_mailbox	kcb_kmbx;
+};
+
+struct tcb {
+	struct tdv		*tcb_tdv;
+	struct pthread		*tcb_thread;
+	void			*tcb_addr;	/* allocated tcb address */
+	void			*tcb_spare;	/* align tcb_tmbx to 16 bytes */
+	struct kse_thr_mailbox	tcb_tmbx;
 };
 
-extern void _i386_enter_uts(struct kse_mailbox *, kse_func_t, void *, long);
+/*
+ * Evaluates to the byte offset of the per-kse variable name.
+ */
+#define	__kcb_offset(name)	__offsetof(struct kcb, name)
+
+/*
+ * Evaluates to the type of the per-kse variable name.
+ */
+#define	__kcb_type(name)	__typeof(((struct kcb *)0)->name)
+
+/*
+ * Evaluates to the value of the per-kse variable name.
+ */
+#define	KCB_GET32(name) ({					\
+	__kcb_type(name) __result;				\
+								\
+	u_int __i;						\
+	__asm __volatile("movl %%gs:%1, %0"			\
+	    : "=r" (__i)					\
+	    : "m" (*(u_int *)(__kcb_offset(name))));		\
+	__result = *(__kcb_type(name) *)&__i;			\
+								\
+	__result;						\
+})
+
+/*
+ * Sets the value of the per-kse variable name to value val.
+ */
+#define	KCB_SET32(name, val) ({					\
+	__kcb_type(name) __val = (val);				\
+								\
+	u_int __i;						\
+	__i = *(u_int *)&__val;					\
+	__asm __volatile("movl %1,%%gs:%0"			\
+	    : "=m" (*(u_int *)(__kcb_offset(name)))		\
+	    : "r" (__i));					\
+})
+
+static __inline u_long
+__kcb_readandclear32(volatile u_long *addr)
+{
+	u_long result;
+
+	__asm __volatile (
+	    "	xorl	%0, %0;"
+	    "	xchgl	%%gs:%1, %0;"
+	    "# __kcb_readandclear32"
+	    : "=&r" (result)
+	    : "m" (*addr));
+	return (result);
+}
+
+#define	KCB_READANDCLEAR32(name) ({				\
+	__kcb_type(name) __result;				\
+								\
+	__result = (__kcb_type(name))				\
+	    __kcb_readandclear32((u_long *)__kcb_offset(name)); \
+	__result;						\
+})
+
+
+#define	_kcb_curkcb()		KCB_GET32(kcb_self)
+#define	_kcb_curtcb()		KCB_GET32(kcb_curtcb)
+#define	_kcb_curkse()		((struct kse *)KCB_GET32(kcb_kmbx.km_udata))
+#define	_kcb_get_tmbx()		KCB_GET32(kcb_kmbx.km_curthread)
+#define	_kcb_set_tmbx(value)	KCB_SET32(kcb_kmbx.km_curthread, (void *)value)
+#define	_kcb_readandclear_tmbx() KCB_READANDCLEAR32(kcb_kmbx.km_curthread)
+
+
+/*
+ * The constructors.
+ */
+struct tcb	*_tcb_ctor(struct pthread *);
+void		_tcb_dtor(struct tcb *tcb);
+struct kcb	*_kcb_ctor(struct kse *);
+void		_kcb_dtor(struct kcb *);
+
+/* Called from the KSE to set its private data. */
+static __inline void
+_kcb_set(struct kcb *kcb)
+{
+	int val;
+
+	val = (kcb->kcb_ldt << 3) | 7;
+	__asm __volatile("movl %0, %%gs" : : "r" (val));
+}
+
+/* Get the current kcb. */
+static __inline struct kcb *
+_kcb_get(void)
+{
+	return (_kcb_curkcb());
+}
+
+static __inline struct kse_thr_mailbox *
+_kcb_critical_enter(void)
+{
+	struct kse_thr_mailbox *crit;
+
+	crit = _kcb_readandclear_tmbx();
+	return (crit);
+}
+
+static __inline void
+_kcb_critical_leave(struct kse_thr_mailbox *crit)
+{
+	_kcb_set_tmbx(crit);
+}
 
 static __inline int
-_thread_enter_uts(struct kse_thr_mailbox *tmbx, struct kse_mailbox *kmbx)
+_kcb_in_critical(void)
+{
+	return (_kcb_get_tmbx() == NULL);
+}
+
+static __inline void
+_tcb_set(struct kcb *kcb, struct tcb *tcb)
+{
+	kcb->kcb_curtcb = tcb;
+}
+
+static __inline struct tcb *
+_tcb_get(void)
+{
+	return (_kcb_curtcb());
+}
+
+static __inline struct pthread *
+_get_curthread(void)
+{
+	struct tcb *tcb;
+
+	tcb = _kcb_curtcb();
+	if (tcb != NULL)
+		return (tcb->tcb_thread);
+	else
+		return (NULL);
+}
+
+static __inline struct kse *
+_get_curkse(void)
+{
+	return ((struct kse *)_kcb_curkse());
+}
+
+void	_i386_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack,
+    size_t stacksz);
+
+static __inline int
+_thread_enter_uts(struct tcb *tcb, struct kcb *kcb)
 {
 	int ret;
 
-	ret = _thr_getcontext(&tmbx->tm_context.uc_mcontext);
+	ret = _thr_getcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext);
 	if (ret == 0) {
-		_i386_enter_uts(kmbx, kmbx->km_func,
-		    kmbx->km_stack.ss_sp, kmbx->km_stack.ss_size);
+		_i386_enter_uts(&kcb->kcb_kmbx, kcb->kcb_kmbx.km_func,
+		    kcb->kcb_kmbx.km_stack.ss_sp,
+		    kcb->kcb_kmbx.km_stack.ss_size);
 		/* We should not reach here. */
 		return (-1);
 	}
@@ -74,10 +233,17 @@ _thread_enter_uts(struct kse_thr_mailbox *tmbx, struct kse_mailbox *kmbx)
 }
 
 static __inline int
-_thread_switch(struct kse_thr_mailbox *tmbx, struct kse_thr_mailbox **loc)
+_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
 {
-	_thr_setcontext(&tmbx->tm_context.uc_mcontext,
-	    (intptr_t)tmbx, (intptr_t *)loc);
+	if ((kcb == NULL) || (tcb == NULL))
+		return (-1);
+	kcb->kcb_curtcb = tcb;
+	if (setmbox != 0)
+		_thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext,
+		    (intptr_t)&tcb->tcb_tmbx,
+		    (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+	else
+		_thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL);
 	/* We should not reach here. */
 	return (-1);
 }
diff --git a/lib/libpthread/arch/ia64/Makefile.inc b/lib/libpthread/arch/ia64/Makefile.inc
index c0e4c47..c8b0362 100644
--- a/lib/libpthread/arch/ia64/Makefile.inc
+++ b/lib/libpthread/arch/ia64/Makefile.inc
@@ -2,4 +2,4 @@
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
 
-SRCS+=	context.S enter_uts.S
+SRCS+=	context.S enter_uts.S pthread_md.c
diff --git a/lib/libpthread/arch/ia64/ia64/pthread_md.c b/lib/libpthread/arch/ia64/ia64/pthread_md.c
new file mode 100644
index 0000000..e8fd64e
--- /dev/null
+++ b/lib/libpthread/arch/ia64/ia64/pthread_md.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2003 Daniel Eischen <deischen@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of the author nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <stdlib.h>
+#include <strings.h>
+#include "pthread_md.h"
+
+/*
+ * The constructors.
+ */
+struct tcb *
+_tcb_ctor(struct pthread *thread)
+{
+	struct tcb *tcb;
+
+	if ((tcb = malloc(sizeof(struct tcb))) != NULL) {
+		bzero(tcb, sizeof(struct tcb));
+		tcb->tcb_thread = thread;
+		tcb->tcb_tp.tp_self = tcb;
+		/* Allocate TDV */
+	}
+	return (tcb);
+}
+
+void
+_tcb_dtor(struct tcb *tcb)
+{
+	/* Free TDV */
+	free(tcb);
+}
+
+struct kcb *
+_kcb_ctor(struct kse *kse)
+{
+	struct kcb *kcb;
+
+	if ((kcb = malloc(sizeof(struct kcb))) != NULL) {
+		bzero(kcb, sizeof(struct kcb));
+		kcb->kcb_faketcb.tcb_isfake = 1;
+		kcb->kcb_faketcb.tcb_tmbx.tm_flags = TMF_NOUPCALL;
+		kcb->kcb_faketcb.tcb_tp.tp_self = &kcb->kcb_faketcb;
+		kcb->kcb_curtcb = &kcb->kcb_faketcb;
+		kcb->kcb_kse = kse;
+	}
+	return (kcb);
+}
+
+void
+_kcb_dtor(struct kcb *kcb)
+{
+	free(kcb);
+}
diff --git a/lib/libpthread/arch/ia64/include/ksd.h b/lib/libpthread/arch/ia64/include/ksd.h
deleted file mode 100644
index 8878132..0000000
--- a/lib/libpthread/arch/ia64/include/ksd.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef	_KSD_H_
-#define	_KSD_H_
-
-struct kse;
-struct pthread;
-
-register struct kse *_tp __asm("%r13");
-
-static __inline int
-_ksd_create(struct ksd *ksd, void *base, int size)
-{
-	ksd->ksd_base = base;
-	ksd->ksd_size = size;
-	return (0);
-}
-
-static __inline struct kse *
-_ksd_curkse()
-{
-	/* XXX why not simply return _tp? */
-	return ((struct kse *)_tp->k_mbx.km_udata);
-}
-
-static __inline struct pthread *
-_ksd_curthread()
-{
-	return (_tp->k_curthread);
-}
-
-static __inline void
-_ksd_destroy(struct ksd *ksd)
-{
-}
-
-static __inline kse_critical_t
-_ksd_get_tmbx()
-{
-	return (_tp->k_mbx.km_curthread);
-}
-
-static __inline kse_critical_t
-_ksd_readandclear_tmbx()
-{
-	kse_critical_t crit;
-	__asm("xchg8    %0=[%1],r0" : "=r"(crit)
-	    : "r"(&_tp->k_mbx.km_curthread));
-	return (crit);
-}
-
-static __inline void
-_ksd_set_tmbx(kse_critical_t crit)
-{
-	_tp->k_mbx.km_curthread = crit;
-}
-
-static __inline int
-_ksd_setprivate(struct ksd *ksd)
-{
-	_tp = (struct kse *)ksd->ksd_base;
-	return (0);
-}
-
-#endif /* _KSD_H_ */
diff --git a/lib/libpthread/arch/ia64/include/pthread_md.h b/lib/libpthread/arch/ia64/include/pthread_md.h
index 6d30025..f7076d0 100644
--- a/lib/libpthread/arch/ia64/include/pthread_md.h
+++ b/lib/libpthread/arch/ia64/include/pthread_md.h
@@ -29,32 +29,190 @@
 #ifndef _PTHREAD_MD_H_
 #define	_PTHREAD_MD_H_
 
+#include <sys/kse.h>
+#include <ucontext.h>
+
 #define	THR_GETCONTEXT(ucp)	_ia64_save_context(&(ucp)->uc_mcontext)
 #define	THR_SETCONTEXT(ucp)	_ia64_restore_context(&(ucp)->uc_mcontext, \
 				    0, NULL)
 
-#define	THR_ALIGNBYTES	0
-#define	THR_ALIGN(td)	(td)
+#define	PER_THREAD
+
+struct kcb;
+struct kse;
+struct pthread;
+struct tcb;
+struct tdv;	/* We don't know what this is yet? */
+
+/*
+ * tp points to one of these.
+ */
+struct ia64_tp {
+	struct tdv		*tp_tdv;	/* dynamic TLS */
+	struct tcb		*tp_self;
+	char			tp_tls[0];	/* static TLS */
+};
+
+struct tcb {
+	struct kse_thr_mailbox	tcb_tmbx;
+	struct pthread		*tcb_thread;
+	struct kcb		*tcb_curkcb;
+	long			tcb_isfake;
+	struct ia64_tp		tcb_tp;
+};
 
-/* KSE Specific Data. */
-struct ksd {
-	void	*ksd_base;
-	int	ksd_size;
+struct kcb {
+	struct kse_mailbox	kcb_kmbx;
+	struct tcb		kcb_faketcb;
+	struct tcb		*kcb_curtcb;
+	struct kse		*kcb_kse;
 };
 
+register struct ia64_tp *_tp __asm("%r13");
+
+/*
+ * The kcb and tcb constructors.
+ */
+struct tcb	*_tcb_ctor(struct pthread *);
+void		_tcb_dtor(struct tcb *);
+struct kcb	*_kcb_ctor(struct kse *kse);
+void		_kcb_dtor(struct kcb *);
+
+/* Called from the KSE to set its private data. */
+static __inline void
+_kcb_set(struct kcb *kcb)
+{
+	/* There is no thread yet; use the fake tcb. */
+	_tp = &kcb->kcb_faketcb.tcb_tp;
+}
+
+/*
+ * Get the current kcb.
+ *
+ * This can only be called while in a critical region; don't
+ * worry about having the kcb changed out from under us.
+ */
+static __inline struct kcb *
+_kcb_get(void)
+{
+	return (_tp->tp_self->tcb_curkcb);
+}
+
+/*
+ * Enter a critical region.
+ *
+ * Read and clear km_curthread in the kse mailbox.
+ */
+static __inline struct kse_thr_mailbox *
+_kcb_critical_enter(void)
+{
+	struct kse_thr_mailbox *crit;
+	struct tcb *tcb;
+	uint32_t flags;
+
+	tcb = _tp->tp_self;
+	if (tcb->tcb_isfake != 0) {
+		/*
+		 * We already are in a critical region since
+		 * there is no current thread.
+		 */
+		crit = NULL;
+	} else {
+		flags = tcb->tcb_tmbx.tm_flags;
+		tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL;
+		crit = tcb->tcb_curkcb->kcb_kmbx.km_curthread;
+		tcb->tcb_curkcb->kcb_kmbx.km_curthread = NULL;
+		tcb->tcb_tmbx.tm_flags = flags;
+	}
+	return (crit);
+}
+
+static __inline void
+_kcb_critical_leave(struct kse_thr_mailbox *crit)
+{
+	struct tcb *tcb;
+
+	tcb = _tp->tp_self;
+	/* No need to do anything if this is a fake tcb. */
+	if (tcb->tcb_isfake == 0)
+		tcb->tcb_curkcb->kcb_kmbx.km_curthread = crit;
+}
+
+static __inline int
+_kcb_in_critical(void)
+{
+	struct tcb *tcb;
+	uint32_t flags;
+	int ret;
+
+	tcb = _tp->tp_self;
+	if (tcb->tcb_isfake != 0) {
+		/*
+		 * We are in a critical region since there is no
+		 * current thread.
+		 */
+		ret = 1;
+	} else {
+		flags = tcb->tcb_tmbx.tm_flags;
+		tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL;
+		ret = (tcb->tcb_curkcb->kcb_kmbx.km_curthread == NULL);
+		tcb->tcb_tmbx.tm_flags = flags;
+	}
+	return (ret);
+}
+
+static __inline void
+_tcb_set(struct kcb *kcb, struct tcb *tcb)
+{
+	if (tcb == NULL) {
+		kcb->kcb_curtcb = &kcb->kcb_faketcb;
+		_tp = &kcb->kcb_faketcb.tcb_tp;
+	}
+	else {
+		kcb->kcb_curtcb = tcb;
+		tcb->tcb_curkcb = kcb;
+		_tp = &tcb->tcb_tp;
+	}
+}
+
+static __inline struct tcb *
+_tcb_get(void)
+{
+	return (_tp->tp_self);
+}
+
+static __inline struct pthread *
+_get_curthread(void)
+{
+	return (_tp->tp_self->tcb_thread);
+}
+
+/*
+ * Get the current kse.
+ *
+ * Line _kcb_get(), this can only be called while in a critical region.
+ */
+static __inline struct kse *
+_get_curkse(void)
+{
+	return (_tp->tp_self->tcb_curkcb->kcb_kse);
+}
+
 void _ia64_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack,
     size_t stacksz);
 int _ia64_restore_context(mcontext_t *mc, intptr_t val, intptr_t *loc);
 int _ia64_save_context(mcontext_t *mc);
 
 static __inline int
-_thread_enter_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km)
+_thread_enter_uts(struct tcb *tcb, struct kcb *kcb)
 {
-	if (tm == NULL)
-		return (-1);
-	if (!_ia64_save_context(&tm->tm_context.uc_mcontext)) {
-		_ia64_enter_uts(km->km_func, km, km->km_stack.ss_sp,
-		    km->km_stack.ss_size);
+	if (_ia64_save_context(&tcb->tcb_tmbx.tm_context.uc_mcontext) == 0) {
+		/* Make the fake tcb the current thread. */
+		kcb->kcb_curtcb = &kcb->kcb_faketcb;
+		_tp = &kcb->kcb_faketcb.tcb_tp;
+		_ia64_enter_uts(kcb->kcb_kmbx.km_func, &kcb->kcb_kmbx,
+		    kcb->kcb_kmbx.km_stack.ss_sp,
+		    kcb->kcb_kmbx.km_stack.ss_size);
 		/* We should not reach here. */
 		return (-1);
 	}
@@ -62,12 +220,18 @@ _thread_enter_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km)
 }
 
 static __inline int
-_thread_switch(struct kse_thr_mailbox *tm, struct kse_thr_mailbox **thrp)
+_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
 {
-	if (tm == NULL)
-		return (-1);
-	_ia64_restore_context(&tm->tm_context.uc_mcontext, (intptr_t)tm,
-	    (intptr_t*)thrp);
+	kcb->kcb_curtcb = tcb;
+	tcb->tcb_curkcb = kcb;
+	_tp = &tcb->tcb_tp;
+	if (setmbox != 0)
+		_ia64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
+		    (intptr_t)&tcb->tcb_tmbx,
+		    (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+	else
+		_ia64_restore_context(&tcb->tcb_tmbx.tm_context.uc_mcontext,
+		    0, NULL);
 	/* We should not reach here. */
 	return (-1);
 }