ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/Unix/main_unix.cpp

Comparing SheepShaver/src/Unix/main_unix.cpp (file contents):
Revision 1.13 by gbeauche, 2003-11-03T21:28:25Z vs.
Revision 1.48 by gbeauche, 2004-07-04T05:19:44Z

#	Line 1 | Line 1
1		/*
2		*  main_unix.cpp - Emulation core, Unix implementation
3		*
4	<	*  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 65 | Line 65
65		*  ExecutePPC (or any function that might cause a mode switch). The signal
66		*  stack is restored before exiting the SIGUSR2 handler.
67		*
68	+	*  There is apparently another problem when processing signals. In
69	+	*  fullscreen mode, we get quick updates of the mouse position. This
70	+	*  causes an increased number of calls to TriggerInterrupt(). And,
71	+	*  since IRQ_NEST is not fully handled atomically, nested calls to
72	+	*  ppc_interrupt() may cause stack corruption to eventually crash the
73	+	*  emulator.
74	+	*
75	+	*  FIXME:
76	+	*  The current solution is to allocate another signal stack when
77	+	*  processing ppc_interrupt(). However, it may be better to detect
78	+	*  the INTFLAG_ADB case and handle it specifically with some extra mutex?
79	+	*
80		*  TODO:
81		*    check if SIGSEGV handler works for all registers (including FP!)
82		*/
#	Line 109 | Line 121
121		#include "user_strings.h"
122		#include "vm_alloc.h"
123		#include "sigsegv.h"
124	+	#include "thunks.h"
125
126		#define DEBUG 0
127		#include "debug.h"
128
129
130	+	#ifdef HAVE_DIRENT_H
131	+	#include <dirent.h>
132	+	#endif
133	+
134	+	#ifdef USE_SDL
135	+	#include <SDL.h>
136	+	#endif
137	+
138	+	#ifndef USE_SDL_VIDEO
139		#include <X11/Xlib.h>
140	+	#endif
141
142		#ifdef ENABLE_GTK
143		#include <gtk/gtk.h>
#	Line 131 | Line 154
154		#endif
155
156
157	+	// Enable emulation of unaligned lmw/stmw?
158	+	#define EMULATE_UNALIGNED_LOADSTORE_MULTIPLE 1
159	+
160		// Enable Execute68k() safety checks?
161		#define SAFE_EXEC_68K 0
162
#	Line 140 | Line 166
166		// Interrupts in native mode?
167		#define INTERRUPTS_IN_NATIVE_MODE 1
168
169	+	// Number of alternate stacks for signal handlers?
170	+	#define SIG_STACK_COUNT 4
171	+
172
173		// Constants
174		const char ROM_FILE_NAME[] = "ROM";
175		const char ROM_FILE_NAME2[] = "Mac OS ROM";
176
177	<	const uint32 RAM_BASE = 0x20000000;                     // Base address of RAM
177	>	const uintptr RAM_BASE = 0x20000000;            // Base address of RAM
178		const uint32 SIG_STACK_SIZE = 0x10000;          // Size of signal stack
179
180
181		#if !EMULATED_PPC
153	–	// Structure in which registers are saved in a signal handler;
154	–	// sigcontext->regs points to it
155	–	// (see arch/ppc/kernel/signal.c)
156	–	typedef struct {
157	–	uint32 u[4];
158	–	} __attribute((aligned(16))) vector128;
159	–	#include <linux/elf.h>
160	–
182		struct sigregs {
183	<	elf_gregset_t   gp_regs;                                // Identical to pt_regs
184	<	double                  fp_regs[ELF_NFPREG];    // f0..f31 and fpsrc
185	<	//more (uninteresting) stuff following here
183	>	uint32 nip;
184	>	uint32 link;
185	>	uint32 ctr;
186	>	uint32 msr;
187	>	uint32 xer;
188	>	uint32 ccr;
189	>	uint32 gpr[32];
190	>	};
191	>
192	>	#if defined(__linux__)
193	>	#include <sys/ucontext.h>
194	>	#define MACHINE_REGISTERS(scp)  ((machine_regs *)(((ucontext_t *)scp)->uc_mcontext.regs))
195	>
196	>	struct machine_regs : public pt_regs
197	>	{
198	>	u_long & cr()                           { return pt_regs::ccr; }
199	>	uint32 cr() const                       { return pt_regs::ccr; }
200	>	uint32 lr() const                       { return pt_regs::link; }
201	>	uint32 ctr() const                      { return pt_regs::ctr; }
202	>	uint32 xer() const                      { return pt_regs::xer; }
203	>	uint32 msr() const                      { return pt_regs::msr; }
204	>	uint32 dar() const                      { return pt_regs::dar; }
205	>	u_long & pc()                           { return pt_regs::nip; }
206	>	uint32 pc() const                       { return pt_regs::nip; }
207	>	u_long & gpr(int i)                     { return pt_regs::gpr[i]; }
208	>	uint32 gpr(int i) const         { return pt_regs::gpr[i]; }
209	>	};
210	>	#endif
211	>
212	>	#if defined(__APPLE__) && defined(__MACH__)
213	>	#include <sys/signal.h>
214	>	extern "C" int sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss);
215	>
216	>	#include <sys/ucontext.h>
217	>	#define MACHINE_REGISTERS(scp)  ((machine_regs *)(((ucontext_t *)scp)->uc_mcontext))
218	>
219	>	struct machine_regs : public mcontext
220	>	{
221	>	uint32 & cr()                           { return ss.cr; }
222	>	uint32 cr() const                       { return ss.cr; }
223	>	uint32 lr() const                       { return ss.lr; }
224	>	uint32 ctr() const                      { return ss.ctr; }
225	>	uint32 xer() const                      { return ss.xer; }
226	>	uint32 msr() const                      { return ss.srr1; }
227	>	uint32 dar() const                      { return es.dar; }
228	>	uint32 & pc()                           { return ss.srr0; }
229	>	uint32 pc() const                       { return ss.srr0; }
230	>	uint32 & gpr(int i)                     { return (&ss.r0)[i]; }
231	>	uint32 gpr(int i) const         { return (&ss.r0)[i]; }
232		};
233		#endif
234
235	+	static void build_sigregs(sigregs *srp, machine_regs *mrp)
236	+	{
237	+	srp->nip = mrp->pc();
238	+	srp->link = mrp->lr();
239	+	srp->ctr = mrp->ctr();
240	+	srp->msr = mrp->msr();
241	+	srp->xer = mrp->xer();
242	+	srp->ccr = mrp->cr();
243	+	for (int i = 0; i < 32; i++)
244	+	srp->gpr[i] = mrp->gpr(i);
245	+	}
246	+
247	+	static struct sigaltstack sig_stacks[SIG_STACK_COUNT];  // Stacks for signal handlers
248	+	static int sig_stack_id = 0;                                                    // Stack slot currently used
249	+
250	+	static inline void sig_stack_acquire(void)
251	+	{
252	+	if (++sig_stack_id == SIG_STACK_COUNT) {
253	+	printf("FATAL: signal stack overflow\n");
254	+	return;
255	+	}
256	+	sigaltstack(&sig_stacks[sig_stack_id], NULL);
257	+	}
258	+
259	+	static inline void sig_stack_release(void)
260	+	{
261	+	if (--sig_stack_id < 0) {
262	+	printf("FATAL: signal stack underflow\n");
263	+	return;
264	+	}
265	+	sigaltstack(&sig_stacks[sig_stack_id], NULL);
266	+	}
267	+	#endif
268	+
269
270		// Global variables (exported)
271		#if !EMULATED_PPC
#	Line 172 | Line 273 | void *TOC;                             // Small data pointer (r13
273		#endif
274		uint32 RAMBase;                 // Base address of Mac RAM
275		uint32 RAMSize;                 // Size of Mac RAM
175	–	uint32 SheepStack1Base; // SheepShaver first alternate stack base
176	–	uint32 SheepStack2Base; // SheepShaver second alternate stack base
177	–	uint32 SheepThunksBase; // SheepShaver thunks base
276		uint32 KernelDataAddr;  // Address of Kernel Data
277		uint32 BootGlobsAddr;   // Address of BootGlobs structure at top of Mac RAM
278	+	uint32 DRCacheAddr;             // Address of DR Cache
279		uint32 PVR;                             // Theoretical PVR
280		int64 CPUClockSpeed;    // Processor clock speed (Hz)
281		int64 BusClockSpeed;    // Bus clock speed (Hz)
282	+	int64 TimebaseSpeed;    // Timebase clock speed (Hz)
283
284
285		// Global variables
286	+	#ifndef USE_SDL_VIDEO
287		char *x_display_name = NULL;                            // X11 display name
288		Display *x_display = NULL;                                      // X11 display handle
289	+	#ifdef X11_LOCK_TYPE
290	+	X11_LOCK_TYPE x_display_lock = X11_LOCK_INIT; // X11 display lock
291	+	#endif
292	+	#endif
293
294		static int zero_fd = 0;                                         // FD of /dev/zero
190	–	static bool sheep_area_mapped = false;          // Flag: SheepShaver data area mmap()ed
295		static bool lm_area_mapped = false;                     // Flag: Low Memory area mmap()ped
296		static int kernel_area = -1;                            // SHM ID of Kernel Data area
297		static bool rom_area_mapped = false;            // Flag: Mac ROM mmap()ped
298		static bool ram_area_mapped = false;            // Flag: Mac RAM mmap()ped
299	+	static bool dr_cache_area_mapped = false;       // Flag: Mac DR Cache mmap()ped
300	+	static bool dr_emulator_area_mapped = false;// Flag: Mac DR Emulator mmap()ped
301		static KernelData *kernel_data;                         // Pointer to Kernel Data
302		static EmulatorData *emulator_data;
303
304		static uint8 last_xpram[XPRAM_SIZE];            // Buffer for monitoring XPRAM changes
305
306		static bool nvram_thread_active = false;        // Flag: NVRAM watchdog installed
307	+	static volatile bool nvram_thread_cancel;       // Flag: Cancel NVRAM thread
308		static pthread_t nvram_thread;                          // NVRAM watchdog
309		static bool tick_thread_active = false;         // Flag: MacOS thread installed
310	+	static volatile bool tick_thread_cancel;        // Flag: Cancel 60Hz thread
311		static pthread_t tick_thread;                           // 60Hz thread
312		static pthread_t emul_thread;                           // MacOS thread
313
#	Line 207 | Line 315 | static bool ready_for_signals = false;
315		static int64 num_segv = 0;                                      // Number of handled SEGV signals
316
317		static struct sigaction sigusr2_action;         // Interrupt signal (of emulator thread)
318	<	#if !EMULATED_PPC
318	>	#if EMULATED_PPC
319	>	static uintptr sig_stack = 0;                           // Stack for PowerPC interrupt routine
320	>	#else
321		static struct sigaction sigsegv_action;         // Data access exception signal (of emulator thread)
322		static struct sigaction sigill_action;          // Illegal instruction signal (of emulator thread)
213	–	static void *sig_stack = NULL;                          // Stack for signal handlers
214	–	static void *extra_stack = NULL;                        // Stack for SIGSEGV inside interrupt handler
323		static bool emul_thread_fatal = false;          // Flag: MacOS thread crashed, tick thread shall dump debug output
324		static sigregs sigsegv_regs;                            // Register dump when crashed
325	+	static const char *crash_reason = NULL;         // Reason of the crash (SIGSEGV, SIGBUS, SIGILL)
326		#endif
327
328	+	uint32  SheepMem::page_size;                            // Size of a native page
329	+	uintptr SheepMem::zero_page = 0;                        // Address of ro page filled in with zeros
330	+	uintptr SheepMem::base = 0x60000000;            // Address of SheepShaver data
331	+	uintptr SheepMem::top = 0;                                      // Top of SheepShaver data (stack like storage)
332	+
333
334		// Prototypes
335		static void Quit(void);
#	Line 223 | Line 337 | static void *emul_func(void *arg);
337		static void *nvram_func(void *arg);
338		static void *tick_func(void *arg);
339		#if EMULATED_PPC
226	–	static void sigusr2_handler(int sig);
340		extern void emul_ppc(uint32 start);
341		extern void init_emul_ppc(void);
342		extern void exit_emul_ppc(void);
343	+	sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
344		#else
345	<	static void sigusr2_handler(int sig, sigcontext_struct *sc);
346	<	static void sigsegv_handler(int sig, sigcontext_struct *sc);
347	<	static void sigill_handler(int sig, sigcontext_struct *sc);
345	>	static void sigusr2_handler(int sig, siginfo_t *sip, void *scp);
346	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp);
347	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp);
348		#endif
349
350
#	Line 252 | Line 366 | extern void paranoia_check(void);
366
367		#if EMULATED_PPC
368		/*
369	+	*  Return signal stack base
370	+	*/
371	+
372	+	uintptr SignalStackBase(void)
373	+	{
374	+	return sig_stack + SIG_STACK_SIZE;
375	+	}
376	+
377	+
378	+	/*
379		*  Atomic operations
380		*/
381
#	Line 342 | Line 466 | int main(int argc, char **argv)
466		for (int i=1; i<argc; i++) {
467		if (strcmp(argv[i], "--help") == 0) {
468		usage(argv[0]);
469	+	#ifndef USE_SDL_VIDEO
470		} else if (strcmp(argv[i], "--display") == 0) {
471		i++;
472		if (i < argc)
473		x_display_name = strdup(argv[i]);
474	+	#endif
475		} else if (argv[i][0] == '-') {
476		fprintf(stderr, "Unrecognized option '%s'\n", argv[i]);
477		usage(argv[0]);
478		}
479		}
480
481	+	#ifdef USE_SDL
482	+	// Initialize SDL system
483	+	int sdl_flags = 0;
484	+	#ifdef USE_SDL_VIDEO
485	+	sdl_flags |= SDL_INIT_VIDEO;
486	+	#endif
487	+	assert(sdl_flags != 0);
488	+	if (SDL_Init(sdl_flags) == -1) {
489	+	char str[256];
490	+	sprintf(str, "Could not initialize SDL: %s.\n", SDL_GetError());
491	+	ErrorAlert(str);
492	+	goto quit;
493	+	}
494	+	atexit(SDL_Quit);
495	+	#endif
496	+
497	+	#ifndef USE_SDL_VIDEO
498		// Open display
499		x_display = XOpenDisplay(x_display_name);
500		if (x_display == NULL) {
#	Line 365 | Line 508 | int main(int argc, char **argv)
508		// Fork out, so we can return from fullscreen mode when things get ugly
509		XF86DGAForkApp(DefaultScreen(x_display));
510		#endif
511	+	#endif
512
513		#ifdef ENABLE_MON
514		// Initialize mon
515		mon_init();
516		#endif
517
518	+	#if !EMULATED_PPC
519	+	// Create and install stacks for signal handlers
520	+	for (int i = 0; i < SIG_STACK_COUNT; i++) {
521	+	void *sig_stack = malloc(SIG_STACK_SIZE);
522	+	D(bug("Signal stack %d at %p\n", i, sig_stack));
523	+	if (sig_stack == NULL) {
524	+	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
525	+	goto quit;
526	+	}
527	+	sig_stacks[i].ss_sp = sig_stack;
528	+	sig_stacks[i].ss_flags = 0;
529	+	sig_stacks[i].ss_size = SIG_STACK_SIZE;
530	+	}
531	+	sig_stack_id = 0;
532	+	if (sigaltstack(&sig_stacks[0], NULL) < 0) {
533	+	sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno));
534	+	ErrorAlert(str);
535	+	goto quit;
536	+	}
537	+	#endif
538	+
539	+	#if !EMULATED_PPC
540	+	// Install SIGSEGV and SIGBUS handlers
541	+	sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
542	+	sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
543	+	sigsegv_action.sa_sigaction = sigsegv_handler;
544	+	sigsegv_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
545	+	#ifdef HAVE_SIGNAL_SA_RESTORER
546	+	sigsegv_action.sa_restorer = NULL;
547	+	#endif
548	+	if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
549	+	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
550	+	ErrorAlert(str);
551	+	goto quit;
552	+	}
553	+	if (sigaction(SIGBUS, &sigsegv_action, NULL) < 0) {
554	+	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
555	+	ErrorAlert(str);
556	+	goto quit;
557	+	}
558	+	#else
559	+	// Install SIGSEGV handler for CPU emulator
560	+	if (!sigsegv_install_handler(sigsegv_handler)) {
561	+	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
562	+	ErrorAlert(str);
563	+	goto quit;
564	+	}
565	+	#endif
566	+
567	+	// Initialize VM system
568	+	vm_init();
569	+
570		// Get system info
571		PVR = 0x00040000;                       // Default: 604
572		CPUClockSpeed = 100000000;      // Default: 100MHz
573		BusClockSpeed = 100000000;      // Default: 100MHz
574	<	#if !EMULATED_PPC
574	>	TimebaseSpeed =  25000000;      // Default:  25MHz
575	>	#if EMULATED_PPC
576	>	PVR = 0x000c0000;                       // Default: 7400 (with AltiVec)
577	>	#elif defined(__APPLE__) && defined(__MACH__)
578	>	proc_file = popen("ioreg -c IOPlatformDevice", "r");
579	>	if (proc_file) {
580	>	char line[256];
581	>	bool powerpc_node = false;
582	>	while (fgets(line, sizeof(line) - 1, proc_file)) {
583	>	// Read line
584	>	int len = strlen(line);
585	>	if (len == 0)
586	>	continue;
587	>	line[len - 1] = 0;
588	>
589	>	// Parse line
590	>	if (strstr(line, "o PowerPC,"))
591	>	powerpc_node = true;
592	>	else if (powerpc_node) {
593	>	uint32 value;
594	>	char head[256];
595	>	if (sscanf(line, "%[ |]\"cpu-version\" = <%x>", head, &value) == 2)
596	>	PVR = value;
597	>	else if (sscanf(line, "%[ |]\"clock-frequency\" = <%x>", head, &value) == 2)
598	>	CPUClockSpeed = value;
599	>	else if (sscanf(line, "%[ |]\"bus-frequency\" = <%x>", head, &value) == 2)
600	>	BusClockSpeed = value;
601	>	else if (sscanf(line, "%[ |]\"timebase-frequency\" = <%x>", head, &value) == 2)
602	>	TimebaseSpeed = value;
603	>	else if (strchr(line, '}'))
604	>	powerpc_node = false;
605	>	}
606	>	}
607	>	fclose(proc_file);
608	>	} else {
609	>	sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
610	>	WarningAlert(str);
611	>	}
612	>	#else
613		proc_file = fopen("/proc/cpuinfo", "r");
614		if (proc_file) {
615		char line[256];
#	Line 389 | Line 623 | int main(int argc, char **argv)
623		// Parse line
624		int i;
625		char value[256];
626	<	if (sscanf(line, "cpu : %s", value) == 1) {
626	>	if (sscanf(line, "cpu : %[0-9A-Za-a]", value) == 1) {
627		if (strcmp(value, "601") == 0)
628		PVR = 0x00010000;
629		else if (strcmp(value, "603") == 0)
#	Line 406 | Line 640 | int main(int argc, char **argv)
640		PVR = 0x000a0000;
641		else if (strcmp(value, "750") == 0)
642		PVR = 0x00080000;
643	+	else if (strcmp(value, "750FX") == 0)
644	+	PVR = 0x70000000;
645		else if (strcmp(value, "821") == 0)
646		PVR = 0x00320000;
647		else if (strcmp(value, "860") == 0)
648		PVR = 0x00500000;
649	+	else if (strcmp(value, "7400") == 0)
650	+	PVR = 0x000c0000;
651	+	else if (strcmp(value, "7410") == 0)
652	+	PVR = 0x800c0000;
653	+	else if (strcmp(value, "7450") == 0)
654	+	PVR = 0x80000000;
655	+	else if (strcmp(value, "7455") == 0)
656	+	PVR = 0x80010000;
657	+	else if (strcmp(value, "7457") == 0)
658	+	PVR = 0x80020000;
659	+	else if (strcmp(value, "PPC970") == 0)
660	+	PVR = 0x00390000;
661		else
662		printf("WARNING: Unknown CPU type '%s', assuming 604\n", value);
663		}
#	Line 421 | Line 669 | int main(int argc, char **argv)
669		sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
670		WarningAlert(str);
671		}
672	+
673	+	// Get actual bus frequency
674	+	proc_file = fopen("/proc/device-tree/clock-frequency", "r");
675	+	if (proc_file) {
676	+	union { uint8 b[4]; uint32 l; } value;
677	+	if (fread(value.b, sizeof(value), 1, proc_file) == 1)
678	+	BusClockSpeed = value.l;
679	+	fclose(proc_file);
680	+	}
681	+
682	+	// Get actual timebase frequency
683	+	TimebaseSpeed = BusClockSpeed / 4;
684	+	DIR *cpus_dir;
685	+	if ((cpus_dir = opendir("/proc/device-tree/cpus")) != NULL) {
686	+	struct dirent *cpu_entry;
687	+	while ((cpu_entry = readdir(cpus_dir)) != NULL) {
688	+	if (strstr(cpu_entry->d_name, "PowerPC,") == cpu_entry->d_name) {
689	+	char timebase_freq_node[256];
690	+	sprintf(timebase_freq_node, "/proc/device-tree/cpus/%s/timebase-frequency", cpu_entry->d_name);
691	+	proc_file = fopen(timebase_freq_node, "r");
692	+	if (proc_file) {
693	+	union { uint8 b[4]; uint32 l; } value;
694	+	if (fread(value.b, sizeof(value), 1, proc_file) == 1)
695	+	TimebaseSpeed = value.l;
696	+	fclose(proc_file);
697	+	}
698	+	}
699	+	}
700	+	closedir(cpus_dir);
701	+	}
702		#endif
703		D(bug("PVR: %08x (assumed)\n", PVR));
704
#	Line 445 | Line 723 | int main(int argc, char **argv)
723		goto quit;
724		}
725
726	+	#ifndef PAGEZERO_HACK
727		// Create Low Memory area (0x0000..0x3000)
728		if (vm_acquire_fixed((char *)0, 0x3000) < 0) {
729		sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
#	Line 452 | Line 731 | int main(int argc, char **argv)
731		goto quit;
732		}
733		lm_area_mapped = true;
734	+	#endif
735
736		// Create areas for Kernel Data
737		kernel_area = shmget(IPC_PRIVATE, KERNEL_AREA_SIZE, 0600);
#	Line 470 | Line 750 | int main(int argc, char **argv)
750		ErrorAlert(str);
751		goto quit;
752		}
753	<	kernel_data = (KernelData *)0x68ffe000;
753	>	kernel_data = (KernelData *)KERNEL_DATA_BASE;
754		emulator_data = &kernel_data->ed;
755	<	KernelDataAddr = (uint32)kernel_data;
755	>	KernelDataAddr = KERNEL_DATA_BASE;
756		D(bug("Kernel Data at %p, Emulator Data at %p\n", kernel_data, emulator_data));
757
758	+	// Create area for DR Cache
759	+	if (vm_acquire_fixed((void *)DR_EMULATOR_BASE, DR_EMULATOR_SIZE) < 0) {
760	+	sprintf(str, GetString(STR_DR_EMULATOR_MMAP_ERR), strerror(errno));
761	+	ErrorAlert(str);
762	+	goto quit;
763	+	}
764	+	dr_emulator_area_mapped = true;
765	+	if (vm_acquire_fixed((void *)DR_CACHE_BASE, DR_CACHE_SIZE) < 0) {
766	+	sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno));
767	+	ErrorAlert(str);
768	+	goto quit;
769	+	}
770	+	dr_cache_area_mapped = true;
771	+	#if !EMULATED_PPC
772	+	if (vm_protect((char *)DR_CACHE_BASE, DR_CACHE_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
773	+	sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno));
774	+	ErrorAlert(str);
775	+	goto quit;
776	+	}
777	+	#endif
778	+	DRCacheAddr = DR_CACHE_BASE;
779	+	D(bug("DR Cache at %p\n", DRCacheAddr));
780	+
781		// Create area for SheepShaver data
782	<	if (vm_acquire_fixed((char *)SHEEP_BASE, SHEEP_SIZE) < 0) {
782	>	if (!SheepMem::Init()) {
783		sprintf(str, GetString(STR_SHEEP_MEM_MMAP_ERR), strerror(errno));
784		ErrorAlert(str);
785		goto quit;
786		}
484	–	SheepStack1Base = SHEEP_BASE + 0x10000;
485	–	SheepStack2Base = SheepStack1Base + 0x10000;
486	–	SheepThunksBase = SheepStack2Base + 0x1000;
487	–	sheep_area_mapped = true;
787
788		// Create area for Mac ROM
789		if (vm_acquire_fixed((char *)ROM_BASE, ROM_AREA_SIZE) < 0) {
#	Line 492 | Line 791 | int main(int argc, char **argv)
791		ErrorAlert(str);
792		goto quit;
793		}
794	<	#if !EMULATED_PPC || defined(__powerpc__)
794	>	#if !EMULATED_PPC
795		if (vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
796		sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
797		ErrorAlert(str);
#	Line 562 | Line 861 | int main(int argc, char **argv)
861		// Load NVRAM
862		XPRAMInit();
863
864	+	// Load XPRAM default values if signature not found
865	+	if (XPRAM[0x130c] != 0x4e || XPRAM[0x130d] != 0x75
866	+	|| XPRAM[0x130e] != 0x4d || XPRAM[0x130f] != 0x63) {
867	+	D(bug("Loading XPRAM default values\n"));
868	+	memset(XPRAM + 0x1300, 0, 0x100);
869	+	XPRAM[0x130c] = 0x4e;   // "NuMc" signature
870	+	XPRAM[0x130d] = 0x75;
871	+	XPRAM[0x130e] = 0x4d;
872	+	XPRAM[0x130f] = 0x63;
873	+	XPRAM[0x1301] = 0x80;   // InternalWaitFlags = DynWait (don't wait for SCSI devices upon bootup)
874	+	XPRAM[0x1310] = 0xa8;   // Standard PRAM values
875	+	XPRAM[0x1311] = 0x00;
876	+	XPRAM[0x1312] = 0x00;
877	+	XPRAM[0x1313] = 0x22;
878	+	XPRAM[0x1314] = 0xcc;
879	+	XPRAM[0x1315] = 0x0a;
880	+	XPRAM[0x1316] = 0xcc;
881	+	XPRAM[0x1317] = 0x0a;
882	+	XPRAM[0x131c] = 0x00;
883	+	XPRAM[0x131d] = 0x02;
884	+	XPRAM[0x131e] = 0x63;
885	+	XPRAM[0x131f] = 0x00;
886	+	XPRAM[0x1308] = 0x13;
887	+	XPRAM[0x1309] = 0x88;
888	+	XPRAM[0x130a] = 0x00;
889	+	XPRAM[0x130b] = 0xcc;
890	+	XPRAM[0x1376] = 0x00;   // OSDefault = MacOS
891	+	XPRAM[0x1377] = 0x01;
892	+	}
893	+
894		// Set boot volume
895		i16 = PrefsFindInt32("bootdrive");
896		XPRAM[0x1378] = i16 >> 8;
#	Line 579 | Line 908 | int main(int argc, char **argv)
908		boot_globs[1] = htonl(RAMSize);
909		boot_globs[2] = htonl((uint32)-1);                      // End of bank table
910
911	+	// Init thunks
912	+	if (!ThunksInit())
913	+	goto quit;
914	+
915		// Init drivers
916		SonyInit();
917		DiskInit();
#	Line 588 | Line 921 | int main(int argc, char **argv)
921		// Init external file system
922		ExtFSInit();
923
924	+	// Init ADB
925	+	ADBInit();
926	+
927		// Init audio
928		AudioInit();
929
#	Line 622 | Line 958 | int main(int argc, char **argv)
958		// Initialize Kernel Data
959		memset(kernel_data, 0, sizeof(KernelData));
960		if (ROMType == ROMTYPE_NEWWORLD) {
961	<	static uint32 of_dev_tree[4] = {0, 0, 0, 0};
962	<	static uint8 vector_lookup_tbl[128];
963	<	static uint8 vector_mask_tbl[64];
961	>	uintptr of_dev_tree = SheepMem::Reserve(4 * sizeof(uint32));
962	>	memset((void *)of_dev_tree, 0, 4 * sizeof(uint32));
963	>	uintptr vector_lookup_tbl = SheepMem::Reserve(128);
964	>	uintptr vector_mask_tbl = SheepMem::Reserve(64);
965		memset((uint8 *)kernel_data + 0xb80, 0x3d, 0x80);
966	<	memset(vector_lookup_tbl, 0, 128);
967	<	memset(vector_mask_tbl, 0, 64);
966	>	memset((void *)vector_lookup_tbl, 0, 128);
967	>	memset((void *)vector_mask_tbl, 0, 64);
968		kernel_data->v[0xb80 >> 2] = htonl(ROM_BASE);
969	<	kernel_data->v[0xb84 >> 2] = htonl((uint32)of_dev_tree);        // OF device tree base
970	<	kernel_data->v[0xb90 >> 2] = htonl((uint32)vector_lookup_tbl);
971	<	kernel_data->v[0xb94 >> 2] = htonl((uint32)vector_mask_tbl);
969	>	kernel_data->v[0xb84 >> 2] = htonl(of_dev_tree);                        // OF device tree base
970	>	kernel_data->v[0xb90 >> 2] = htonl(vector_lookup_tbl);
971	>	kernel_data->v[0xb94 >> 2] = htonl(vector_mask_tbl);
972		kernel_data->v[0xb98 >> 2] = htonl(ROM_BASE);                           // OpenPIC base
973		kernel_data->v[0xbb0 >> 2] = htonl(0);                                          // ADB base
974		kernel_data->v[0xc20 >> 2] = htonl(RAMSize);
#	Line 644 | Line 981 | int main(int argc, char **argv)
981		kernel_data->v[0xc50 >> 2] = htonl(RAMBase);
982		kernel_data->v[0xc54 >> 2] = htonl(RAMSize);
983		kernel_data->v[0xf60 >> 2] = htonl(PVR);
984	<	kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed);
985	<	kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed);
986	<	kernel_data->v[0xf6c >> 2] = htonl(CPUClockSpeed);
984	>	kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed);                      // clock-frequency
985	>	kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed);                      // bus-frequency
986	>	kernel_data->v[0xf6c >> 2] = htonl(TimebaseSpeed);                      // timebase-frequency
987		} else {
988		kernel_data->v[0xc80 >> 2] = htonl(RAMSize);
989		kernel_data->v[0xc84 >> 2] = htonl(RAMSize);
#	Line 658 | Line 995 | int main(int argc, char **argv)
995		kernel_data->v[0xcb0 >> 2] = htonl(RAMBase);
996		kernel_data->v[0xcb4 >> 2] = htonl(RAMSize);
997		kernel_data->v[0xf80 >> 2] = htonl(PVR);
998	<	kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed);
999	<	kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed);
1000	<	kernel_data->v[0xf8c >> 2] = htonl(CPUClockSpeed);
998	>	kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed);                      // clock-frequency
999	>	kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed);                      // bus-frequency
1000	>	kernel_data->v[0xf8c >> 2] = htonl(TimebaseSpeed);                      // timebase-frequency
1001		}
1002
1003		// Initialize extra low memory
1004		D(bug("Initializing Low Memory...\n"));
1005		memset(NULL, 0, 0x3000);
1006		WriteMacInt32(XLM_SIGNATURE, FOURCC('B','a','a','h'));                  // Signature to detect SheepShaver
1007	<	WriteMacInt32(XLM_KERNEL_DATA, (uint32)kernel_data);                    // For trap replacement routines
1007	>	WriteMacInt32(XLM_KERNEL_DATA, KernelDataAddr);                                 // For trap replacement routines
1008		WriteMacInt32(XLM_PVR, PVR);                                                                    // Theoretical PVR
1009		WriteMacInt32(XLM_BUS_CLOCK, BusClockSpeed);                                    // For DriverServicesLib patch
1010		WriteMacInt16(XLM_EXEC_RETURN_OPCODE, M68K_EXEC_RETURN);                // For Execute68k() (RTS from the executed 68k code will jump here and end 68k mode)
1011	<	#if EMULATED_PPC
1012	<	WriteMacInt32(XLM_ETHER_INIT, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_INIT));
1013	<	WriteMacInt32(XLM_ETHER_TERM, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_TERM));
677	<	WriteMacInt32(XLM_ETHER_OPEN, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_OPEN));
678	<	WriteMacInt32(XLM_ETHER_CLOSE, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_CLOSE));
679	<	WriteMacInt32(XLM_ETHER_WPUT, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_WPUT));
680	<	WriteMacInt32(XLM_ETHER_RSRV, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_RSRV));
681	<	WriteMacInt32(XLM_VIDEO_DOIO, POWERPC_NATIVE_OP_FUNC(NATIVE_VIDEO_DO_DRIVER_IO));
682	<	#else
683	<	WriteMacInt32(XLM_TOC, (uint32)TOC);                                                    // TOC pointer of emulator
684	<	WriteMacInt32(XLM_ETHER_INIT, (uint32)InitStreamModule);                // DLPI ethernet driver functions
685	<	WriteMacInt32(XLM_ETHER_TERM, (uint32)TerminateStreamModule);
686	<	WriteMacInt32(XLM_ETHER_OPEN, (uint32)ether_open);
687	<	WriteMacInt32(XLM_ETHER_CLOSE, (uint32)ether_close);
688	<	WriteMacInt32(XLM_ETHER_WPUT, (uint32)ether_wput);
689	<	WriteMacInt32(XLM_ETHER_RSRV, (uint32)ether_rsrv);
690	<	WriteMacInt32(XLM_VIDEO_DOIO, (uint32)VideoDoDriverIO);
1011	>	WriteMacInt32(XLM_ZERO_PAGE, SheepMem::ZeroPage());                             // Pointer to read-only page with all bits set to 0
1012	>	#if !EMULATED_PPC
1013	>	WriteMacInt32(XLM_TOC, (uint32)TOC);                                                            // TOC pointer of emulator
1014		#endif
1015	+	WriteMacInt32(XLM_ETHER_INIT, NativeFunction(NATIVE_ETHER_INIT));       // DLPI ethernet driver functions
1016	+	WriteMacInt32(XLM_ETHER_TERM, NativeFunction(NATIVE_ETHER_TERM));
1017	+	WriteMacInt32(XLM_ETHER_OPEN, NativeFunction(NATIVE_ETHER_OPEN));
1018	+	WriteMacInt32(XLM_ETHER_CLOSE, NativeFunction(NATIVE_ETHER_CLOSE));
1019	+	WriteMacInt32(XLM_ETHER_WPUT, NativeFunction(NATIVE_ETHER_WPUT));
1020	+	WriteMacInt32(XLM_ETHER_RSRV, NativeFunction(NATIVE_ETHER_RSRV));
1021	+	WriteMacInt32(XLM_VIDEO_DOIO, NativeFunction(NATIVE_VIDEO_DO_DRIVER_IO));
1022		D(bug("Low Memory initialized\n"));
1023
1024		// Start 60Hz thread
1025	+	tick_thread_cancel = false;
1026		tick_thread_active = (pthread_create(&tick_thread, NULL, tick_func, NULL) == 0);
1027		D(bug("Tick thread installed (%ld)\n", tick_thread));
1028
1029		// Start NVRAM watchdog thread
1030		memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1031	+	nvram_thread_cancel = false;
1032		nvram_thread_active = (pthread_create(&nvram_thread, NULL, nvram_func, NULL) == 0);
1033		D(bug("NVRAM thread installed (%ld)\n", nvram_thread));
1034
1035		#if !EMULATED_PPC
704	–	// Create and install stacks for signal handlers
705	–	sig_stack = malloc(SIG_STACK_SIZE);
706	–	D(bug("Signal stack at %p\n", sig_stack));
707	–	if (sig_stack == NULL) {
708	–	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
709	–	goto quit;
710	–	}
711	–	extra_stack = malloc(SIG_STACK_SIZE);
712	–	D(bug("Extra stack at %p\n", extra_stack));
713	–	if (extra_stack == NULL) {
714	–	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
715	–	goto quit;
716	–	}
717	–	struct sigaltstack new_stack;
718	–	new_stack.ss_sp = sig_stack;
719	–	new_stack.ss_flags = 0;
720	–	new_stack.ss_size = SIG_STACK_SIZE;
721	–	if (sigaltstack(&new_stack, NULL) < 0) {
722	–	sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno));
723	–	ErrorAlert(str);
724	–	goto quit;
725	–	}
726	–	#endif
727	–
728	–	#if !EMULATED_PPC
729	–	// Install SIGSEGV handler
730	–	sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
731	–	sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
732	–	sigsegv_action.sa_handler = (__sighandler_t)sigsegv_handler;
733	–	sigsegv_action.sa_flags = SA_ONSTACK;
734	–	sigsegv_action.sa_restorer = NULL;
735	–	if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
736	–	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
737	–	ErrorAlert(str);
738	–	goto quit;
739	–	}
740	–
1036		// Install SIGILL handler
1037		sigemptyset(&sigill_action.sa_mask);    // Block interrupts during ILL handling
1038		sigaddset(&sigill_action.sa_mask, SIGUSR2);
1039	<	sigill_action.sa_handler = (__sighandler_t)sigill_handler;
1040	<	sigill_action.sa_flags = SA_ONSTACK;
1039	>	sigill_action.sa_sigaction = sigill_handler;
1040	>	sigill_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
1041	>	#ifdef HAVE_SIGNAL_SA_RESTORER
1042		sigill_action.sa_restorer = NULL;
1043	+	#endif
1044		if (sigaction(SIGILL, &sigill_action, NULL) < 0) {
1045		sprintf(str, GetString(STR_SIGILL_INSTALL_ERR), strerror(errno));
1046		ErrorAlert(str);
#	Line 751 | Line 1048 | int main(int argc, char **argv)
1048		}
1049		#endif
1050
1051	+	#if !EMULATED_PPC
1052		// Install interrupt signal handler
1053		sigemptyset(&sigusr2_action.sa_mask);
1054	<	sigusr2_action.sa_handler = (__sighandler_t)sigusr2_handler;
1055	<	sigusr2_action.sa_flags = 0;
1056	<	#if !EMULATED_PPC
759	<	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART;
760	<	#endif
1054	>	sigusr2_action.sa_sigaction = sigusr2_handler;
1055	>	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO;
1056	>	#ifdef HAVE_SIGNAL_SA_RESTORER
1057		sigusr2_action.sa_restorer = NULL;
1058	+	#endif
1059		if (sigaction(SIGUSR2, &sigusr2_action, NULL) < 0) {
1060		sprintf(str, GetString(STR_SIGUSR2_INSTALL_ERR), strerror(errno));
1061		ErrorAlert(str);
1062		goto quit;
1063		}
1064	+	#endif
1065
1066		// Get my thread ID and execute MacOS thread function
1067		emul_thread = pthread_self();
#	Line 789 | Line 1087 | static void Quit(void)
1087
1088		// Stop 60Hz thread
1089		if (tick_thread_active) {
1090	+	tick_thread_cancel = true;
1091		pthread_cancel(tick_thread);
1092		pthread_join(tick_thread, NULL);
1093		}
1094
1095		// Stop NVRAM watchdog thread
1096		if (nvram_thread_active) {
1097	+	nvram_thread_cancel = true;
1098		pthread_cancel(nvram_thread);
1099		pthread_join(nvram_thread, NULL);
1100		}
1101
1102		#if !EMULATED_PPC
1103	<	// Uninstall SIGSEGV handler
1103	>	// Uninstall SIGSEGV and SIGBUS handlers
1104		sigemptyset(&sigsegv_action.sa_mask);
1105		sigsegv_action.sa_handler = SIG_DFL;
1106		sigsegv_action.sa_flags = 0;
1107		sigaction(SIGSEGV, &sigsegv_action, NULL);
1108	+	sigaction(SIGBUS, &sigsegv_action, NULL);
1109
1110		// Uninstall SIGILL handler
1111		sigemptyset(&sigill_action.sa_mask);
1112		sigill_action.sa_handler = SIG_DFL;
1113		sigill_action.sa_flags = 0;
1114		sigaction(SIGILL, &sigill_action, NULL);
1115	+
1116	+	// Delete stacks for signal handlers
1117	+	for (int i = 0; i < SIG_STACK_COUNT; i++) {
1118	+	void *sig_stack = sig_stacks[i].ss_sp;
1119	+	if (sig_stack)
1120	+	free(sig_stack);
1121	+	}
1122		#endif
1123
1124		// Save NVRAM
#	Line 831 | Line 1139 | static void Quit(void)
1139		// Exit audio
1140		AudioExit();
1141
1142	+	// Exit ADB
1143	+	ADBExit();
1144	+
1145		// Exit video
1146		VideoExit();
1147
#	Line 843 | Line 1154 | static void Quit(void)
1154		DiskExit();
1155		SonyExit();
1156
1157	+	// Delete thunks
1158	+	ThunksExit();
1159	+
1160	+	// Delete SheepShaver globals
1161	+	SheepMem::Exit();
1162	+
1163		// Delete RAM area
1164		if (ram_area_mapped)
1165		vm_release((char *)RAM_BASE, RAMSize);
#	Line 851 | Line 1168 | static void Quit(void)
1168		if (rom_area_mapped)
1169		vm_release((char *)ROM_BASE, ROM_AREA_SIZE);
1170
1171	+	// Delete DR cache areas
1172	+	if (dr_emulator_area_mapped)
1173	+	vm_release((void *)DR_EMULATOR_BASE, DR_EMULATOR_SIZE);
1174	+	if (dr_cache_area_mapped)
1175	+	vm_release((void *)DR_CACHE_BASE, DR_CACHE_SIZE);
1176	+
1177		// Delete Kernel Data area
1178		if (kernel_area >= 0) {
1179		shmdt((void *)KERNEL_DATA_BASE);
#	Line 878 | Line 1201 | static void Quit(void)
1201		#endif
1202
1203		// Close X11 server connection
1204	+	#ifndef USE_SDL_VIDEO
1205		if (x_display)
1206		XCloseDisplay(x_display);
1207	+	#endif
1208
1209		exit(0);
1210		}
#	Line 954 | Line 1279 | void Execute68kTrap(uint16 trap, M68kReg
1279		uint16 proc[2] = {trap, M68K_RTS};
1280		Execute68k((uint32)proc, r);
1281		}
957	–
958	–
959	–	/*
960	–	*  Execute PPC code from EMUL_OP routine (real mode switch)
961	–	*/
962	–
963	–	void ExecutePPC(void (*func)())
964	–	{
965	–	uint32 tvect[2] = {(uint32)func, 0};    // Fake TVECT
966	–	RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
967	–	M68kRegisters r;
968	–	Execute68k((uint32)&desc, &r);
969	–	}
1282		#endif
1283
1284
#	Line 1045 | Line 1357 | void MakeExecutable(int dummy, void *sta
1357
1358		void PatchAfterStartup(void)
1359		{
1048	–	#if EMULATED_PPC
1360		ExecuteNative(NATIVE_VIDEO_INSTALL_ACCEL);
1050	–	#else
1051	–	ExecutePPC(VideoInstallAccel);
1052	–	#endif
1361		InstallExtFS();
1362		}
1363
#	Line 1058 | Line 1366 | void PatchAfterStartup(void)
1366		*  NVRAM watchdog thread (saves NVRAM every minute)
1367		*/
1368
1369	<	static void *nvram_func(void *arg)
1369	>	static void nvram_watchdog(void)
1370		{
1371	<	struct timespec req = {60, 0};  // 1 minute
1371	>	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
1372	>	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1373	>	SaveXPRAM();
1374	>	}
1375	>	}
1376
1377	<	for (;;) {
1378	<	pthread_testcancel();
1379	<	nanosleep(&req, NULL);
1380	<	pthread_testcancel();
1381	<	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
1382	<	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1071	<	SaveXPRAM();
1072	<	}
1377	>	static void *nvram_func(void *arg)
1378	>	{
1379	>	while (!nvram_thread_cancel) {
1380	>	for (int i=0; i<60 && !nvram_thread_cancel; i++)
1381	>	Delay_usec(999999);             // Only wait 1 second so we quit promptly when nvram_thread_cancel becomes true
1382	>	nvram_watchdog();
1383		}
1384		return NULL;
1385		}
#	Line 1082 | Line 1392 | static void *nvram_func(void *arg)
1392		static void *tick_func(void *arg)
1393		{
1394		int tick_counter = 0;
1395	<	struct timespec req = {0, 16625000};
1395	>	uint64 start = GetTicks_usec();
1396	>	int64 ticks = 0;
1397	>	uint64 next = GetTicks_usec();
1398
1399	<	for (;;) {
1399	>	while (!tick_thread_cancel) {
1400
1401		// Wait
1402	<	nanosleep(&req, NULL);
1402	>	next += 16625;
1403	>	int64 delay = next - GetTicks_usec();
1404	>	if (delay > 0)
1405	>	Delay_usec(delay);
1406	>	else if (delay < -16625)
1407	>	next = GetTicks_usec();
1408	>	ticks++;
1409
1410		#if !EMULATED_PPC
1411		// Did we crash?
1412		if (emul_thread_fatal) {
1413
1414		// Yes, dump registers
1415	<	pt_regs *r = (pt_regs *)&sigsegv_regs;
1415	>	sigregs *r = &sigsegv_regs;
1416		char str[256];
1417	<	sprintf(str, "SIGSEGV\n"
1417	>	if (crash_reason == NULL)
1418	>	crash_reason = "SIGSEGV";
1419	>	sprintf(str, "%s\n"
1420		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1421		"  xer %08lx     cr %08lx  \n"
1422		"   r0 %08lx     r1 %08lx     r2 %08lx     r3 %08lx\n"
#	Line 1107 | Line 1427 | static void *tick_func(void *arg)
1427		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1428		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1429		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1430	+	crash_reason,
1431		r->nip, r->link, r->ctr, r->msr,
1432		r->xer, r->ccr,
1433		r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
#	Line 1142 | Line 1463 | static void *tick_func(void *arg)
1463		TriggerInterrupt();
1464		}
1465		}
1466	+
1467	+	uint64 end = GetTicks_usec();
1468	+	D(bug("%Ld ticks in %Ld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1469		return NULL;
1470		}
1471
#	Line 1152 | Line 1476 | static void *tick_func(void *arg)
1476
1477		void Set_pthread_attr(pthread_attr_t *attr, int priority)
1478		{
1479	<	// nothing to do
1479	>	#ifdef HAVE_PTHREADS
1480	>	pthread_attr_init(attr);
1481	>	#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
1482	>	// Some of these only work for superuser
1483	>	if (geteuid() == 0) {
1484	>	pthread_attr_setinheritsched(attr, PTHREAD_EXPLICIT_SCHED);
1485	>	pthread_attr_setschedpolicy(attr, SCHED_FIFO);
1486	>	struct sched_param fifo_param;
1487	>	fifo_param.sched_priority = ((sched_get_priority_min(SCHED_FIFO) +
1488	>	sched_get_priority_max(SCHED_FIFO)) / 2 +
1489	>	priority);
1490	>	pthread_attr_setschedparam(attr, &fifo_param);
1491	>	}
1492	>	if (pthread_attr_setscope(attr, PTHREAD_SCOPE_SYSTEM) != 0) {
1493	>	#ifdef PTHREAD_SCOPE_BOUND_NP
1494	>	// If system scope is not available (eg. we're not running
1495	>	// with CAP_SCHED_MGT capability on an SGI box), try bound
1496	>	// scope.  It exposes pthread scheduling to the kernel,
1497	>	// without setting realtime priority.
1498	>	pthread_attr_setscope(attr, PTHREAD_SCOPE_BOUND_NP);
1499	>	#endif
1500	>	}
1501	>	#endif
1502	>	#endif
1503		}
1504
1505
#	Line 1239 | Line 1586 | void B2_delete_mutex(B2_mutex *mutex)
1586		*  Trigger signal USR2 from another thread
1587		*/
1588
1589	<	#if !EMULATED_PPC || ASYNC_IRQ
1589	>	#if !EMULATED_PPC
1590		void TriggerInterrupt(void)
1591		{
1592		if (ready_for_signals)
#	Line 1271 | Line 1618 | void ClearInterruptFlag(uint32 flag)
1618
1619		void DisableInterrupt(void)
1620		{
1621	+	#if EMULATED_PPC
1622	+	WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) + 1);
1623	+	#else
1624		atomic_add((int *)XLM_IRQ_NEST, 1);
1625	+	#endif
1626		}
1627
1628
#	Line 1281 | Line 1632 | void DisableInterrupt(void)
1632
1633		void EnableInterrupt(void)
1634		{
1635	+	#if EMULATED_PPC
1636	+	WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) - 1);
1637	+	#else
1638		atomic_add((int *)XLM_IRQ_NEST, -1);
1639	+	#endif
1640		}
1641
1642
#	Line 1289 | Line 1644 | void EnableInterrupt(void)
1644		*  USR2 handler
1645		*/
1646
1647	<	#if EMULATED_PPC
1648	<	static void sigusr2_handler(int sig)
1647	>	#if !EMULATED_PPC
1648	>	static void sigusr2_handler(int sig, siginfo_t *sip, void *scp)
1649		{
1650	<	#if ASYNC_IRQ
1651	<	extern void HandleInterrupt(void);
1652	<	HandleInterrupt();
1650	>	machine_regs *r = MACHINE_REGISTERS(scp);
1651	>
1652	>	#ifdef USE_SDL_VIDEO
1653	>	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
1654	>	SDL_PumpEvents();
1655		#endif
1299	–	}
1300	–	#else
1301	–	static void sigusr2_handler(int sig, sigcontext_struct *sc)
1302	–	{
1303	–	pt_regs *r = sc->regs;
1656
1657		// Do nothing if interrupts are disabled
1658		if (*(int32 *)XLM_IRQ_NEST > 0)
#	Line 1314 | Line 1666 | static void sigusr2_handler(int sig, sig
1666		case MODE_68K:
1667		// 68k emulator active, trigger 68k interrupt level 1
1668		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1669	<	r->ccr |= ntohl(kernel_data->v[0x674 >> 2]);
1669	>	r->cr() |= ntohl(kernel_data->v[0x674 >> 2]);
1670		break;
1671
1672		#if INTERRUPTS_IN_NATIVE_MODE
1673		case MODE_NATIVE:
1674		// 68k emulator inactive, in nanokernel?
1675	<	if (r->gpr[1] != KernelDataAddr) {
1675	>	if (r->gpr(1) != KernelDataAddr) {
1676	>
1677	>	// Set extra stack for nested interrupts
1678	>	sig_stack_acquire();
1679	>
1680		// Prepare for 68k interrupt level 1
1681		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1682		WriteMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc, ReadMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc) | ntohl(kernel_data->v[0x674 >> 2]));
1683
1684		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
1685	<	atomic_add((int32 *)XLM_IRQ_NEST, 1);
1685	>	DisableInterrupt();
1686		if (ROMType == ROMTYPE_NEWWORLD)
1687		ppc_interrupt(ROM_BASE + 0x312b1c, KernelDataAddr);
1688		else
1689		ppc_interrupt(ROM_BASE + 0x312a3c, KernelDataAddr);
1690	+
1691	+	// Reset normal signal stack
1692	+	sig_stack_release();
1693		}
1694		break;
1695		#endif
#	Line 1341 | Line 1700 | static void sigusr2_handler(int sig, sig
1700		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1701
1702		// Set extra stack for SIGSEGV handler
1703	<	struct sigaltstack new_stack;
1345	<	new_stack.ss_sp = extra_stack;
1346	<	new_stack.ss_flags = 0;
1347	<	new_stack.ss_size = SIG_STACK_SIZE;
1348	<	sigaltstack(&new_stack, NULL);
1703	>	sig_stack_acquire();
1704		#if 1
1705		// Execute full 68k interrupt routine
1706		M68kRegisters r;
#	Line 1367 | Line 1722 | static void sigusr2_handler(int sig, sig
1722		if (InterruptFlags & INTFLAG_VIA) {
1723		ClearInterruptFlag(INTFLAG_VIA);
1724		ADBInterrupt();
1725	<	ExecutePPC(VideoVBL);
1725	>	ExecuteNative(NATIVE_VIDEO_VBL);
1726		}
1727		}
1728		#endif
1729		// Reset normal signal stack
1730	<	new_stack.ss_sp = sig_stack;
1376	<	new_stack.ss_flags = 0;
1377	<	new_stack.ss_size = SIG_STACK_SIZE;
1378	<	sigaltstack(&new_stack, NULL);
1730	>	sig_stack_release();
1731		}
1732		break;
1733		#endif
#	Line 1389 | Line 1741 | static void sigusr2_handler(int sig, sig
1741		*/
1742
1743		#if !EMULATED_PPC
1744	<	static void sigsegv_handler(int sig, sigcontext_struct *sc)
1744	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp)
1745		{
1746	<	pt_regs *r = sc->regs;
1746	>	machine_regs *r = MACHINE_REGISTERS(scp);
1747
1748		// Get effective address
1749	<	uint32 addr = r->dar;
1749	>	uint32 addr = r->dar();
1750
1751		#if ENABLE_VOSF
1752		// Handle screen fault.
1753		extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
1754	<	if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->nip))
1754	>	if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->pc()))
1755		return;
1756		#endif
1757
1758		num_segv++;
1759
1760	<	// Fault in Mac ROM or RAM?
1761	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1760	>	// Fault in Mac ROM or RAM or DR Cache?
1761	>	bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize)) || (r->pc() >= DR_CACHE_BASE && r->pc() < (DR_CACHE_BASE + DR_CACHE_SIZE));
1762		if (mac_fault) {
1763
1764		// "VM settings" during MacOS 8 installation
1765	<	if (r->nip == ROM_BASE + 0x488160 && r->gpr[20] == 0xf8000000) {
1766	<	r->nip += 4;
1767	<	r->gpr[8] = 0;
1765	>	if (r->pc() == ROM_BASE + 0x488160 && r->gpr(20) == 0xf8000000) {
1766	>	r->pc() += 4;
1767	>	r->gpr(8) = 0;
1768		return;
1769
1770		// MacOS 8.5 installation
1771	<	} else if (r->nip == ROM_BASE + 0x488140 && r->gpr[16] == 0xf8000000) {
1772	<	r->nip += 4;
1773	<	r->gpr[8] = 0;
1771	>	} else if (r->pc() == ROM_BASE + 0x488140 && r->gpr(16) == 0xf8000000) {
1772	>	r->pc() += 4;
1773	>	r->gpr(8) = 0;
1774		return;
1775
1776		// MacOS 8 serial drivers on startup
1777	<	} else if (r->nip == ROM_BASE + 0x48e080 && (r->gpr[8] == 0xf3012002 || r->gpr[8] == 0xf3012000)) {
1778	<	r->nip += 4;
1779	<	r->gpr[8] = 0;
1777	>	} else if (r->pc() == ROM_BASE + 0x48e080 && (r->gpr(8) == 0xf3012002 || r->gpr(8) == 0xf3012000)) {
1778	>	r->pc() += 4;
1779	>	r->gpr(8) = 0;
1780		return;
1781
1782		// MacOS 8.1 serial drivers on startup
1783	<	} else if (r->nip == ROM_BASE + 0x48c5e0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1784	<	r->nip += 4;
1783	>	} else if (r->pc() == ROM_BASE + 0x48c5e0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1784	>	r->pc() += 4;
1785		return;
1786	<	} else if (r->nip == ROM_BASE + 0x4a10a0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1787	<	r->nip += 4;
1786	>	} else if (r->pc() == ROM_BASE + 0x4a10a0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1787	>	r->pc() += 4;
1788	>	return;
1789	>
1790	>	// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
1791	>	} else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(16) == 0xf3012002 || r->gpr(16) == 0xf3012000)) {
1792	>	r->pc() += 4;
1793	>	return;
1794	>	} else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1795	>	r->pc() += 4;
1796		return;
1797		}
1798
1799		// Get opcode and divide into fields
1800	<	uint32 opcode = *((uint32 *)r->nip);
1800	>	uint32 opcode = *((uint32 *)r->pc());
1801		uint32 primop = opcode >> 26;
1802		uint32 exop = (opcode >> 1) & 0x3ff;
1803		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1526 | Line 1886 | static void sigsegv_handler(int sig, sig
1886		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_NORM; break;
1887		case 45:        // sthu
1888		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_U; break;
1889	+	#if EMULATE_UNALIGNED_LOADSTORE_MULTIPLE
1890	+	case 46:        // lmw
1891	+	if ((addr % 4) != 0) {
1892	+	uint32 ea = addr;
1893	+	D(bug("WARNING: unaligned lmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1894	+	for (int i = rd; i <= 31; i++) {
1895	+	r->gpr(i) = ReadMacInt32(ea);
1896	+	ea += 4;
1897	+	}
1898	+	r->pc() += 4;
1899	+	goto rti;
1900	+	}
1901	+	break;
1902	+	case 47:        // stmw
1903	+	if ((addr % 4) != 0) {
1904	+	uint32 ea = addr;
1905	+	D(bug("WARNING: unaligned stmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1906	+	for (int i = rd; i <= 31; i++) {
1907	+	WriteMacInt32(ea, r->gpr(i));
1908	+	ea += 4;
1909	+	}
1910	+	r->pc() += 4;
1911	+	goto rti;
1912	+	}
1913	+	break;
1914	+	#endif
1915		}
1916
1917	<	// Ignore ROM writes
1918	<	if (transfer_type == TYPE_STORE && addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) {
1919	<	//                      D(bug("WARNING: %s write access to ROM at %08lx, pc %08lx\n", transfer_size == SIZE_BYTE ? "Byte" : transfer_size == SIZE_HALFWORD ? "Halfword" : "Word", addr, r->nip));
1917	>	// Ignore ROM writes (including to the zero page, which is read-only)
1918	>	if (transfer_type == TYPE_STORE &&
1919	>	((addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) ||
1920	>	(addr >= SheepMem::ZeroPage() && addr < SheepMem::ZeroPage() + SheepMem::PageSize()))) {
1921	>	//                      D(bug("WARNING: %s write access to ROM at %08lx, pc %08lx\n", transfer_size == SIZE_BYTE ? "Byte" : transfer_size == SIZE_HALFWORD ? "Halfword" : "Word", addr, r->pc()));
1922		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1923	<	r->gpr[ra] = addr;
1924	<	r->nip += 4;
1923	>	r->gpr(ra) = addr;
1924	>	r->pc() += 4;
1925		goto rti;
1926		}
1927
1928		// Ignore illegal memory accesses?
1929		if (PrefsFindBool("ignoresegv")) {
1930		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1931	<	r->gpr[ra] = addr;
1931	>	r->gpr(ra) = addr;
1932		if (transfer_type == TYPE_LOAD)
1933	<	r->gpr[rd] = 0;
1934	<	r->nip += 4;
1933	>	r->gpr(rd) = 0;
1934	>	r->pc() += 4;
1935		goto rti;
1936		}
1937
#	Line 1551 | Line 1939 | static void sigsegv_handler(int sig, sig
1939		if (!PrefsFindBool("nogui")) {
1940		char str[256];
1941		if (transfer_type == TYPE_LOAD || transfer_type == TYPE_STORE)
1942	<	sprintf(str, GetString(STR_MEM_ACCESS_ERR), transfer_size == SIZE_BYTE ? "byte" : transfer_size == SIZE_HALFWORD ? "halfword" : "word", transfer_type == TYPE_LOAD ? GetString(STR_MEM_ACCESS_READ) : GetString(STR_MEM_ACCESS_WRITE), addr, r->nip, r->gpr[24], r->gpr[1]);
1942	>	sprintf(str, GetString(STR_MEM_ACCESS_ERR), transfer_size == SIZE_BYTE ? "byte" : transfer_size == SIZE_HALFWORD ? "halfword" : "word", transfer_type == TYPE_LOAD ? GetString(STR_MEM_ACCESS_READ) : GetString(STR_MEM_ACCESS_WRITE), addr, r->pc(), r->gpr(24), r->gpr(1));
1943		else
1944	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
1944	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
1945		ErrorAlert(str);
1946		QuitEmulator();
1947		return;
#	Line 1561 | Line 1949 | static void sigsegv_handler(int sig, sig
1949		}
1950
1951		// For all other errors, jump into debugger (sort of...)
1952	+	crash_reason = (sig == SIGBUS) ? "SIGBUS" : "SIGSEGV";
1953		if (!ready_for_signals) {
1954	<	printf("SIGSEGV\n");
1955	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
1954	>	printf("%s\n");
1955	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
1956		printf(
1957		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1958		"  xer %08lx     cr %08lx  \n"
#	Line 1575 | Line 1964 | static void sigsegv_handler(int sig, sig
1964		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1965		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1966		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1967	<	r->nip, r->link, r->ctr, r->msr,
1968	<	r->xer, r->ccr,
1969	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
1970	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
1971	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
1972	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
1973	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
1974	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
1975	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
1976	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
1967	>	crash_reason,
1968	>	r->pc(), r->lr(), r->ctr(), r->msr(),
1969	>	r->xer(), r->cr(),
1970	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
1971	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
1972	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
1973	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
1974	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
1975	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
1976	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
1977	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
1978		exit(1);
1979		QuitEmulator();
1980		return;
1981		} else {
1982		// We crashed. Save registers, tell tick thread and loop forever
1983	<	sigsegv_regs = *(sigregs *)r;
1983	>	build_sigregs(&sigsegv_regs, r);
1984		emul_thread_fatal = true;
1985		for (;;) ;
1986		}
#	Line 1602 | Line 1992 | rti:;
1992		*  SIGILL handler
1993		*/
1994
1995	<	static void sigill_handler(int sig, sigcontext_struct *sc)
1995	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp)
1996		{
1997	<	pt_regs *r = sc->regs;
1997	>	machine_regs *r = MACHINE_REGISTERS(scp);
1998		char str[256];
1999
2000		// Fault in Mac ROM or RAM?
2001	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
2001	>	bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize));
2002		if (mac_fault) {
2003
2004		// Get opcode and divide into fields
2005	<	uint32 opcode = *((uint32 *)r->nip);
2005	>	uint32 opcode = *((uint32 *)r->pc());
2006		uint32 primop = opcode >> 26;
2007		uint32 exop = (opcode >> 1) & 0x3ff;
2008		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1623 | Line 2013 | static void sigill_handler(int sig, sigc
2013		switch (primop) {
2014		case 9:         // POWER instructions
2015		case 22:
2016	<	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->nip, r->gpr[1], opcode);
2016	>	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->pc(), r->gpr(1), opcode);
2017		ErrorAlert(str);
2018		QuitEmulator();
2019		return;
#	Line 1631 | Line 2021 | power_inst:            sprintf(str, GetString(STR_
2021		case 31:
2022		switch (exop) {
2023		case 83:        // mfmsr
2024	<	r->gpr[rd] = 0xf072;
2025	<	r->nip += 4;
2024	>	r->gpr(rd) = 0xf072;
2025	>	r->pc() += 4;
2026		goto rti;
2027
2028		case 210:       // mtsr
2029		case 242:       // mtsrin
2030		case 306:       // tlbie
2031	<	r->nip += 4;
2031	>	r->pc() += 4;
2032		goto rti;
2033
2034		case 339: {     // mfspr
#	Line 1654 | Line 2044 | power_inst:            sprintf(str, GetString(STR_
2044		case 957:       // PMC3
2045		case 958:       // PMC4
2046		case 959:       // SDA
2047	<	r->nip += 4;
2047	>	r->pc() += 4;
2048		goto rti;
2049		case 25:        // SDR1
2050	<	r->gpr[rd] = 0xdead001f;
2051	<	r->nip += 4;
2050	>	r->gpr(rd) = 0xdead001f;
2051	>	r->pc() += 4;
2052		goto rti;
2053		case 287:       // PVR
2054	<	r->gpr[rd] = PVR;
2055	<	r->nip += 4;
2054	>	r->gpr(rd) = PVR;
2055	>	r->pc() += 4;
2056		goto rti;
2057		}
2058		break;
#	Line 1698 | Line 2088 | power_inst:            sprintf(str, GetString(STR_
2088		case 957:       // PMC3
2089		case 958:       // PMC4
2090		case 959:       // SDA
2091	<	r->nip += 4;
2091	>	r->pc() += 4;
2092		goto rti;
2093		}
2094		break;
#	Line 1717 | Line 2107 | power_inst:            sprintf(str, GetString(STR_
2107
2108		// In GUI mode, show error alert
2109		if (!PrefsFindBool("nogui")) {
2110	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
2110	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
2111		ErrorAlert(str);
2112		QuitEmulator();
2113		return;
#	Line 1725 | Line 2115 | power_inst:            sprintf(str, GetString(STR_
2115		}
2116
2117		// For all other errors, jump into debugger (sort of...)
2118	+	crash_reason = "SIGILL";
2119		if (!ready_for_signals) {
2120	<	printf("SIGILL\n");
2121	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
2120	>	printf("%s\n");
2121	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
2122		printf(
2123		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
2124		"  xer %08lx     cr %08lx  \n"
#	Line 1739 | Line 2130 | power_inst:            sprintf(str, GetString(STR_
2130		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
2131		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
2132		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
2133	<	r->nip, r->link, r->ctr, r->msr,
2134	<	r->xer, r->ccr,
2135	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
2136	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
2137	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
2138	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
2139	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
2140	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
2141	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
2142	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
2133	>	crash_reason,
2134	>	r->pc(), r->lr(), r->ctr(), r->msr(),
2135	>	r->xer(), r->cr(),
2136	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
2137	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
2138	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
2139	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
2140	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
2141	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
2142	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
2143	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
2144		exit(1);
2145		QuitEmulator();
2146		return;
2147		} else {
2148		// We crashed. Save registers, tell tick thread and loop forever
2149	<	sigsegv_regs = *(sigregs *)r;
2149	>	build_sigregs(&sigsegv_regs, r);
2150		emul_thread_fatal = true;
2151		for (;;) ;
2152		}
#	Line 1764 | Line 2156 | rti:;
2156
2157
2158		/*
2159	+	*  Helpers to share 32-bit addressable data with MacOS
2160	+	*/
2161	+
2162	+	bool SheepMem::Init(void)
2163	+	{
2164	+	// Size of a native page
2165	+	page_size = getpagesize();
2166	+
2167	+	// Allocate SheepShaver globals
2168	+	if (vm_acquire_fixed((char *)base, size) < 0)
2169	+	return false;
2170	+
2171	+	// Allocate page with all bits set to 0
2172	+	zero_page = base + size;
2173	+	if (vm_acquire_fixed((char *)zero_page, page_size) < 0)
2174	+	return false;
2175	+	memset((char *)zero_page, 0, page_size);
2176	+	if (vm_protect((char *)zero_page, page_size, VM_PAGE_READ) < 0)
2177	+	return false;
2178	+
2179	+	#if EMULATED_PPC
2180	+	// Allocate alternate stack for PowerPC interrupt routine
2181	+	sig_stack = zero_page + page_size;
2182	+	if (vm_acquire_fixed((char *)sig_stack, SIG_STACK_SIZE) < 0)
2183	+	return false;
2184	+	#endif
2185	+
2186	+	top = base + size;
2187	+	return true;
2188	+	}
2189	+
2190	+	void SheepMem::Exit(void)
2191	+	{
2192	+	if (top) {
2193	+	// Delete SheepShaver globals
2194	+	vm_release((void *)base, size);
2195	+
2196	+	// Delete zero page
2197	+	vm_release((void *)zero_page, page_size);
2198	+
2199	+	#if EMULATED_PPC
2200	+	// Delete alternate stack for PowerPC interrupt routine
2201	+	vm_release((void *)sig_stack, SIG_STACK_SIZE);
2202	+	#endif
2203	+	}
2204	+	}
2205	+
2206	+
2207	+	/*
2208		*  Display alert
2209		*/
2210
#	Line 1812 | Line 2253 | void display_alert(int title_id, int pre
2253
2254		void ErrorAlert(const char *text)
2255		{
2256	<	#ifdef ENABLE_GTK
2256	>	#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
2257		if (PrefsFindBool("nogui") || x_display == NULL) {
2258		printf(GetString(STR_SHELL_ERROR_PREFIX), text);
2259		return;
#	Line 1831 | Line 2272 | void ErrorAlert(const char *text)
2272
2273		void WarningAlert(const char *text)
2274		{
2275	<	#ifdef ENABLE_GTK
2275	>	#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
2276		if (PrefsFindBool("nogui") || x_display == NULL) {
2277		printf(GetString(STR_SHELL_WARNING_PREFIX), text);
2278		return;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines