Initial support for pthreads on m68k from

David Leonard <david.leonard@it.uq.edu.au>.

4 files changed, 331 insertions, 0 deletions

diff --git a/lib/libpthread/arch/m68k/Makefile.inc b/lib/libpthread/arch/m68k/Makefile.inc
new file mode 100644
index 00000000000..a7c4761a6b4
--- /dev/null
+++ b/lib/libpthread/arch/m68k/Makefile.inc
@@ -0,0 +1,4 @@
+# Machine dependent sources
+.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
+
+SRCS+= machdep.c syscall.S
diff --git a/lib/libpthread/arch/m68k/machdep.c b/lib/libpthread/arch/m68k/machdep.c
new file mode 100644
index 00000000000..80b47c63cae
--- /dev/null
+++ b/lib/libpthread/arch/m68k/machdep.c
@@ -0,0 +1,153 @@
+/* ==== machdep.c ============================================================
+ * Copyright (c) 1993, 1994 Chris Provenzano, proven@athena.mit.edu
+ *
+ * Copyright (c) 1993 by Chris Provenzano, proven@mit.edu
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by Chris Provenzano.
+ * 4. The name of Chris Provenzano may not be used to endorse or promote
+ *      products derived from this software without specific prior written
+ *      permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``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 CHRIS PROVENZANO 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.
+ *
+ * Description : Machine dependent functions for NetBSD on i386
+ *
+ *	1.00 93/08/04 proven
+ *      -Started coding this file.
+ *
+ * m68k work from David Leonard <david.leonard@it.uq.edu.au>.
+ *
+ */
+
+#ifndef lint
+static const char rcsid[] = "$Id: machdep.c,v 1.1 1997/04/13 17:13:08 briggs Exp $";
+#endif
+
+#include "pthread.h"
+
+/* ==========================================================================
+ * machdep_save_state()
+ */
+int machdep_save_state(void)
+{
+    return( _setjmp(pthread_run->machdep_data.machdep_state) );
+}
+
+/* ==========================================================================
+ * machdep_restore_state()
+ */
+void machdep_restore_state(void)
+{
+    _longjmp(pthread_run->machdep_data.machdep_state, 1);
+}
+
+/* ==========================================================================
+ * machdep_set_thread_timer()
+ */
+void machdep_set_thread_timer(struct machdep_pthread *machdep_pthread)
+{
+    if (setitimer(ITIMER_VIRTUAL, &(machdep_pthread->machdep_timer), NULL)) {
+        PANIC();
+    }
+}
+
+/* ==========================================================================
+ * machdep_unset_thread_timer()
+ */
+void machdep_unset_thread_timer(struct machdep_pthread *machdep_pthread)
+{
+    struct itimerval zeroval = { { 0, 0 }, { 0, 0 } };
+
+    if (setitimer(ITIMER_VIRTUAL, &zeroval, NULL)) {
+        PANIC();
+    }
+}
+
+/* ==========================================================================
+ * machdep_pthread_cleanup()
+ */
+void *machdep_pthread_cleanup(struct machdep_pthread *machdep_pthread)
+{
+    return(machdep_pthread->machdep_stack);
+}
+
+/* ==========================================================================
+ * machdep_pthread_start()
+ */
+void machdep_pthread_start(void)
+{
+	context_switch_done();
+	sig_check_and_resume();
+
+    /* Run current thread's start routine with argument */
+    pthread_exit( 
+        pthread_run->machdep_data.start_routine(
+       	    pthread_run->machdep_data.start_argument
+	)
+    );
+
+    /* should never reach here */
+    PANIC();
+}
+
+/* ==========================================================================
+ * machdep_pthread_create()
+ */
+void machdep_pthread_create(struct machdep_pthread *machdep_pthread,
+  void *(* start_routine)(), void *start_argument, long stack_size,
+  void *stack_start, long nsec)
+{
+    machdep_pthread->machdep_stack = stack_start;
+
+    machdep_pthread->start_routine = start_routine;
+    machdep_pthread->start_argument = start_argument;
+
+    machdep_pthread->machdep_timer.it_value.tv_sec = 0;
+    machdep_pthread->machdep_timer.it_interval.tv_sec = 0;
+    machdep_pthread->machdep_timer.it_interval.tv_usec = 0;
+    machdep_pthread->machdep_timer.it_value.tv_usec = nsec / 1000;
+
+    _setjmp(machdep_pthread->machdep_state);
+
+    /*
+     * Set up new stack frame so that it looks like it
+     * returned from a longjmp() to the beginning of
+     * machdep_pthread_start().
+     *
+     * state is the set_jmp structure, which for m68k is:
+     *   long onstack_flag;	// [0]
+     *   long sigmask;		// [1]
+     *   long sp;		// [2]
+     *   long fp;		// [3]
+     *   long ap;		// [4]
+     *   long pc;		// [5]
+     *   long ps;		// [6]
+     *   long regs[10];		// non scratch registers
+     */
+    machdep_pthread->machdep_state[5] = (long)machdep_pthread_start;
+
+    /* Stack starts high and builds down. */
+    machdep_pthread->machdep_state[2] =
+      (int)machdep_pthread->machdep_stack + stack_size;
+}
diff --git a/lib/libpthread/arch/m68k/machdep.h b/lib/libpthread/arch/m68k/machdep.h
new file mode 100644
index 00000000000..a63e77de0d3
--- /dev/null
+++ b/lib/libpthread/arch/m68k/machdep.h
@@ -0,0 +1,49 @@
+/*	$OpenBSD	*/
+
+/* ==== machdep.h ============================================================
+ * Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
+ *
+ * $ I d: engine-m68000-netbsd.h,v 1.51 1994/11/08 15:39:15 proven Exp $
+ *
+ */
+#include <unistd.h>
+#include <setjmp.h>
+#include <sys/time.h>
+
+/*
+ * The first machine dependent functions are the SEMAPHORES
+ * needing the test and set instruction.
+ */
+#define SEMAPHORE_CLEAR 0
+#define SEMAPHORE_SET   0x80;
+
+#define SEMAPHORE_TEST_AND_SET(lock)		\
+({						\
+	volatile long temp = SEMAPHORE_CLEAR;   \
+	__asm__ volatile( 			\
+	  "tas %2; bpl 0f; movl #1,%0; 0:"	\
+          :"=r" (temp)                    	\
+          :"0" (temp),"m" (*lock));        	\
+        temp;                                   \
+})
+
+#define SEMAPHORE_RESET(lock)           *lock = SEMAPHORE_CLEAR
+
+/*
+ * Min pthread stacksize
+ */
+#define PTHREAD_STACK_MIN	1024
+
+/*
+ * New functions
+ */
+
+__BEGIN_DECLS
+
+#if defined(PTHREAD_KERNEL)
+
+int machdep_save_state      __P((void));
+
+#endif
+
+__END_DECLS
diff --git a/lib/libpthread/arch/m68k/syscall.S b/lib/libpthread/arch/m68k/syscall.S
new file mode 100644
index 00000000000..b68fc846138
--- /dev/null
+++ b/lib/libpthread/arch/m68k/syscall.S
@@ -0,0 +1,125 @@
+/*	$OpenBSD: syscall.S,v 1.1 1997/04/13 17:13:09 briggs Exp $	*/
+
+#ifndef lint
+    .text
+    .asciz "$Id: syscall.S,v 1.1 1997/04/13 17:13:09 briggs Exp $";
+#endif
+ 
+#include <machine/asm.h>
+#include <sys/syscall.h>
+
+#ifdef __STDC__
+#define SYSCALL(x)      .even; ENTRY(machdep_sys_ ## x); \
+			movl \#SYS_ ## x,d0; trap \#0; jcs err; rts
+#else /* !__STDC__ */
+#define SYSCALL(x)      .even; ENTRY(machdep_sys_/**/x); \
+			movl #SYS_/**/x,d0; trap #0; jcs err; rts
+#endif /* !__STDC__ */
+
+/*
+ * Initial asm stuff for all functions.
+ */
+	.text
+	.even
+
+
+/* ==========================================================================
+ * error code for all syscalls. The error value is returned as the negative
+ * of the errno value.
+ */
+
+err:
+	negl		d0
+	rts
+
+/* ==========================================================================
+ * machdep_sys_write()
+ */
+SYSCALL(write)
+
+/* ==========================================================================
+ * machdep_sys_read()
+ */
+SYSCALL(read)
+
+/* ==========================================================================
+ * machdep_sys_open()
+ */
+SYSCALL(open)
+
+/* ==========================================================================
+ * machdep_sys_close()
+ */
+SYSCALL(close)
+
+/* ==========================================================================
+ * machdep_sys_fcntl()
+ */
+SYSCALL(fcntl)
+
+/* ==========================================================================
+ * machdep_sys_lseek()
+ */
+SYSCALL(lseek)
+
+/* ========================================================================== 
+ * Nonstandard calls used to make the system work
+ *
+ * ==========================================================================
+ * machdep_sys_select()
+ */
+SYSCALL(select)
+
+/* ========================================================================== 
+ * Berkeley socket stuff
+ * 
+ * ==========================================================================
+ * machdep_sys_socket()
+ */
+SYSCALL(socket)
+
+/* ==========================================================================
+ * machdep_sys_bind()
+ */
+SYSCALL(bind)
+
+/* ==========================================================================
+ * machdep_sys_connect()
+ */
+SYSCALL(connect)
+
+/* ==========================================================================
+ * machdep_sys_accept()
+ */
+SYSCALL(accept)
+
+/* ==========================================================================
+ * machdep_sys_listen()
+ */
+SYSCALL(listen)
+
+/* ==========================================================================
+ * machdep_sys_getsockopt()
+ */
+SYSCALL(getsockopt)
+
+/* ==========================================================================
+ * machdep_sys_readv()
+ */
+SYSCALL(readv)
+
+/* ==========================================================================
+ * machdep_sys_writev()
+ */
+SYSCALL(writev)
+
+/* ==========================================================================
+ * machdep_sys_getpeername()
+ */
+SYSCALL(getpeername)
+
+/* ==========================================================================
+ * machdep_sys_getsockname()
+ */
+SYSCALL(getsockname)
+