--- BasiliskII/src/MacOSX/main_macosx.mm	2002/05/25 23:58:51	1.2
+++ BasiliskII/src/MacOSX/main_macosx.mm	2005/01/30 21:42:13	1.13
@@ -1,11 +1,11 @@
 /*
- *  $Id: main_macosx.mm,v 1.2 2002/05/25 23:58:51 nigel Exp $
+ *  $Id: main_macosx.mm,v 1.13 2005/01/30 21:42:13 gbeauche Exp $
  *
  *  main_macosx.mm -	Startup code for MacOS X
  *						Based (in a small way) on the default main.m,
 						and on Basilisk's main_unix.cpp
  *
- *  Basilisk II (C) 1997-2002 Christian Bauer
+ *  Basilisk II (C) 1997-2005 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#define PTHREADS
+#define PTHREADS	// Why is this here?
 #include "sysdeps.h"
 
 #ifdef HAVE_PTHREADS
@@ -32,20 +32,27 @@
 # include <sys/mman.h>
 #endif
 
+#include <string>
+using std::string;
+
 #include "cpu_emulation.h"
 #include "macos_util_macosx.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_editor.h"
 #include "rom_patches.h"
+#include "sigsegv.h"
 #include "sys.h"
-#include "timer.h"
 #include "user_strings.h"
 #include "version.h"
 #include "video.h"
 #include "vm_alloc.h"
 #include "xpram.h"
 
+#if USE_JIT
+extern void flush_icache_range(uint32 start, uint32 size);  // from compemu_support.cpp
+#endif
+
 #ifdef ENABLE_MON
 # include "mon.h"
 #endif
@@ -61,7 +68,6 @@
 
 // Constants
 const char ROM_FILE_NAME[] = "ROM";
-const int SIG_STACK_SIZE = SIGSTKSZ;	// Size of signal stack
 const int SCRATCH_MEM_SIZE = 0x10000;	// Size of scratch memory area
 
 
@@ -91,21 +97,69 @@ static pthread_mutex_t intflag_lock = PT
 uint8 *ScratchMem = NULL;			// Scratch memory for Mac ROM writes
 #endif
 
-#if defined(HAVE_TIMER_CREATE) && defined(_POSIX_REALTIME_SIGNALS)
-#define SIG_TIMER SIGRTMIN
-static timer_t timer;				// 60Hz timer
-#endif
-
-//#ifdef ENABLE_MON
+#ifdef ENABLE_MON
 static struct sigaction sigint_sa;	// sigaction for SIGINT handler
 static void sigint_handler(...);
-//#endif
+#endif
 
 #if REAL_ADDRESSING
 static bool lm_area_mapped = false;	// Flag: Low Memory area mmap()ped
 #endif
 
 
+/*
+ *  SIGSEGV handler
+ */
+
+static sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address,
+										sigsegv_address_t fault_instruction)
+{
+#if ENABLE_VOSF
+	// Handle screen fault
+	extern bool Screen_fault_handler(sigsegv_address_t, sigsegv_address_t);
+	if (Screen_fault_handler(fault_address, fault_instruction))
+		return SIGSEGV_RETURN_SUCCESS;
+#endif
+
+#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
+	// Ignore writes to ROM
+	if (((uintptr)fault_address - (uintptr)ROMBaseHost) < ROMSize)
+		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
+
+	// Ignore all other faults, if requested
+	if (PrefsFindBool("ignoresegv"))
+		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
+#endif
+
+	return SIGSEGV_RETURN_FAILURE;
+}
+
+
+/*
+ *  Dump state when everything went wrong after a SEGV
+ */
+
+static void sigsegv_dump_state(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
+{
+	fprintf(stderr, "Caught SIGSEGV at address %p", fault_address);
+	if (fault_instruction != SIGSEGV_INVALID_PC)
+		fprintf(stderr, " [IP=%p]", fault_instruction);
+	fprintf(stderr, "\n");
+	uaecptr nextpc;
+	extern void m68k_dumpstate(uaecptr *nextpc);
+	m68k_dumpstate(&nextpc);
+#if USE_JIT && JIT_DEBUG
+	extern void compiler_dumpstate(void);
+	compiler_dumpstate();
+#endif
+	VideoQuitFullScreen();
+#ifdef ENABLE_MON
+	char *arg[4] = {"mon", "-m", "-r", NULL};
+	mon(3, arg);
+	QuitEmulator();
+#endif
+}
+
 
 /*
  *  Main program
@@ -116,8 +170,10 @@ static void usage(const char *prg_name)
 	printf("Usage: %s [OPTION...]\n", prg_name);
 	printf("\nUnix options:\n");
 	printf("  --help\n    display this usage message\n");
+	printf("  --config FILE\n    read/write configuration from/to FILE\n");
 	printf("  --break ADDRESS\n    set ROM breakpoint\n");
 	printf("  --rominfo\n    dump ROM information\n");
+	LoadPrefs(); // read the prefs file so PrefsPrintUsage() will print the correct default values
 	PrefsPrintUsage();
 	exit(0);
 }
@@ -134,9 +190,6 @@ int main(int argc, char **argv)
 	printf(GetString(STR_ABOUT_TEXT1), VERSION_MAJOR, VERSION_MINOR);
 	printf(" %s\n", GetString(STR_ABOUT_TEXT2));
 
-	// Read preferences
-	PrefsInit(argc, argv);
-
 	// Parse command line arguments
 	for (int i=1; i<argc; i++) {
 		if (strcmp(argv[i], "--help") == 0) {
@@ -147,6 +200,13 @@ int main(int argc, char **argv)
 			i++;
 			if (i < argc)
 				ROMBreakpoint = strtol(argv[i], NULL, 0);
+		} else if (strcmp(argv[i], "--config") == 0) {
+			argv[i++] = NULL;
+			if (i < argc) {
+				extern string UserPrefsPath; // from prefs_unix.cpp
+				UserPrefsPath = argv[i];
+				argv[i] = NULL;
+			}
 		} else if (strcmp(argv[i], "--rominfo") == 0) {
 			PrintROMInfo = true;
 		} else if (argv[i][0] == '-') {
@@ -155,6 +215,9 @@ int main(int argc, char **argv)
 		}
 	}
 
+	// Read preferences
+	PrefsInit(argc, argv);
+
 	// Init system routines
 	SysInit();
 
@@ -172,13 +235,23 @@ int main(int argc, char **argv)
 	return i;
 }
 
-#define QuitEmulator()	QuitEmuNoExit() ; return NO;
+#define QuitEmulator()	{ QuitEmuNoExit() ; return NO; }
 
 bool InitEmulator (void)
 {
 	char str[256];
 
 
+	// Install the handler for SIGSEGV
+	if (!sigsegv_install_handler(sigsegv_handler)) {
+		sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGSEGV", strerror(errno));
+		ErrorAlert(str);
+		QuitEmulator();
+	}
+
+	// Register dump state function when we got mad after a segfault
+	sigsegv_set_dump_state(sigsegv_dump_state);
+
 	// Read RAM size
 	RAMSize = PrefsFindInt32("ramsize") & 0xfff00000;	// Round down to 1MB boundary
 	if (RAMSize < 1024*1024) {
@@ -199,7 +272,7 @@ bool InitEmulator (void)
 	
 	// Under Solaris/SPARC and NetBSD/m68k, Basilisk II is known to crash
 	// when trying to map a too big chunk of memory starting at address 0
-#if defined(OS_solaris) || defined(OS_netbsd)
+#if defined(OS_solaris) || defined(OS_netbsd) || defined(PAGEZERO_HACK)
 	const bool can_map_all_memory = false;
 #else
 	const bool can_map_all_memory = true;
@@ -210,7 +283,8 @@ bool InitEmulator (void)
 		D(bug("Could allocate RAM and ROM from 0x0000\n"));
 		memory_mapped_from_zero = true;
 	}
-	
+
+#ifndef PAGEZERO_HACK
 	// Otherwise, just create the Low Memory area (0x0000..0x2000)
 	else if (vm_acquire_fixed(0, 0x2000) == 0) {
 		D(bug("Could allocate the Low Memory globals\n"));
@@ -224,6 +298,9 @@ bool InitEmulator (void)
 		QuitEmulator();
 	}
 #endif
+#else
+	*str = 0;		// Eliminate unused variable warning
+#endif /* REAL_ADDRESSING */
 
 	// Create areas for Mac RAM and ROM
 #if REAL_ADDRESSING
@@ -267,6 +344,8 @@ bool InitEmulator (void)
 	
 	// Get rom file path from preferences
 	const char *rom_path = PrefsFindString("rom");
+	if ( ! rom_path )
+		WarningAlert("No rom pathname set. Trying ./ROM");
 
 	// Load Mac ROM
 	int rom_fd = open(rom_path ? rom_path : ROM_FILE_NAME, O_RDONLY);
@@ -316,9 +395,6 @@ bool InitEmulator (void)
 
 void QuitEmuNoExit()
 {
-	extern	NSApplication *NSApp;
-
-
 	D(bug("QuitEmulator\n"));
 
 	// Exit 680x0 emulation
@@ -359,14 +435,18 @@ void QuitEmuNoExit()
 
 	// Exit preferences
 	PrefsExit();
-
-	// Stop run loop
-	[NSApp terminate: nil];
 }
 
 void QuitEmulator(void)
 {
+	extern	NSApplication *NSApp;
+
+
 	QuitEmuNoExit();
+
+	// Stop run loop?
+	[NSApp terminate: nil];
+
 	exit(0);
 }
 
@@ -378,6 +458,10 @@ void QuitEmulator(void)
 
 void FlushCodeCache(void *start, uint32 size)
 {
+#if USE_JIT
+    if (UseJIT)
+		flush_icache_range((uintptr)start, size);
+#endif
 }
 
 
@@ -406,8 +490,28 @@ static void sigint_handler(...)
 #ifdef HAVE_PTHREADS
 
 struct B2_mutex {
-	B2_mutex() { pthread_mutex_init(&m, NULL); }
-	~B2_mutex() { pthread_mutex_unlock(&m); pthread_mutex_destroy(&m); }
+	B2_mutex() {
+		pthread_mutexattr_t attr;
+		pthread_mutexattr_init(&attr);
+		// Initialize the mutex for priority inheritance --
+		// required for accurate timing.
+#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
+		pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
+#endif
+#if defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE) && defined(PTHREAD_MUTEX_NORMAL)
+		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
+#endif
+#ifdef HAVE_PTHREAD_MUTEXATTR_SETPSHARED
+		pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
+#endif
+		pthread_mutex_init(&m, &attr);
+		pthread_mutexattr_destroy(&attr);
+	}
+	~B2_mutex() {
+		pthread_mutex_trylock(&m);	// Make sure it's locked before
+		pthread_mutex_unlock(&m);	// unlocking it.
+		pthread_mutex_destroy(&m);
+	}
 	pthread_mutex_t m;
 };
 
@@ -490,9 +594,10 @@ void ErrorAlert(const char *text)
 	NSString *error  = [NSString stringWithCString: text];
 	NSString *button = [NSString stringWithCString: GetString(STR_QUIT_BUTTON) ];
 
-//	If we have a full screen mode, quit it here?
-
 	NSLog(error);
+	if ( PrefsFindBool("nogui") )
+		return;
+	VideoQuitFullScreen();
 	NSRunCriticalAlertPanel(title, error, button, nil, nil);
 }
 
@@ -509,6 +614,9 @@ void WarningAlert(const char *text)
 	NSString *button  = [NSString stringWithCString: GetString(STR_OK_BUTTON) ];
 
 	NSLog(warning);
+	if ( PrefsFindBool("nogui") )
+		return;
+	VideoQuitFullScreen();
 	NSRunAlertPanel(title, warning, button, nil, nil);
 }
 
@@ -525,6 +633,5 @@ bool ChoiceAlert(const char *text, const
 	NSString *yes	  = [NSString stringWithCString: pos];
 	NSString *no	  = [NSString stringWithCString: neg];
 
-	NSLog(warning);
 	return NSRunInformationalAlertPanel(title, warning, yes, no, nil);
 }