merge the freebsd/linux thread files into one, and use it for netbsd too

ef/Runtime/System/md/x86/Makefile

@@ -41,33 +41,8 @@ include $(DEPTH)/config/config.mk
 # (3) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-ifeq ($(OS_ARCH),Linux)
-ASFILES	=	x86Exception_gas.s					\
-		x86InvokeNative_gas.s					\
-		$(NULL)
-
-CPPSRCS	+= 	x86LinuxThread.cpp					\
-		$(NULL)
-
-LOCAL_MD_EXPORTS_x86 +=  	x86LinuxThread.h			\
-				$(NULL)
-
-endif
-
-ifeq ($(OS_ARCH),FreeBSD)
-ASFILES	=	x86Exception_gas.s					\
-		x86InvokeNative_gas.s					\
-		$(NULL)
-
-CPPSRCS	+= 	x86FreeBSDThread.cpp					\
-		$(NULL)
-
-LOCAL_MD_EXPORTS_x86 +=  	x86FreeBSDThread.h			\
-				$(NULL)
-
-endif
-
 ifeq ($(OS_ARCH),WINNT)
+
 CPPSRCS	+= 	Win32ExceptionHandler.cpp                               \
 		x86Win32InvokeNative.cpp				\
 		x86Win32Thread.cpp					\
@@ -75,6 +50,18 @@ CPPSRCS	+= 	Win32ExceptionHandler.cpp                               \
 
 LOCAL_MD_EXPORTS_x86 +=  	x86Win32Thread.h			\
 				$(NULL)
+else
+
+ASFILES	=	x86Exception_gas.s					\
+		x86InvokeNative_gas.s					\
+		$(NULL)
+
+CPPSRCS	+= 	x86UnixishThread.cpp					\
+		$(NULL)
+
+LOCAL_MD_EXPORTS_x86 +=  	x86UnixishThread.h			\
+				$(NULL)
+
 endif
 
 include $(DEPTH)/config/rules.mk

ef/Runtime/System/md/x86/x86UnixishThread.cpp

@@ -0,0 +1,188 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+#include <unistd.h>
+#if 0
+#include <sys/ptrace.h>
+#endif
+#include <assert.h>
+#include <signal.h>
+#ifdef _REENTRANT
+#include <pthread.h>
+#endif
+#ifdef LINUX
+#include <linux/ptrace.h>
+#include <sys/user.h>
+#endif
+#include "Thread.h"
+#include "NativeCodeCache.h"
+#include "Exceptions.h"
+
+#if defined( FREEBSD ) || defined ( NETBSD )
+
+#define CONTEXT_EBP(ctxt) ctxt.sc_ebp
+#define CONTEXT_EIP(ctxt) ctxt.sc_eip
+
+#elif defined ( LINUX )
+
+#define CONTEXT_EBP(ctxt) ctxt.ebp
+#define CONTEXT_EIP(ctxt) ctxt.eip
+
+#else
+#error "need CONTEXT_EIP and CONTEXT_EBP for this architecture"
+#endif
+
+// Supend the thread specified by the pid
+void _suspendThread(HANDLE  handle) 
+{
+#ifdef _REENTRANT
+    if (pthread_kill(handle, SIGKILL) == -1) {
+		assert(0);
+    }
+#endif
+}
+
+// Resume the thread specified by the pid
+void _resumeThread(HANDLE  handle) 
+{
+#ifdef _REENTRANT
+    if (pthread_kill(handle, SIGCONT) == -1) {
+		assert(0);
+    }
+#endif
+}
+
+// Gets the thread context via ptrace
+bool 
+_getThreadContext(HANDLE handle, ThreadContext& context) 
+{
+#if 0
+    if (ptrace(PTRACE_ATTACH, handle, NULL, NULL) == -1)
+		assert(0);
+    if (ptrace(PTRACE_PEEKUSR, handle, offsetof(struct user, regs), &context) 
+		== -1)
+		assert(0);
+    
+#endif
+    return true;
+}
+
+// Sets the thread context via ptrace
+void 
+_setThreadContext(HANDLE handle, ThreadContext &context) 
+{
+#if 0
+    if (ptrace(PTRACE_ATTACH, handle, NULL, NULL) == -1)
+		assert(0);
+    if (ptrace(PTRACE_POKEUSR, handle, offsetof(struct user, regs), &context) 
+	== -1)
+		assert(0);
+#endif
+}
+
+Int32* 
+_getFramePointer(ThreadContext& context) 
+{
+	return (Int32 *) CONTEXT_EBP(context);
+}
+
+void _setFramePointer(ThreadContext& context, Int32* v) 
+{
+	CONTEXT_EBP(context) = (long) v;
+}
+
+Uint8* 
+_getInstructionPointer(ThreadContext &context) 
+{
+	return (Uint8*)CONTEXT_EIP(context);
+}
+
+void 
+_setInstructionPointer(ThreadContext& context, Uint8 *v) 
+{
+	CONTEXT_EIP(context) = (long) v;
+}
+
+void Thread::realHandle() 
+{     
+	// sets up the OS handles
+	HANDLE thr = getpid();
+}
+
+/*	
+	Special invoke for threads.
+
+	We prepare the stack for a newborn thread as follows.  First we push
+	the hardware exception handler (as {previous handler, new handler}),
+	and set fs:[0] to point to this structure. This will make win32 call
+	new handler when a hardware exception fires (/0, *NULL, or illegal
+	instruction).
+
+	Second, we push EBP as it it is upon entry to this routine, followed
+	by a pointer to uncaughtException, followed by the sentinel
+	NULL. Then we prepare to call __invoke() which corresponds to
+	Method::invoke() by pushing the arguments in reverse order. Now,
+	regardless whether invoke() returns normally or through an uncaught
+	exception, we will return to the line 'add esp,24' which is where we
+	clean up afterwards.
+
+	For the entry set-up to uncaughtException() see
+	uncaughtExceptionExit() in x86Win32ExceptionHandler.cpp in
+	Runtime/System/md/x86.  
+*/
+
+// called by Thread::invoke() and is only used to avoid assuming a calling
+// convention for C++ methods.
+static void 
+__invoke(Method* m, JavaObject* obj, JavaObject* arr[], int sz) 
+{
+	m->invoke(obj,arr,sz);
+}
+
+void
+Thread::invoke(Method* m, JavaObject* obj, JavaObject* arr[], int sz) 
+{
+/*
+	DWORD w32 = (DWORD)win32HardwareThrow;
+	DWORD uE = (DWORD)uncaughtException;
+	__asm {
+		push w32
+		push fs:[0]
+		mov fs:[0],esp
+		push ebp
+		push uE
+		push NULL
+		mov ecx,esp
+		push sz
+		push arr
+		push obj
+		push m
+		mov ebp,ecx
+		call __invoke
+		add esp,24 // pop 4 arguments, NULL, and uncaughtException
+		pop ebp
+		pop ecx
+		mov fs:[0],ecx
+		pop ecx  // pop win32HardwareThrow
+	}
+*/
+	m->invoke(obj,arr,sz);
+}