Add architecture dependent atomic ops (atomic_swap only), KSE specific

data, and userland versions of [gs]etcontext().

Modify the UTS entry and exit functions to account of FPU validity
and format.

3 files changed, 249 insertions, 0 deletions

diff --git a/lib/libpthread/arch/i386/include/atomic_ops.h b/lib/libpthread/arch/i386/include/atomic_ops.h
new file mode 100644
index 0000000..4d84ae5
--- /dev/null
+++ b/lib/libpthread/arch/i386/include/atomic_ops.h
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ *
+ * 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	_ATOMIC_OPS_H_
+#define	_ATOMIC_OPS_H_
+
+/*
+ * Atomic swap:
+ *   Atomic (tmp = *dst, *dst = val), then *res = tmp
+ *
+ * void atomic_swap_long(long *dst, long val, long *res);
+ */
+static inline void
+atomic_swap_long(long *dst, long val, long *res)
+{
+	__asm __volatile(
+	"xchgl %2, %1; movl %2, %0"
+	 : "=m" (*res) : "m" (*dst), "r" (val) : "memory");
+}
+
+#define	atomic_swap_int(d, v, r) \
+	atomic_swap_long((long *)(d), (long)(v), (long *)(r))
+
+#define	atomic_swap_ptr		atomic_swap_int
+
+#endif
diff --git a/lib/libpthread/arch/i386/include/ksd.h b/lib/libpthread/arch/i386/include/ksd.h
new file mode 100644
index 0000000..bdbb83b
--- /dev/null
+++ b/lib/libpthread/arch/i386/include/ksd.h
@@ -0,0 +1,144 @@
+/*-
+ * 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.
+ *
+ * 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 pthread;
+struct __ucontext;
+struct kse;
+
+/*
+ * KSE Specific Data.
+ */
+struct ksd {
+	int	ldt;
+#define	KSDF_INITIALIZED	0x01
+	long	flags;
+	void	*base;
+	long	size;
+};
+
+/*
+ * 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_GET_PTR(name) ({					\
+	void *__result;						\
+								\
+	u_int __i;						\
+	__asm __volatile("movl %%gs:%1, %0"			\
+	    : "=r" (__i)					\
+	    : "m" (*(u_int *)(__ksd_offset(name))));		\
+	__result = (void *)__i;					\
+								\
+	__result;						\
+})
+
+/*
+ * 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;						\
+})
+
+/*
+ * All members of struct kse are prefixed with k_.
+ */
+#define	KSD_GET_PTR(member)		__KSD_GET_PTR(k_ ## member)
+#define	KSD_SET_PTR(member, val)	__KSD_SET32(k_ ## member, val)
+#define	KSD_READANDCLEAR_PTR(member)	__KSD_READANDCLEAR32(k_ ## member)
+
+#define	_ksd_curkse		((struct kse *)KSD_GET_PTR(mbx.km_udata))
+#define	_ksd_curthread		KSD_GET_PTR(curthread)
+#define _ksd_set_tmbx(value)	KSD_SET_PTR(mbx.km_curthread, (void *)value)
+#define	_ksd_readandclear_tmbx	KSD_READANDCLEAR_PTR(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
new file mode 100644
index 0000000..ae00759
--- /dev/null
+++ b/lib/libpthread/arch/i386/include/pthread_md.h
@@ -0,0 +1,54 @@
+/*-
+ * Copyright (c) 2002 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.
+ *
+ * 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$
+ */
+/*
+ * Machine-dependent thread prototypes/definitions for the thread kernel.
+ */
+#ifndef _PTHREAD_MD_H_
+#define	_PTHREAD_MD_H_
+
+#include <sys/kse.h>
+#include <setjmp.h>
+#include <ucontext.h>
+
+extern int _thread_enter_uts(struct kse_thr_mailbox *, struct kse_mailbox *);
+extern int _thread_switch(struct kse_thr_mailbox *, struct kse_thr_mailbox **);
+extern int _thr_setcontext(ucontext_t *);
+extern int _thr_getcontext(ucontext_t *);
+
+/*
+ * These are needed to ensure an application doesn't attempt to jump
+ * between stacks of different threads.  They return the stack of
+ * jmp_buf, sigjmp_buf, and ucontext respectively.
+ */
+#define	GET_STACK_JB(jb)	((unsigned long)((jb)[0]._jb[2]))
+#define	GET_STACK_SJB(sjb)	((unsigned long)((sjb)[0]._sjb[2]))
+#define	GET_STACK_UC(ucp)	((unsigned long)((ucp)->uc_mcontext.mc_esp))
+
+#define	THR_GETCONTEXT(ucp)	_thr_getcontext(ucp)
+#define	THR_SETCONTEXT(ucp)	_thr_setcontext(ucp)
+#endif