entered into RCS

4 files changed, 417 insertions, 0 deletions

diff --git a/libthreads/i386/asm.h b/libthreads/i386/asm.h
new file mode 100644
index 00000000..48129a3b
--- /dev/null
+++ b/libthreads/i386/asm.h
@@ -0,0 +1,172 @@
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/* 
+ * HISTORY
+ * $Log:	asm.h,v $
+ * Revision 2.5  91/07/31  18:36:13  dbg
+ * 	Changes for STDC (from kernel version).
+ * 	[91/07/30  17:34:54  dbg]
+ * 
+ * Revision 2.4  91/05/14  17:56:49  mrt
+ * 	Correcting copyright
+ * 
+ * Revision 2.3  91/02/14  14:19:58  mrt
+ * 	Changed to new Mach copyright
+ * 	[91/02/13  12:15:20  mrt]
+ * 
+ * Revision 2.2  90/05/03  15:54:33  dbg
+ * 	Created.
+ * 	[90/04/30  15:39:58  dbg]
+ * 
+ * 	Typo on ENTRY if gprof
+ * 	[90/03/29            rvb]
+ * 	fix SVC for "ifdef wheeze" [kupfer]
+ * 	Fix the GPROF definitions.
+ * 	 ENTRY(x) gets profiled iffdef GPROF.
+ * 	 Entry(x) (and DATA(x)) is NEVER profiled.
+ * 	 MCOUNT can be used by asm that intends to build a frame,
+ * 	 after the frame is built.
+ * 	[90/02/26            rvb]
+ * 	Add #define addr16 .byte 0x67
+ * 	[90/02/09            rvb]
+ * 	Added LBi, SVC and ENTRY
+ * 	[89/11/10  09:51:33  rvb]
+ * 
+ * 	New a.out and coff compatible .s files.
+ * 	[89/10/16            rvb]
+ * 
+ */
+
+
+#define S_ARG0	 4(%esp)
+#define S_ARG1	 8(%esp)
+#define S_ARG2	12(%esp)
+#define S_ARG3	16(%esp)
+
+#define FRAME	pushl %ebp; movl %esp, %ebp
+#define EMARF	leave
+
+#define B_ARG0	 8(%ebp)
+#define B_ARG1	12(%ebp)
+#define B_ARG2	16(%ebp)
+#define B_ARG3	20(%ebp)
+
+#ifdef	wheeze
+
+#define ALIGN 4
+#define EXT(x) x
+#define	LEXT(x) x:
+#define LCL(x) ./**/x
+
+#define LB(x,n) ./**/x
+#define	LBl(x,n) ./**/x:
+#define LBb(x,n) ./**/x
+#define LBf(x,n) ./**/x
+
+#define	SVC lcall $7,$0
+
+#define String .string
+#define Value  .value
+#define Times(a,b) [a\*b]
+#define Divide(a,b) [a\\b]
+
+#define INB	inb	(%dx)
+#define OUTB	outb	(%dx)
+#define INL	inl	(%dx)
+#define OUTL	outl	(%dx)
+
+#else	wheeze
+
+#define ALIGN 2
+#ifdef	__STDC__
+#define	EXT(x) _ ## x
+#define	LEXT(x) _ ## x ## :
+#else	/* __STDC__ */
+#define EXT(x) _/**/x
+#define LEXT(x) _/**/x:
+#endif	/* __STDC__ */
+#define	LCL(x)	x
+
+#define LB(x,n) n
+#ifdef	__STDC__
+#define	LBl(x,n) n ## :
+#define LBb(x,n) n ## b
+#define LBf(x,n) n ## f
+#else	/* __STDC__ */
+#define	LBl(x,n) n/**/:
+#define LBb(x,n) n/**/b
+#define LBf(x,n) n/**/f
+#endif	/* __STDC__ */
+
+#define SVC .byte 0x9a; .long 0; .word 0x7
+
+#define String	.ascii
+#define Value	.word
+#define Times(a,b) (a*b)
+#define Divide(a,b) (a/b)
+
+#define INB	inb	%dx, %al
+#define OUTB	outb	%al, %dx
+#define INL	inl	%dx, %eax
+#define OUTL	outl	%eax, %dx
+
+#endif	wheeze
+
+#define data16	.byte 0x66
+#define addr16	.byte 0x67
+
+
+
+#ifdef GPROF
+#define MCOUNT		.data; LBl(x, 9) .long 0; .text; \
+			lea LBb(x, 9),%edx; call mcount
+#define	ENTRY(x)	.globl EXT(x); .align ALIGN; LEXT(x) ; \
+			pushl %ebp; movl %esp, %ebp; MCOUNT; popl %ebp;
+#define	ENTRY2(x,y)	.globl EXT(x); .globl EXT(y); \
+			.align ALIGN; LEXT(x) LEXT(y) ; \
+			pushl %ebp; movl %esp, %ebp; MCOUNT; popl %ebp;
+#ifdef	__STDC__
+#define	ASENTRY(x) 	.globl x; .align ALIGN; x ## : ; \
+			pushl %ebp; movl %esp, %ebp; MCOUNT; popl %ebp;
+#else	/* __STDC__ */
+#define	ASENTRY(x) 	.globl x; .align ALIGN; x: ; \
+			pushl %ebp; movl %esp, %ebp; MCOUNT; popl %ebp;
+#endif	/* __STDC__ */
+
+#else	GPROF
+#define MCOUNT
+#define	ENTRY(x)	.globl EXT(x); .align ALIGN; LEXT(x)
+#define	ENTRY2(x,y)	.globl EXT(x); .globl EXT(y); \
+			.align ALIGN; LEXT(x) LEXT(y)
+#ifdef	__STDC__
+#define	ASENTRY(x)	.globl x; .align ALIGN; x ## :
+#else	/* __STDC__ */
+#define	ASENTRY(x)	.globl x; .align ALIGN; x:
+#endif	/* __STDC__ */
+#endif	GPROF
+
+#define	Entry(x)	.globl EXT(x); .align ALIGN; LEXT(x)
+#define	DATA(x)		.globl EXT(x); .align ALIGN; LEXT(x)
diff --git a/libthreads/i386/cthread_inline.awk b/libthreads/i386/cthread_inline.awk
new file mode 100644
index 00000000..8e0cb7d4
--- /dev/null
+++ b/libthreads/i386/cthread_inline.awk
@@ -0,0 +1,86 @@
+# 
+# Mach Operating System
+# Copyright (c) 1991,1990 Carnegie Mellon University
+# All Rights Reserved.
+# 
+# Permission to use, copy, modify and distribute this software and its
+# documentation is hereby granted, provided that both the copyright
+# notice and this permission notice appear in all copies of the
+# software, derivative works or modified versions, and any portions
+# thereof, and that both notices appear in supporting documentation.
+# 
+# CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+# CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+# ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+# 
+# Carnegie Mellon requests users of this software to return to
+# 
+#  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+#  School of Computer Science
+#  Carnegie Mellon University
+#  Pittsburgh PA 15213-3890
+# 
+# any improvements or extensions that they make and grant Carnegie Mellon
+# the rights to redistribute these changes.
+#
+#
+# HISTORY
+# $Log:	cthread_inline.awk,v $
+# Revision 2.5  91/05/14  17:57:03  mrt
+# 	Correcting copyright
+# 
+# Revision 2.4  91/05/08  13:36:05  dbg
+# 	Unlock lock with a locked instruction (xchg).
+# 	[91/03/20            dbg]
+# 
+# Revision 2.3  91/02/14  14:20:06  mrt
+# 	Added new Mach copyright
+# 	[91/02/13  12:33:05  mrt]
+# 
+# Revision 2.2  90/05/03  15:54:56  dbg
+#	Created (from 68020 version).
+#	[90/02/05            dbg]
+#
+#	 Revision 2.2  89/12/08  19:54:30  rwd
+#	 	Inlines are now spins instead of mutexes.
+#	 	[89/10/23            rwd]
+#	 
+#	 Revision 2.1  89/08/04  15:15:14  rwd
+#	 Created.
+#	 
+#	 Revision 1.3  89/05/05  19:00:33  mrt
+#	 	Cleanup for Mach 2.5
+#	 
+#
+
+# sun/cthread_inline.awk
+#
+# Awk script to inline critical C Threads primitives on i386
+
+NF == 2 && $1 == "call" && $2 == "_spin_try_lock" {
+	print	"/	BEGIN INLINE spin_try_lock"
+	print	"	movl	(%esp),%ecx	/ point at mutex"
+	print	"	movl	$1,%eax		/ set locked value in acc"
+	print	"	xchg	%eax,(%ecx)	/ locked swap with mutex"
+	print	"	xorl	$1,%eax		/ logical complement"
+	print	"/	END INLINE spin_try_lock"
+	continue
+}
+NF == 2 && $1 == "call" && $2 == "_spin_unlock" {
+	print	"/	BEGIN INLINE " $2
+	print	"	movl	(%esp),%ecx"
+	print	"	xorl	%eax,%eax	/ set unlocked value in acc"
+	print	"	xchg	%eax,(%ecx)	/ locked swap with mutex"
+	print	"/	END INLINE " $2
+	continue
+}
+NF == 2 && $1 == "call" && $2 == "_cthread_sp" {
+	print	"/	BEGIN INLINE cthread_sp"
+	print	"	movl	%esp,%eax"
+	print	"/	END INLINE cthread_sp"
+	continue
+}
+# default:
+{
+	print
+}
diff --git a/libthreads/i386/cthreads.h b/libthreads/i386/cthreads.h
new file mode 100644
index 00000000..8ffe4b72
--- /dev/null
+++ b/libthreads/i386/cthreads.h
@@ -0,0 +1,89 @@
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ * HISTORY
+ * $Log:	cthreads.h,v $
+ * Revision 2.7  92/01/03  20:36:59  dbg
+ * 	Add volatile to spin_lock_t.  Change spin_unlock and
+ * 	spin_try_lock definitions back to memory operands, but rely on
+ * 	volatile attribute to keep from using value in memory.
+ * 	[91/09/04            dbg]
+ * 
+ * Revision 2.6  91/08/28  20:18:39  jsb
+ * 	Safer definitions for spin_unlock and spin_try_lock from mib.
+ * 
+ * Revision 2.5  91/07/31  18:36:49  dbg
+ * 	Add inline substitution for cthread_sp, spin_unlock,
+ * 	spin_try_lock.
+ * 	[91/07/30  17:35:53  dbg]
+ * 
+ * Revision 2.4  91/05/14  17:57:11  mrt
+ * 	Correcting copyright
+ * 
+ * Revision 2.3  91/02/14  14:20:14  mrt
+ * 	Changed to new Mach copyright
+ * 	[91/02/13  12:20:00  mrt]
+ * 
+ * Revision 2.2  90/11/05  14:37:23  rpd
+ * 	Created.
+ * 	[90/11/01            rwd]
+ * 
+ *
+ */
+
+#ifndef _MACHINE_CTHREADS_H_
+#define _MACHINE_CTHREADS_H_
+
+typedef volatile int spin_lock_t;
+#define SPIN_LOCK_INITIALIZER	0
+#define spin_lock_init(s)	(*(s) = 0)
+#define spin_lock_locked(s)	(*(s) != 0)
+
+#ifdef	__GNUC__
+
+#define	spin_unlock(p) \
+	({  register int _u__ ; \
+	    asm volatile("xorl %0, %0; \n\
+			  xchgl %0, %1" \
+			: "=&r" (_u__), "=m" (*(p)) ); \
+	    0; })
+
+#define	spin_try_lock(p)\
+	({  boolean_t _r__; \
+	    asm volatile("movl $1, %0; \n\
+			  xchgl %0, %1" \
+			: "=&r" (_r__), "=m" (*(p)) ); \
+	    !_r__; })
+
+#define	cthread_sp() \
+	({  int	_sp__; \
+	    asm("movl %%esp, %0" \
+	      :	"=g" (_sp__) ); \
+	    _sp__; })
+
+#endif	/* __GNUC__ */
+
+#endif _MACHINE_CTHREADS_H_
diff --git a/libthreads/i386/lock.s b/libthreads/i386/lock.s
new file mode 100644
index 00000000..e27fa7ff
--- /dev/null
+++ b/libthreads/i386/lock.s
@@ -0,0 +1,70 @@
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ * HISTORY
+ * $Log:	lock.s,v $
+ * Revision 2.5  91/05/14  17:57:20  mrt
+ * 	Correcting copyright
+ * 
+ * Revision 2.4  91/05/08  13:36:15  dbg
+ * 	Unlock lock with a locked instruction (xchg).
+ * 	[91/03/20            dbg]
+ * 
+ * Revision 2.3  91/02/14  14:20:18  mrt
+ * 	Changed to new Mach copyright
+ * 	[91/02/13  12:20:06  mrt]
+ * 
+ * Revision 2.2  90/05/03  15:54:59  dbg
+ * 	Created.
+ * 	[90/02/05            dbg]
+ * 
+ */
+
+#include <i386/asm.h>
+
+/*
+ * boolean_t spin_try_lock(int *m)
+ */
+ENTRY(spin_try_lock)
+	movl	4(%esp),%ecx		/ point at mutex
+	movl	$1,%eax			/ set locked value in acc
+	xchg	%eax,(%ecx)		/ swap with mutex
+					/ xchg with memory is automatically
+					/ locked
+	xorl	$1,%eax			/ 1 (locked) => FALSE
+					/ 0 (locked) => TRUE
+	ret
+
+/*
+ * void spin_unlock(int *m)
+ */
+ENTRY(spin_unlock)
+	movl	4(%esp),%ecx		/ point at mutex
+	xorl	%eax,%eax		/ set unlocked value in acc
+	xchg	%eax,(%ecx)		/ swap with mutex
+					/ xchg with memory is automatically
+					/ locked
+	ret