PPC MD bits for KSE. Runs test cases OK. Crippled to 1:1 mode for

the time being.

2 files changed, 319 insertions, 0 deletions

diff --git a/lib/libpthread/arch/powerpc/include/atomic_ops.h b/lib/libpthread/arch/powerpc/include/atomic_ops.h
new file mode 100644
index 0000000..8068e6f
--- /dev/null
+++ b/lib/libpthread/arch/powerpc/include/atomic_ops.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2004 by Peter Grehan. 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.
+ * 3. The name of the author may not 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$
+ */
+
+#ifndef	_ATOMIC_OPS_H_
+#define	_ATOMIC_OPS_H_
+
+/*
+ * Atomic swap:
+ *   Atomic (tmp = *dst, *dst = val), then *res = tmp
+ *
+ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res);
+ */
+static inline void
+atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res)
+{
+	int tmp;
+
+	tmp = 0;	/* should be a better way to quieten cc1... */
+#ifdef __GNUC__
+	__asm __volatile(
+		"1:	lwarx	%0, 0, %4\n"	/* load with reservation */
+		"	stwcx.	%3, 0, %4\n"	/* attempt to store val */
+		"	bne- 1b\n"		/* interrupted? retry */
+		"	stw	%0, %1\n"	/* else, *dst -> *res */
+		: "=&r" (tmp), "=m" (*res), "+m" (*dst)
+		: "r" (val), "r" (dst)
+		: "cc", "memory");
+#endif
+}
+
+#define	atomic_swap_ptr(d, v, r) \
+	atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r)
+
+#define	atomic_swap_int(d, v, r) \
+	atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r)
+#endif
diff --git a/lib/libpthread/arch/powerpc/include/pthread_md.h b/lib/libpthread/arch/powerpc/include/pthread_md.h
new file mode 100644
index 0000000..776d45b
--- /dev/null
+++ b/lib/libpthread/arch/powerpc/include/pthread_md.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2004 by Peter Grehan. 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.
+ * 3. The name of the author may not 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$
+ */
+
+/*
+ * Machine-dependent thread prototypes/definitions for the thread kernel.
+ */
+#ifndef _PTHREAD_MD_H_
+#define	_PTHREAD_MD_H_
+
+#include <sys/kse.h>
+#include <stddef.h>
+#include <ucontext.h>
+
+extern void _ppc32_enter_uts(struct kse_mailbox *, kse_func_t, void *, size_t);
+extern int  _ppc32_setcontext(mcontext_t *, intptr_t, intptr_t *);
+extern int  _ppc32_getcontext(mcontext_t *);
+
+#define	KSE_STACKSIZE		16384
+
+#define	THR_GETCONTEXT(ucp)	_ppc32_getcontext(&(ucp)->uc_mcontext)
+#define	THR_SETCONTEXT(ucp)	_ppc32_setcontext(&(ucp)->uc_mcontext, 0, NULL)
+
+#define	PER_THREAD
+
+struct kcb;
+struct kse;
+struct pthread;
+struct tcb;
+struct tdv;
+
+/*
+ * %r2 points to a struct kcb.
+ */
+struct ppc32_tp {
+	struct tdv	*tp_tdv;	/* dynamic TLS */
+	uint32_t	_reserved_;
+	long double	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 ppc32_tp		tcb_tp;
+};
+
+struct kcb {
+	struct kse_mailbox	kcb_kmbx;
+	struct tcb		kcb_faketcb;
+	struct tcb		*kcb_curtcb;
+	struct kse		*kcb_kse;
+};
+
+/*
+ * From the PowerPC32 TLS spec:
+ *
+ * "r2 is the thread pointer, and points 0x7000 past the end of the
+ * thread control block." Or, 0x7008 past the start of the 8-byte tcb
+ */
+#define TP_OFFSET	0x7008
+register uint8_t *_tpr __asm("%r2");
+
+#define _tcb  ((struct tcb *)(_tpr - TP_OFFSET - offsetof(struct tcb, tcb_tp)))
+
+/*
+ * 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. */
+	_tpr = (uint8_t *)&kcb->kcb_faketcb.tcb_tp + TP_OFFSET;
+}
+
+/*
+ * 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 (_tcb->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;
+	uint32_t flags;
+
+	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)
+{
+        /* 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)
+{
+	uint32_t flags;
+	int ret;
+
+	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)
+                tcb = &kcb->kcb_faketcb;
+        kcb->kcb_curtcb = tcb;
+        tcb->tcb_curkcb = kcb;
+	_tpr = (uint8_t *)&tcb->tcb_tp + TP_OFFSET;
+}
+
+static __inline struct tcb *
+_tcb_get(void)
+{
+	return (_tcb);
+}
+
+static __inline struct pthread *
+_get_curthread(void)
+{
+	return (_tcb->tcb_thread);
+}
+
+/*
+ * Get the current kse.
+ *
+ * Like _kcb_get(), this can only be called while in a critical region.
+ */
+static __inline struct kse *
+_get_curkse(void)
+{
+	return (_tcb->tcb_curkcb->kcb_kse);
+}
+
+static __inline int
+_thread_enter_uts(struct tcb *tcb, struct kcb *kcb)
+{
+	if (_ppc32_getcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext) == 0) {
+		/* Make the fake tcb the current thread. */
+		kcb->kcb_curtcb = &kcb->kcb_faketcb;
+		_tpr = (uint8_t *)&kcb->kcb_faketcb.tcb_tp + TP_OFFSET;
+		_ppc32_enter_uts(&kcb->kcb_kmbx, kcb->kcb_kmbx.km_func,
+		    kcb->kcb_kmbx.km_stack.ss_sp,
+		    kcb->kcb_kmbx.km_stack.ss_size - 32);
+		/* We should not reach here. */
+		return (-1);
+	}
+	return (0);
+}
+
+static __inline int
+_thread_switch(struct kcb *kcb, struct tcb *tcb, int setmbox)
+{
+	mcontext_t *mc;
+	extern int _libkse_debug;
+
+	_tcb_set(kcb, tcb);
+	mc = &tcb->tcb_tmbx.tm_context.uc_mcontext;
+
+	/*
+	 * A full context needs a system call to restore, so use
+	 * kse_switchin. Otherwise, the partial context can be
+	 * restored with _ppc32_setcontext
+	 */
+	if (mc->mc_vers != _MC_VERSION_KSE && _libkse_debug != 0) {
+		if (setmbox)
+			kse_switchin(&tcb->tcb_tmbx, KSE_SWITCHIN_SETTMBX);
+                else
+                        kse_switchin(&tcb->tcb_tmbx, 0);
+	} else {
+		tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp;
+		if (setmbox)
+			_ppc32_setcontext(mc, (intptr_t)&tcb->tcb_tmbx,
+			    (intptr_t *)&kcb->kcb_kmbx.km_curthread);
+		else
+			_ppc32_setcontext(mc, 0, NULL);
+	}
+
+	/* We should not reach here. */
+	return (-1);
+}
+
+#endif /* _PTHREAD_MD_H_ */