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.4 by gbeauche, 2003-05-13T16:59:57Z vs.
Revision 1.31 by gbeauche, 2004-02-24T11:12:52Z

#	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 108 | Line 108
108		#include "rom_patches.h"
109		#include "user_strings.h"
110		#include "vm_alloc.h"
111	+	#include "sigsegv.h"
112	+	#include "thunks.h"
113
114		#define DEBUG 0
115		#include "debug.h"
#	Line 130 | Line 132
132		#endif
133
134
135	+	// Enable emulation of unaligned lmw/stmw?
136	+	#define EMULATE_UNALIGNED_LOADSTORE_MULTIPLE 1
137	+
138		// Enable Execute68k() safety checks?
139		#define SAFE_EXEC_68K 0
140
#	Line 144 | Line 149
149		const char ROM_FILE_NAME[] = "ROM";
150		const char ROM_FILE_NAME2[] = "Mac OS ROM";
151
152	<	const uint32 ROM_AREA_SIZE = 0x500000;          // Size of ROM area
148	<	const uint32 ROM_END = ROM_BASE + ROM_SIZE;     // End of ROM
149	<
150	<	const uint32 KERNEL_DATA_BASE = 0x68ffe000;     // Address of Kernel Data
151	<	const uint32 KERNEL_DATA2_BASE = 0x5fffe000;    // Alternate address of Kernel Data
152	<	const uint32 KERNEL_AREA_SIZE = 0x2000;         // Size of Kernel Data area
153	<
152	>	const uintptr RAM_BASE = 0x20000000;            // Base address of RAM
153		const uint32 SIG_STACK_SIZE = 0x10000;          // Size of signal stack
154
155
156	<	// 68k Emulator Data
157	<	struct EmulatorData {
158	<	uint32  v[0x400];
156	>	#if !EMULATED_PPC
157	>	struct sigregs {
158	>	uint32 nip;
159	>	uint32 link;
160	>	uint32 ctr;
161	>	uint32 msr;
162	>	uint32 xer;
163	>	uint32 ccr;
164	>	uint32 gpr[32];
165		};
166
167	<
168	<	// Kernel Data
169	<	struct KernelData {
170	<	uint32  v[0x400];
171	<	EmulatorData ed;
167	>	#if defined(__linux__)
168	>	#include <sys/ucontext.h>
169	>	#define MACHINE_REGISTERS(scp)  ((machine_regs *)(((ucontext_t *)scp)->uc_mcontext.regs))
170	>
171	>	struct machine_regs : public pt_regs
172	>	{
173	>	u_long & cr()                           { return pt_regs::ccr; }
174	>	uint32 cr() const                       { return pt_regs::ccr; }
175	>	uint32 lr() const                       { return pt_regs::link; }
176	>	uint32 ctr() const                      { return pt_regs::ctr; }
177	>	uint32 xer() const                      { return pt_regs::xer; }
178	>	uint32 msr() const                      { return pt_regs::msr; }
179	>	uint32 dar() const                      { return pt_regs::dar; }
180	>	u_long & pc()                           { return pt_regs::nip; }
181	>	uint32 pc() const                       { return pt_regs::nip; }
182	>	u_long & gpr(int i)                     { return pt_regs::gpr[i]; }
183	>	uint32 gpr(int i) const         { return pt_regs::gpr[i]; }
184		};
185	+	#endif
186
187	<
188	<	#if !EMULATED_PPC
189	<	// Structure in which registers are saved in a signal handler;
190	<	// sigcontext->regs points to it
191	<	// (see arch/ppc/kernel/signal.c)
192	<	typedef struct {
193	<	uint32 u[4];
194	<	} __attribute((aligned(16))) vector128;
195	<	#include <linux/elf.h>
196	<
197	<	struct sigregs {
198	<	elf_gregset_t   gp_regs;                                // Identical to pt_regs
199	<	double                  fp_regs[ELF_NFPREG];    // f0..f31 and fpsrc
200	<	//more (uninteresting) stuff following here
187	>	#if defined(__APPLE__) && defined(__MACH__)
188	>	#include <sys/signal.h>
189	>	extern "C" int sigaltstack(const struct sigaltstack *ss, struct sigaltstack *oss);
190	>
191	>	#include <sys/ucontext.h>
192	>	#define MACHINE_REGISTERS(scp)  ((machine_regs *)(((ucontext_t *)scp)->uc_mcontext))
193	>
194	>	struct machine_regs : public mcontext
195	>	{
196	>	uint32 & cr()                           { return ss.cr; }
197	>	uint32 cr() const                       { return ss.cr; }
198	>	uint32 lr() const                       { return ss.lr; }
199	>	uint32 ctr() const                      { return ss.ctr; }
200	>	uint32 xer() const                      { return ss.xer; }
201	>	uint32 msr() const                      { return ss.srr1; }
202	>	uint32 dar() const                      { return es.dar; }
203	>	uint32 & pc()                           { return ss.srr0; }
204	>	uint32 pc() const                       { return ss.srr0; }
205	>	uint32 & gpr(int i)                     { return (&ss.r0)[i]; }
206	>	uint32 gpr(int i) const         { return (&ss.r0)[i]; }
207		};
208		#endif
209
210	+	static void build_sigregs(sigregs *srp, machine_regs *mrp)
211	+	{
212	+	srp->nip = mrp->pc();
213	+	srp->link = mrp->lr();
214	+	srp->ctr = mrp->ctr();
215	+	srp->msr = mrp->msr();
216	+	srp->xer = mrp->xer();
217	+	srp->ccr = mrp->cr();
218	+	for (int i = 0; i < 32; i++)
219	+	srp->gpr[i] = mrp->gpr(i);
220	+	}
221	+	#endif
222	+
223
224		// Global variables (exported)
225		#if !EMULATED_PPC
#	Line 198 | Line 235 | int64 BusClockSpeed;   // Bus clock speed
235
236
237		// Global variables
238	<	static char *x_display_name = NULL;                     // X11 display name
238	>	char *x_display_name = NULL;                            // X11 display name
239		Display *x_display = NULL;                                      // X11 display handle
240	+	#ifdef X11_LOCK_TYPE
241	+	X11_LOCK_TYPE x_display_lock = X11_LOCK_INIT; // X11 display lock
242	+	#endif
243
244		static int zero_fd = 0;                                         // FD of /dev/zero
245		static bool lm_area_mapped = false;                     // Flag: Low Memory area mmap()ped
246		static int kernel_area = -1;                            // SHM ID of Kernel Data area
247		static bool rom_area_mapped = false;            // Flag: Mac ROM mmap()ped
248		static bool ram_area_mapped = false;            // Flag: Mac RAM mmap()ped
209	–	static void *mmap_RAMBase = NULL;                       // Base address of mmap()ed RAM area
249		static KernelData *kernel_data;                         // Pointer to Kernel Data
250		static EmulatorData *emulator_data;
251
#	Line 221 | Line 260 | static pthread_t emul_thread;                          // MacO
260		static bool ready_for_signals = false;          // Handler installed, signals can be sent
261		static int64 num_segv = 0;                                      // Number of handled SEGV signals
262
224	–	#if !EMULATED_PPC
263		static struct sigaction sigusr2_action;         // Interrupt signal (of emulator thread)
264	+	#if EMULATED_PPC
265	+	static uintptr sig_stack = 0;                           // Stack for PowerPC interrupt routine
266	+	#else
267		static struct sigaction sigsegv_action;         // Data access exception signal (of emulator thread)
268		static struct sigaction sigill_action;          // Illegal instruction signal (of emulator thread)
269		static void *sig_stack = NULL;                          // Stack for signal handlers
270		static void *extra_stack = NULL;                        // Stack for SIGSEGV inside interrupt handler
271		static bool emul_thread_fatal = false;          // Flag: MacOS thread crashed, tick thread shall dump debug output
272		static sigregs sigsegv_regs;                            // Register dump when crashed
273	+	static const char *crash_reason = NULL;         // Reason of the crash (SIGSEGV, SIGBUS, SIGILL)
274		#endif
275
276	+	uint32  SheepMem::page_size;                            // Size of a native page
277	+	uintptr SheepMem::zero_page = 0;                        // Address of ro page filled in with zeros
278	+	uintptr SheepMem::base = 0x60000000;            // Address of SheepShaver data
279	+	uintptr SheepMem::top = 0;                                      // Top of SheepShaver data (stack like storage)
280	+
281
282		// Prototypes
283		static void Quit(void);
284		static void *emul_func(void *arg);
285		static void *nvram_func(void *arg);
286		static void *tick_func(void *arg);
287	<	#if !EMULATED_PPC
288	<	static void sigusr2_handler(int sig, sigcontext_struct *sc);
289	<	static void sigsegv_handler(int sig, sigcontext_struct *sc);
290	<	static void sigill_handler(int sig, sigcontext_struct *sc);
287	>	#if EMULATED_PPC
288	>	static void sigusr2_handler(int sig);
289	>	extern void emul_ppc(uint32 start);
290	>	extern void init_emul_ppc(void);
291	>	extern void exit_emul_ppc(void);
292	>	#else
293	>	static void sigusr2_handler(int sig, siginfo_t *sip, void *scp);
294	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp);
295	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp);
296		#endif
297
298
299		// From asm_linux.S
300	<	#if EMULATED_PPC
249	<	extern int atomic_add(int *var, int v);
250	<	extern int atomic_and(int *var, int v);
251	<	extern int atomic_or(int *var, int v);
252	<	#else
300	>	#if !EMULATED_PPC
301		extern "C" void *get_toc(void);
302		extern "C" void *get_sp(void);
303		extern "C" void flush_icache_range(void *start, void *end);
#	Line 264 | Line 312 | extern void paranoia_check(void);
312		#endif
313
314
315	+	#if EMULATED_PPC
316	+	/*
317	+	*  Return signal stack base
318	+	*/
319	+
320	+	uintptr SignalStackBase(void)
321	+	{
322	+	return sig_stack + SIG_STACK_SIZE;
323	+	}
324	+
325	+
326	+	/*
327	+	*  Atomic operations
328	+	*/
329	+
330	+	#if HAVE_SPINLOCKS
331	+	static spinlock_t atomic_ops_lock = SPIN_LOCK_UNLOCKED;
332	+	#else
333	+	#define spin_lock(LOCK)
334	+	#define spin_unlock(LOCK)
335	+	#endif
336	+
337	+	int atomic_add(int *var, int v)
338	+	{
339	+	spin_lock(&atomic_ops_lock);
340	+	int ret = *var;
341	+	*var += v;
342	+	spin_unlock(&atomic_ops_lock);
343	+	return ret;
344	+	}
345	+
346	+	int atomic_and(int *var, int v)
347	+	{
348	+	spin_lock(&atomic_ops_lock);
349	+	int ret = *var;
350	+	*var &= v;
351	+	spin_unlock(&atomic_ops_lock);
352	+	return ret;
353	+	}
354	+
355	+	int atomic_or(int *var, int v)
356	+	{
357	+	spin_lock(&atomic_ops_lock);
358	+	int ret = *var;
359	+	*var |= v;
360	+	spin_unlock(&atomic_ops_lock);
361	+	return ret;
362	+	}
363	+	#endif
364	+
365	+
366		/*
367		*  Main program
368		*/
#	Line 282 | Line 381 | int main(int argc, char **argv)
381		char str[256];
382		uint32 *boot_globs;
383		int16 i16;
285	–	int drive, driver;
384		int rom_fd;
385		FILE *proc_file;
386		const char *rom_path;
#	Line 292 | Line 390 | int main(int argc, char **argv)
390
391		// Initialize variables
392		RAMBase = 0;
295	–	mmap_RAMBase = NULL;
393		tzset();
394
395		// Print some info
#	Line 350 | Line 447 | int main(int argc, char **argv)
447		PVR = 0x00040000;                       // Default: 604
448		CPUClockSpeed = 100000000;      // Default: 100MHz
449		BusClockSpeed = 100000000;      // Default: 100MHz
450	<	#if !EMULATED_PPC
450	>	#if EMULATED_PPC
451	>	PVR = 0x000c0000;                       // Default: 7400 (with AltiVec)
452	>	#else
453		proc_file = fopen("/proc/cpuinfo", "r");
454		if (proc_file) {
455		char line[256];
#	Line 364 | Line 463 | int main(int argc, char **argv)
463		// Parse line
464		int i;
465		char value[256];
466	<	if (sscanf(line, "cpu : %s", value) == 1) {
466	>	if (sscanf(line, "cpu : %[0-9A-Za-a]", value) == 1) {
467		if (strcmp(value, "601") == 0)
468		PVR = 0x00010000;
469		else if (strcmp(value, "603") == 0)
#	Line 385 | Line 484 | int main(int argc, char **argv)
484		PVR = 0x00320000;
485		else if (strcmp(value, "860") == 0)
486		PVR = 0x00500000;
487	+	else if (strcmp(value, "7400") == 0)
488	+	PVR = 0x000c0000;
489	+	else if (strcmp(value, "7410") == 0)
490	+	PVR = 0x800c0000;
491		else
492		printf("WARNING: Unknown CPU type '%s', assuming 604\n", value);
493		}
#	Line 420 | Line 523 | int main(int argc, char **argv)
523		goto quit;
524		}
525
526	+	#ifndef PAGEZERO_HACK
527		// Create Low Memory area (0x0000..0x3000)
528		if (vm_acquire_fixed((char *)0, 0x3000) < 0) {
529		sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
#	Line 427 | Line 531 | int main(int argc, char **argv)
531		goto quit;
532		}
533		lm_area_mapped = true;
534	+	#endif
535
536		// Create areas for Kernel Data
537		kernel_area = shmget(IPC_PRIVATE, KERNEL_AREA_SIZE, 0600);
#	Line 445 | Line 550 | int main(int argc, char **argv)
550		ErrorAlert(str);
551		goto quit;
552		}
553	<	kernel_data = (KernelData *)0x68ffe000;
553	>	kernel_data = (KernelData *)KERNEL_DATA_BASE;
554		emulator_data = &kernel_data->ed;
555	<	KernelDataAddr = (uint32)kernel_data;
555	>	KernelDataAddr = KERNEL_DATA_BASE;
556		D(bug("Kernel Data at %p, Emulator Data at %p\n", kernel_data, emulator_data));
557
558	+	// Create area for SheepShaver data
559	+	if (!SheepMem::Init()) {
560	+	sprintf(str, GetString(STR_SHEEP_MEM_MMAP_ERR), strerror(errno));
561	+	ErrorAlert(str);
562	+	goto quit;
563	+	}
564	+
565		// Create area for Mac ROM
566		if (vm_acquire_fixed((char *)ROM_BASE, ROM_AREA_SIZE) < 0) {
567		sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
#	Line 473 | Line 585 | int main(int argc, char **argv)
585		RAMSize = 8*1024*1024;
586		}
587
588	<	mmap_RAMBase = (void *)0x20000000;
477	<	if (vm_acquire_fixed(mmap_RAMBase, RAMSize) < 0) {
588	>	if (vm_acquire_fixed((char *)RAM_BASE, RAMSize) < 0) {
589		sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
590		ErrorAlert(str);
591		goto quit;
592		}
593		#if !EMULATED_PPC
594	<	if (vm_protect(mmap_RAMBase, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
594	>	if (vm_protect((char *)RAM_BASE, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
595		sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
596		ErrorAlert(str);
597		goto quit;
598		}
599		#endif
600	<	RAMBase = (uint32)mmap_RAMBase;
600	>	RAMBase = RAM_BASE;
601		ram_area_mapped = true;
602		D(bug("RAM area at %08x\n", RAMBase));
603
#	Line 528 | Line 639 | int main(int argc, char **argv)
639		XPRAMInit();
640
641		// Set boot volume
642	<	drive = PrefsFindInt32("bootdrive");
642	>	i16 = PrefsFindInt32("bootdrive");
643		XPRAM[0x1378] = i16 >> 8;
644		XPRAM[0x1379] = i16 & 0xff;
645	<	driver = PrefsFindInt32("bootdriver");
645	>	i16 = PrefsFindInt32("bootdriver");
646		XPRAM[0x137a] = i16 >> 8;
647		XPRAM[0x137b] = i16 & 0xff;
648
#	Line 544 | Line 655 | int main(int argc, char **argv)
655		boot_globs[1] = htonl(RAMSize);
656		boot_globs[2] = htonl((uint32)-1);                      // End of bank table
657
658	+	// Init thunks
659	+	if (!ThunksInit())
660	+	goto quit;
661	+
662		// Init drivers
663		SonyInit();
664		DiskInit();
#	Line 553 | Line 668 | int main(int argc, char **argv)
668		// Init external file system
669		ExtFSInit();
670
671	+	// Init ADB
672	+	ADBInit();
673	+
674		// Init audio
675		AudioInit();
676
#	Line 587 | Line 705 | int main(int argc, char **argv)
705		// Initialize Kernel Data
706		memset(kernel_data, 0, sizeof(KernelData));
707		if (ROMType == ROMTYPE_NEWWORLD) {
708	<	static uint32 of_dev_tree[4] = {0, 0, 0, 0};
709	<	static uint8 vector_lookup_tbl[128];
710	<	static uint8 vector_mask_tbl[64];
708	>	uintptr of_dev_tree = SheepMem::Reserve(4 * sizeof(uint32));
709	>	memset((void *)of_dev_tree, 0, 4 * sizeof(uint32));
710	>	uintptr vector_lookup_tbl = SheepMem::Reserve(128);
711	>	uintptr vector_mask_tbl = SheepMem::Reserve(64);
712		memset((uint8 *)kernel_data + 0xb80, 0x3d, 0x80);
713	<	memset(vector_lookup_tbl, 0, 128);
714	<	memset(vector_mask_tbl, 0, 64);
713	>	memset((void *)vector_lookup_tbl, 0, 128);
714	>	memset((void *)vector_mask_tbl, 0, 64);
715		kernel_data->v[0xb80 >> 2] = htonl(ROM_BASE);
716	<	kernel_data->v[0xb84 >> 2] = htonl((uint32)of_dev_tree);        // OF device tree base
717	<	kernel_data->v[0xb90 >> 2] = htonl((uint32)vector_lookup_tbl);
718	<	kernel_data->v[0xb94 >> 2] = htonl((uint32)vector_mask_tbl);
716	>	kernel_data->v[0xb84 >> 2] = htonl(of_dev_tree);                        // OF device tree base
717	>	kernel_data->v[0xb90 >> 2] = htonl(vector_lookup_tbl);
718	>	kernel_data->v[0xb94 >> 2] = htonl(vector_mask_tbl);
719		kernel_data->v[0xb98 >> 2] = htonl(ROM_BASE);                           // OpenPIC base
720		kernel_data->v[0xbb0 >> 2] = htonl(0);                                          // ADB base
721		kernel_data->v[0xc20 >> 2] = htonl(RAMSize);
#	Line 632 | Line 751 | int main(int argc, char **argv)
751		D(bug("Initializing Low Memory...\n"));
752		memset(NULL, 0, 0x3000);
753		WriteMacInt32(XLM_SIGNATURE, FOURCC('B','a','a','h'));                  // Signature to detect SheepShaver
754	<	WriteMacInt32(XLM_KERNEL_DATA, (uint32)kernel_data);                    // For trap replacement routines
754	>	WriteMacInt32(XLM_KERNEL_DATA, KernelDataAddr);                                 // For trap replacement routines
755		WriteMacInt32(XLM_PVR, PVR);                                                                    // Theoretical PVR
756		WriteMacInt32(XLM_BUS_CLOCK, BusClockSpeed);                                    // For DriverServicesLib patch
757		WriteMacInt16(XLM_EXEC_RETURN_OPCODE, M68K_EXEC_RETURN);                // For Execute68k() (RTS from the executed 68k code will jump here and end 68k mode)
758	+	WriteMacInt32(XLM_ZERO_PAGE, SheepMem::ZeroPage());                             // Pointer to read-only page with all bits set to 0
759		#if !EMULATED_PPC
760	<	WriteMacInt32(XLM_TOC, (uint32)TOC);                                                    // TOC pointer of emulator
641	<	WriteMacInt32(XLM_ETHER_INIT, (uint32)InitStreamModule);                // DLPI ethernet driver functions
642	<	WriteMacInt32(XLM_ETHER_TERM, (uint32)TerminateStreamModule);
643	<	WriteMacInt32(XLM_ETHER_OPEN, (uint32)ether_open);
644	<	WriteMacInt32(XLM_ETHER_CLOSE, (uint32)ether_close);
645	<	WriteMacInt32(XLM_ETHER_WPUT, (uint32)ether_wput);
646	<	WriteMacInt32(XLM_ETHER_RSRV, (uint32)ether_rsrv);
647	<	WriteMacInt32(XLM_VIDEO_DOIO, (uint32)VideoDoDriverIO);
760	>	WriteMacInt32(XLM_TOC, (uint32)TOC);                                                            // TOC pointer of emulator
761		#endif
762	+	WriteMacInt32(XLM_ETHER_INIT, NativeFunction(NATIVE_ETHER_INIT));       // DLPI ethernet driver functions
763	+	WriteMacInt32(XLM_ETHER_TERM, NativeFunction(NATIVE_ETHER_TERM));
764	+	WriteMacInt32(XLM_ETHER_OPEN, NativeFunction(NATIVE_ETHER_OPEN));
765	+	WriteMacInt32(XLM_ETHER_CLOSE, NativeFunction(NATIVE_ETHER_CLOSE));
766	+	WriteMacInt32(XLM_ETHER_WPUT, NativeFunction(NATIVE_ETHER_WPUT));
767	+	WriteMacInt32(XLM_ETHER_RSRV, NativeFunction(NATIVE_ETHER_RSRV));
768	+	WriteMacInt32(XLM_VIDEO_DOIO, NativeFunction(NATIVE_VIDEO_DO_DRIVER_IO));
769		D(bug("Low Memory initialized\n"));
770
771		// Start 60Hz thread
#	Line 683 | Line 803 | int main(int argc, char **argv)
803		#endif
804
805		#if !EMULATED_PPC
806	<	// Install SIGSEGV handler
806	>	// Install SIGSEGV and SIGBUS handlers
807		sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
808		sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
809	<	sigsegv_action.sa_handler = (__sighandler_t)sigsegv_handler;
810	<	sigsegv_action.sa_flags = SA_ONSTACK;
809	>	sigsegv_action.sa_sigaction = sigsegv_handler;
810	>	sigsegv_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
811	>	#ifdef HAVE_SIGNAL_SA_RESTORER
812		sigsegv_action.sa_restorer = NULL;
813	+	#endif
814		if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
815		sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
816		ErrorAlert(str);
817		goto quit;
818		}
819	+	if (sigaction(SIGBUS, &sigsegv_action, NULL) < 0) {
820	+	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
821	+	ErrorAlert(str);
822	+	goto quit;
823	+	}
824
825		// Install SIGILL handler
826		sigemptyset(&sigill_action.sa_mask);    // Block interrupts during ILL handling
827		sigaddset(&sigill_action.sa_mask, SIGUSR2);
828	<	sigill_action.sa_handler = (__sighandler_t)sigill_handler;
829	<	sigill_action.sa_flags = SA_ONSTACK;
828	>	sigill_action.sa_sigaction = sigill_handler;
829	>	sigill_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
830	>	#ifdef HAVE_SIGNAL_SA_RESTORER
831		sigill_action.sa_restorer = NULL;
832	+	#endif
833		if (sigaction(SIGILL, &sigill_action, NULL) < 0) {
834		sprintf(str, GetString(STR_SIGILL_INSTALL_ERR), strerror(errno));
835		ErrorAlert(str);
836		goto quit;
837		}
838	+	#endif
839
840	+	#if !EMULATED_PPC
841		// Install interrupt signal handler
842		sigemptyset(&sigusr2_action.sa_mask);
843	<	sigusr2_action.sa_handler = (__sighandler_t)sigusr2_handler;
844	<	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART;
843	>	sigusr2_action.sa_sigaction = sigusr2_handler;
844	>	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO;
845	>	#ifdef HAVE_SIGNAL_SA_RESTORER
846		sigusr2_action.sa_restorer = NULL;
847	+	#endif
848		if (sigaction(SIGUSR2, &sigusr2_action, NULL) < 0) {
849		sprintf(str, GetString(STR_SIGUSR2_INSTALL_ERR), strerror(errno));
850		ErrorAlert(str);
#	Line 736 | Line 869 | quit:
869
870		static void Quit(void)
871		{
872	+	#if EMULATED_PPC
873	+	// Exit PowerPC emulation
874	+	exit_emul_ppc();
875	+	#endif
876	+
877		// Stop 60Hz thread
878		if (tick_thread_active) {
879		pthread_cancel(tick_thread);
#	Line 749 | Line 887 | static void Quit(void)
887		}
888
889		#if !EMULATED_PPC
890	<	// Uninstall SIGSEGV handler
890	>	// Uninstall SIGSEGV and SIGBUS handlers
891		sigemptyset(&sigsegv_action.sa_mask);
892		sigsegv_action.sa_handler = SIG_DFL;
893		sigsegv_action.sa_flags = 0;
894		sigaction(SIGSEGV, &sigsegv_action, NULL);
895	+	sigaction(SIGBUS, &sigsegv_action, NULL);
896
897		// Uninstall SIGILL handler
898		sigemptyset(&sigill_action.sa_mask);
#	Line 780 | Line 919 | static void Quit(void)
919		// Exit audio
920		AudioExit();
921
922	+	// Exit ADB
923	+	ADBExit();
924	+
925		// Exit video
926		VideoExit();
927
#	Line 792 | Line 934 | static void Quit(void)
934		DiskExit();
935		SonyExit();
936
937	+	// Delete thunks
938	+	ThunksExit();
939	+
940	+	// Delete SheepShaver globals
941	+	SheepMem::Exit();
942	+
943		// Delete RAM area
944		if (ram_area_mapped)
945	<	vm_release(mmap_RAMBase, RAMSize);
945	>	vm_release((char *)RAM_BASE, RAMSize);
946
947		// Delete ROM area
948		if (rom_area_mapped)
#	Line 839 | Line 987 | static void Quit(void)
987		*/
988
989		#if EMULATED_PPC
842	–	extern void emul_ppc(uint32 start);
843	–	extern void init_emul_ppc(void);
990		void jump_to_rom(uint32 entry)
991		{
992		init_emul_ppc();
#	Line 909 | Line 1055 | void Execute68kTrap(uint16 trap, M68kReg
1055
1056
1057		/*
912	–	*  Execute PPC code from EMUL_OP routine (real mode switch)
913	–	*/
914	–
915	–	void ExecutePPC(void (*func)())
916	–	{
917	–	uint32 tvect[2] = {(uint32)func, 0};    // Fake TVECT
918	–	RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
919	–	M68kRegisters r;
920	–	Execute68k((uint32)&desc, &r);
921	–	}
922	–
923	–
924	–	/*
1058		*  Quit emulator (cause return from jump_to_rom)
1059		*/
1060
#	Line 980 | Line 1113 | void Dump68kRegs(M68kRegisters *r)
1113
1114		void MakeExecutable(int dummy, void *start, uint32 length)
1115		{
1116	<	#if !EMULATED_PPC
984	<	if (((uint32)start >= ROM_BASE) && ((uint32)start < (ROM_BASE + ROM_SIZE)))
1116	>	if (((uintptr)start >= ROM_BASE) && ((uintptr)start < (ROM_BASE + ROM_SIZE)))
1117		return;
1118	<	flush_icache_range(start, (void *)((uint32)start + length));
1118	>	#if EMULATED_PPC
1119	>	FlushCodeCache((uintptr)start, (uintptr)start + length);
1120	>	#else
1121	>	flush_icache_range(start, (void *)((uintptr)start + length));
1122		#endif
1123		}
1124
#	Line 994 | Line 1129 | void MakeExecutable(int dummy, void *sta
1129
1130		void PatchAfterStartup(void)
1131		{
1132	<	ExecutePPC(VideoInstallAccel);
1132	>	ExecuteNative(NATIVE_VIDEO_INSTALL_ACCEL);
1133		InstallExtFS();
1134		}
1135
#	Line 1039 | Line 1174 | static void *tick_func(void *arg)
1174		if (emul_thread_fatal) {
1175
1176		// Yes, dump registers
1177	<	pt_regs *r = (pt_regs *)&sigsegv_regs;
1177	>	sigregs *r = &sigsegv_regs;
1178		char str[256];
1179	<	sprintf(str, "SIGSEGV\n"
1179	>	if (crash_reason == NULL)
1180	>	crash_reason = "SIGSEGV";
1181	>	sprintf(str, "%s\n"
1182		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1183		"  xer %08lx     cr %08lx  \n"
1184		"   r0 %08lx     r1 %08lx     r2 %08lx     r3 %08lx\n"
#	Line 1052 | Line 1189 | static void *tick_func(void *arg)
1189		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1190		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1191		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1192	+	crash_reason,
1193		r->nip, r->link, r->ctr, r->msr,
1194		r->xer, r->ccr,
1195		r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
#	Line 1097 | Line 1235 | static void *tick_func(void *arg)
1235
1236		void Set_pthread_attr(pthread_attr_t *attr, int priority)
1237		{
1238	<	// nothing to do
1238	>	#ifdef HAVE_PTHREADS
1239	>	pthread_attr_init(attr);
1240	>	#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
1241	>	// Some of these only work for superuser
1242	>	if (geteuid() == 0) {
1243	>	pthread_attr_setinheritsched(attr, PTHREAD_EXPLICIT_SCHED);
1244	>	pthread_attr_setschedpolicy(attr, SCHED_FIFO);
1245	>	struct sched_param fifo_param;
1246	>	fifo_param.sched_priority = ((sched_get_priority_min(SCHED_FIFO) +
1247	>	sched_get_priority_max(SCHED_FIFO)) / 2 +
1248	>	priority);
1249	>	pthread_attr_setschedparam(attr, &fifo_param);
1250	>	}
1251	>	if (pthread_attr_setscope(attr, PTHREAD_SCOPE_SYSTEM) != 0) {
1252	>	#ifdef PTHREAD_SCOPE_BOUND_NP
1253	>	// If system scope is not available (eg. we're not running
1254	>	// with CAP_SCHED_MGT capability on an SGI box), try bound
1255	>	// scope.  It exposes pthread scheduling to the kernel,
1256	>	// without setting realtime priority.
1257	>	pthread_attr_setscope(attr, PTHREAD_SCOPE_BOUND_NP);
1258	>	#endif
1259	>	}
1260	>	#endif
1261	>	#endif
1262		}
1263
1264
#	Line 1105 | Line 1266 | void Set_pthread_attr(pthread_attr_t *at
1266		*  Mutexes
1267		*/
1268
1269	+	#ifdef HAVE_PTHREADS
1270	+
1271	+	struct B2_mutex {
1272	+	B2_mutex() {
1273	+	pthread_mutexattr_t attr;
1274	+	pthread_mutexattr_init(&attr);
1275	+	// Initialize the mutex for priority inheritance --
1276	+	// required for accurate timing.
1277	+	#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
1278	+	pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
1279	+	#endif
1280	+	#if defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE) && defined(PTHREAD_MUTEX_NORMAL)
1281	+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
1282	+	#endif
1283	+	#ifdef HAVE_PTHREAD_MUTEXATTR_SETPSHARED
1284	+	pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_PRIVATE);
1285	+	#endif
1286	+	pthread_mutex_init(&m, &attr);
1287	+	pthread_mutexattr_destroy(&attr);
1288	+	}
1289	+	~B2_mutex() {
1290	+	pthread_mutex_trylock(&m); // Make sure it's locked before
1291	+	pthread_mutex_unlock(&m);  // unlocking it.
1292	+	pthread_mutex_destroy(&m);
1293	+	}
1294	+	pthread_mutex_t m;
1295	+	};
1296	+
1297	+	B2_mutex *B2_create_mutex(void)
1298	+	{
1299	+	return new B2_mutex;
1300	+	}
1301	+
1302	+	void B2_lock_mutex(B2_mutex *mutex)
1303	+	{
1304	+	pthread_mutex_lock(&mutex->m);
1305	+	}
1306	+
1307	+	void B2_unlock_mutex(B2_mutex *mutex)
1308	+	{
1309	+	pthread_mutex_unlock(&mutex->m);
1310	+	}
1311	+
1312	+	void B2_delete_mutex(B2_mutex *mutex)
1313	+	{
1314	+	delete mutex;
1315	+	}
1316	+
1317	+	#else
1318	+
1319		struct B2_mutex {
1320		int dummy;
1321		};
#	Line 1127 | Line 1338 | void B2_delete_mutex(B2_mutex *mutex)
1338		delete mutex;
1339		}
1340
1341	+	#endif
1342	+
1343
1344		/*
1345		*  Trigger signal USR2 from another thread
1346		*/
1347
1348	+	#if !EMULATED_PPC || ASYNC_IRQ
1349		void TriggerInterrupt(void)
1350		{
1137	–	#if EMULATED_PPC
1138	–	WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
1139	–	#else
1140	–	#if 0
1141	–	WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
1142	–	#else
1351		if (ready_for_signals)
1352		pthread_kill(emul_thread, SIGUSR2);
1145	–	#endif
1146	–	#endif
1353		}
1354	+	#endif
1355
1356
1357		/*
#	Line 1184 | Line 1391 | void EnableInterrupt(void)
1391		}
1392
1393
1187	–	#if !EMULATED_PPC
1394		/*
1395		*  USR2 handler
1396		*/
1397
1398	<	static void sigusr2_handler(int sig, sigcontext_struct *sc)
1398	>	#if EMULATED_PPC
1399	>	static void sigusr2_handler(int sig)
1400	>	{
1401	>	#if ASYNC_IRQ
1402	>	extern void HandleInterrupt(void);
1403	>	HandleInterrupt();
1404	>	#endif
1405	>	}
1406	>	#else
1407	>	static void sigusr2_handler(int sig, siginfo_t *sip, void *scp)
1408		{
1409	<	pt_regs *r = sc->regs;
1409	>	machine_regs *r = MACHINE_REGISTERS(scp);
1410
1411		// Do nothing if interrupts are disabled
1412		if (*(int32 *)XLM_IRQ_NEST > 0)
#	Line 1205 | Line 1420 | static void sigusr2_handler(int sig, sig
1420		case MODE_68K:
1421		// 68k emulator active, trigger 68k interrupt level 1
1422		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1423	<	r->ccr |= ntohl(kernel_data->v[0x674 >> 2]);
1423	>	r->cr() |= ntohl(kernel_data->v[0x674 >> 2]);
1424		break;
1425
1426		#if INTERRUPTS_IN_NATIVE_MODE
1427		case MODE_NATIVE:
1428		// 68k emulator inactive, in nanokernel?
1429	<	if (r->gpr[1] != KernelDataAddr) {
1429	>	if (r->gpr(1) != KernelDataAddr) {
1430		// Prepare for 68k interrupt level 1
1431		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1432		WriteMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc, ReadMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc) | ntohl(kernel_data->v[0x674 >> 2]));
#	Line 1258 | Line 1473 | static void sigusr2_handler(int sig, sig
1473		if (InterruptFlags & INTFLAG_VIA) {
1474		ClearInterruptFlag(INTFLAG_VIA);
1475		ADBInterrupt();
1476	<	ExecutePPC(VideoVBL);
1476	>	ExecuteNative(NATIVE_VIDEO_VBL);
1477		}
1478		}
1479		#endif
#	Line 1270 | Line 1485 | static void sigusr2_handler(int sig, sig
1485		}
1486		break;
1487		#endif
1273	–
1488		}
1489		}
1490	+	#endif
1491
1492
1493		/*
1494		*  SIGSEGV handler
1495		*/
1496
1497	<	static void sigsegv_handler(int sig, sigcontext_struct *sc)
1497	>	#if !EMULATED_PPC
1498	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp)
1499		{
1500	<	pt_regs *r = sc->regs;
1500	>	machine_regs *r = MACHINE_REGISTERS(scp);
1501	>
1502	>	// Get effective address
1503	>	uint32 addr = r->dar();
1504	>
1505	>	#if ENABLE_VOSF
1506	>	// Handle screen fault.
1507	>	extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
1508	>	if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->pc()))
1509	>	return;
1510	>	#endif
1511	>
1512		num_segv++;
1513
1514		// Fault in Mac ROM or RAM?
1515	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1515	>	bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize));
1516		if (mac_fault) {
1517
1291	–	// Get opcode and divide into fields
1292	–	uint32 opcode = *((uint32 *)r->nip);
1293	–	uint32 primop = opcode >> 26;
1294	–	uint32 exop = (opcode >> 1) & 0x3ff;
1295	–	uint32 ra = (opcode >> 16) & 0x1f;
1296	–	uint32 rb = (opcode >> 11) & 0x1f;
1297	–	uint32 rd = (opcode >> 21) & 0x1f;
1298	–	int32 imm = (int16)(opcode & 0xffff);
1299	–
1518		// "VM settings" during MacOS 8 installation
1519	<	if (r->nip == ROM_BASE + 0x488160 && r->gpr[20] == 0xf8000000) {
1520	<	r->nip += 4;
1521	<	r->gpr[8] = 0;
1519	>	if (r->pc() == ROM_BASE + 0x488160 && r->gpr(20) == 0xf8000000) {
1520	>	r->pc() += 4;
1521	>	r->gpr(8) = 0;
1522		return;
1523
1524		// MacOS 8.5 installation
1525	<	} else if (r->nip == ROM_BASE + 0x488140 && r->gpr[16] == 0xf8000000) {
1526	<	r->nip += 4;
1527	<	r->gpr[8] = 0;
1525	>	} else if (r->pc() == ROM_BASE + 0x488140 && r->gpr(16) == 0xf8000000) {
1526	>	r->pc() += 4;
1527	>	r->gpr(8) = 0;
1528		return;
1529
1530		// MacOS 8 serial drivers on startup
1531	<	} else if (r->nip == ROM_BASE + 0x48e080 && (r->gpr[8] == 0xf3012002 || r->gpr[8] == 0xf3012000)) {
1532	<	r->nip += 4;
1533	<	r->gpr[8] = 0;
1531	>	} else if (r->pc() == ROM_BASE + 0x48e080 && (r->gpr(8) == 0xf3012002 || r->gpr(8) == 0xf3012000)) {
1532	>	r->pc() += 4;
1533	>	r->gpr(8) = 0;
1534		return;
1535
1536		// MacOS 8.1 serial drivers on startup
1537	<	} else if (r->nip == ROM_BASE + 0x48c5e0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1538	<	r->nip += 4;
1537	>	} else if (r->pc() == ROM_BASE + 0x48c5e0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1538	>	r->pc() += 4;
1539		return;
1540	<	} else if (r->nip == ROM_BASE + 0x4a10a0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1541	<	r->nip += 4;
1540	>	} else if (r->pc() == ROM_BASE + 0x4a10a0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1541	>	r->pc() += 4;
1542		return;
1543		}
1544
1545	+	// Get opcode and divide into fields
1546	+	uint32 opcode = *((uint32 *)r->pc());
1547	+	uint32 primop = opcode >> 26;
1548	+	uint32 exop = (opcode >> 1) & 0x3ff;
1549	+	uint32 ra = (opcode >> 16) & 0x1f;
1550	+	uint32 rb = (opcode >> 11) & 0x1f;
1551	+	uint32 rd = (opcode >> 21) & 0x1f;
1552	+	int32 imm = (int16)(opcode & 0xffff);
1553	+
1554		// Analyze opcode
1555		enum {
1556		TYPE_UNKNOWN,
#	Line 1405 | Line 1632 | static void sigsegv_handler(int sig, sig
1632		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_NORM; break;
1633		case 45:        // sthu
1634		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_U; break;
1635	<	}
1636	<
1637	<	// Calculate effective address
1638	<	uint32 addr = 0;
1639	<	switch (addr_mode) {
1640	<	case MODE_X:
1641	<	case MODE_UX:
1642	<	if (ra == 0)
1643	<	addr = r->gpr[rb];
1644	<	else
1645	<	addr = r->gpr[ra] + r->gpr[rb];
1646	<	break;
1420	<	case MODE_NORM:
1421	<	case MODE_U:
1422	<	if (ra == 0)
1423	<	addr = (int32)(int16)imm;
1424	<	else
1425	<	addr = r->gpr[ra] + (int32)(int16)imm;
1635	>	#if EMULATE_UNALIGNED_LOADSTORE_MULTIPLE
1636	>	case 46:        // lmw
1637	>	if ((addr % 4) != 0) {
1638	>	uint32 ea = addr;
1639	>	D(bug("WARNING: unaligned lmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1640	>	for (int i = rd; i <= 31; i++) {
1641	>	r->gpr(i) = ReadMacInt32(ea);
1642	>	ea += 4;
1643	>	}
1644	>	r->pc() += 4;
1645	>	goto rti;
1646	>	}
1647		break;
1648	<	default:
1648	>	case 47:        // stmw
1649	>	if ((addr % 4) != 0) {
1650	>	uint32 ea = addr;
1651	>	D(bug("WARNING: unaligned stmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1652	>	for (int i = rd; i <= 31; i++) {
1653	>	WriteMacInt32(ea, r->gpr(i));
1654	>	ea += 4;
1655	>	}
1656	>	r->pc() += 4;
1657	>	goto rti;
1658	>	}
1659		break;
1660	+	#endif
1661		}
1662	<
1663	<	// Ignore ROM writes
1664	<	if (transfer_type == TYPE_STORE && addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) {
1665	<	//                      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));
1662	>
1663	>	// Ignore ROM writes (including to the zero page, which is read-only)
1664	>	if (transfer_type == TYPE_STORE &&
1665	>	((addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) ||
1666	>	(addr >= SheepMem::ZeroPage() && addr < SheepMem::ZeroPage() + SheepMem::PageSize()))) {
1667	>	//                      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()));
1668		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1669	<	r->gpr[ra] = addr;
1670	<	r->nip += 4;
1669	>	r->gpr(ra) = addr;
1670	>	r->pc() += 4;
1671		goto rti;
1672		}
1673
1674		// Ignore illegal memory accesses?
1675		if (PrefsFindBool("ignoresegv")) {
1676		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1677	<	r->gpr[ra] = addr;
1677	>	r->gpr(ra) = addr;
1678		if (transfer_type == TYPE_LOAD)
1679	<	r->gpr[rd] = 0;
1680	<	r->nip += 4;
1679	>	r->gpr(rd) = 0;
1680	>	r->pc() += 4;
1681		goto rti;
1682		}
1683
#	Line 1451 | Line 1685 | static void sigsegv_handler(int sig, sig
1685		if (!PrefsFindBool("nogui")) {
1686		char str[256];
1687		if (transfer_type == TYPE_LOAD || transfer_type == TYPE_STORE)
1688	<	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]);
1688	>	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));
1689		else
1690	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
1690	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
1691		ErrorAlert(str);
1692		QuitEmulator();
1693		return;
#	Line 1461 | Line 1695 | static void sigsegv_handler(int sig, sig
1695		}
1696
1697		// For all other errors, jump into debugger (sort of...)
1698	+	crash_reason = (sig == SIGBUS) ? "SIGBUS" : "SIGSEGV";
1699		if (!ready_for_signals) {
1700	<	printf("SIGSEGV\n");
1701	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
1700	>	printf("%s\n");
1701	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
1702		printf(
1703		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1704		"  xer %08lx     cr %08lx  \n"
#	Line 1475 | Line 1710 | static void sigsegv_handler(int sig, sig
1710		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1711		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1712		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1713	<	r->nip, r->link, r->ctr, r->msr,
1714	<	r->xer, r->ccr,
1715	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
1716	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
1717	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
1718	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
1719	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
1720	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
1721	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
1722	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
1713	>	crash_reason,
1714	>	r->pc(), r->lr(), r->ctr(), r->msr(),
1715	>	r->xer(), r->cr(),
1716	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
1717	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
1718	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
1719	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
1720	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
1721	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
1722	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
1723	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
1724		exit(1);
1725		QuitEmulator();
1726		return;
1727		} else {
1728		// We crashed. Save registers, tell tick thread and loop forever
1729	<	sigsegv_regs = *(sigregs *)r;
1729	>	build_sigregs(&sigsegv_regs, r);
1730		emul_thread_fatal = true;
1731		for (;;) ;
1732		}
#	Line 1502 | Line 1738 | rti:;
1738		*  SIGILL handler
1739		*/
1740
1741	<	static void sigill_handler(int sig, sigcontext_struct *sc)
1741	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp)
1742		{
1743	<	pt_regs *r = sc->regs;
1743	>	machine_regs *r = MACHINE_REGISTERS(scp);
1744		char str[256];
1745
1746		// Fault in Mac ROM or RAM?
1747	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1747	>	bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize));
1748		if (mac_fault) {
1749
1750		// Get opcode and divide into fields
1751	<	uint32 opcode = *((uint32 *)r->nip);
1751	>	uint32 opcode = *((uint32 *)r->pc());
1752		uint32 primop = opcode >> 26;
1753		uint32 exop = (opcode >> 1) & 0x3ff;
1754		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1523 | Line 1759 | static void sigill_handler(int sig, sigc
1759		switch (primop) {
1760		case 9:         // POWER instructions
1761		case 22:
1762	<	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->nip, r->gpr[1], opcode);
1762	>	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->pc(), r->gpr(1), opcode);
1763		ErrorAlert(str);
1764		QuitEmulator();
1765		return;
#	Line 1531 | Line 1767 | power_inst:            sprintf(str, GetString(STR_
1767		case 31:
1768		switch (exop) {
1769		case 83:        // mfmsr
1770	<	r->gpr[rd] = 0xf072;
1771	<	r->nip += 4;
1770	>	r->gpr(rd) = 0xf072;
1771	>	r->pc() += 4;
1772		goto rti;
1773
1774		case 210:       // mtsr
1775		case 242:       // mtsrin
1776		case 306:       // tlbie
1777	<	r->nip += 4;
1777	>	r->pc() += 4;
1778		goto rti;
1779
1780		case 339: {     // mfspr
#	Line 1554 | Line 1790 | power_inst:            sprintf(str, GetString(STR_
1790		case 957:       // PMC3
1791		case 958:       // PMC4
1792		case 959:       // SDA
1793	<	r->nip += 4;
1793	>	r->pc() += 4;
1794		goto rti;
1795		case 25:        // SDR1
1796	<	r->gpr[rd] = 0xdead001f;
1797	<	r->nip += 4;
1796	>	r->gpr(rd) = 0xdead001f;
1797	>	r->pc() += 4;
1798		goto rti;
1799		case 287:       // PVR
1800	<	r->gpr[rd] = PVR;
1801	<	r->nip += 4;
1800	>	r->gpr(rd) = PVR;
1801	>	r->pc() += 4;
1802		goto rti;
1803		}
1804		break;
#	Line 1598 | Line 1834 | power_inst:            sprintf(str, GetString(STR_
1834		case 957:       // PMC3
1835		case 958:       // PMC4
1836		case 959:       // SDA
1837	<	r->nip += 4;
1837	>	r->pc() += 4;
1838		goto rti;
1839		}
1840		break;
#	Line 1617 | Line 1853 | power_inst:            sprintf(str, GetString(STR_
1853
1854		// In GUI mode, show error alert
1855		if (!PrefsFindBool("nogui")) {
1856	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
1856	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
1857		ErrorAlert(str);
1858		QuitEmulator();
1859		return;
#	Line 1625 | Line 1861 | power_inst:            sprintf(str, GetString(STR_
1861		}
1862
1863		// For all other errors, jump into debugger (sort of...)
1864	+	crash_reason = "SIGILL";
1865		if (!ready_for_signals) {
1866	<	printf("SIGILL\n");
1867	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
1866	>	printf("%s\n");
1867	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
1868		printf(
1869		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1870		"  xer %08lx     cr %08lx  \n"
#	Line 1639 | Line 1876 | power_inst:            sprintf(str, GetString(STR_
1876		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1877		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1878		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1879	<	r->nip, r->link, r->ctr, r->msr,
1880	<	r->xer, r->ccr,
1881	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
1882	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
1883	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
1884	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
1885	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
1886	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
1887	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
1888	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
1879	>	crash_reason,
1880	>	r->pc(), r->lr(), r->ctr(), r->msr(),
1881	>	r->xer(), r->cr(),
1882	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
1883	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
1884	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
1885	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
1886	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
1887	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
1888	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
1889	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
1890		exit(1);
1891		QuitEmulator();
1892		return;
1893		} else {
1894		// We crashed. Save registers, tell tick thread and loop forever
1895	<	sigsegv_regs = *(sigregs *)r;
1895	>	build_sigregs(&sigsegv_regs, r);
1896		emul_thread_fatal = true;
1897		for (;;) ;
1898		}
#	Line 1664 | Line 1902 | rti:;
1902
1903
1904		/*
1905	+	*  Helpers to share 32-bit addressable data with MacOS
1906	+	*/
1907	+
1908	+	bool SheepMem::Init(void)
1909	+	{
1910	+	// Size of a native page
1911	+	page_size = getpagesize();
1912	+
1913	+	// Allocate SheepShaver globals
1914	+	if (vm_acquire_fixed((char *)base, size) < 0)
1915	+	return false;
1916	+
1917	+	// Allocate page with all bits set to 0
1918	+	zero_page = base + size;
1919	+	if (vm_acquire_fixed((char *)zero_page, page_size) < 0)
1920	+	return false;
1921	+	memset((char *)zero_page, 0, page_size);
1922	+	if (vm_protect((char *)zero_page, page_size, VM_PAGE_READ) < 0)
1923	+	return false;
1924	+
1925	+	#if EMULATED_PPC
1926	+	// Allocate alternate stack for PowerPC interrupt routine
1927	+	sig_stack = zero_page + page_size;
1928	+	if (vm_acquire_fixed((char *)sig_stack, SIG_STACK_SIZE) < 0)
1929	+	return false;
1930	+	#endif
1931	+
1932	+	top = base + size;
1933	+	return true;
1934	+	}
1935	+
1936	+	void SheepMem::Exit(void)
1937	+	{
1938	+	if (top) {
1939	+	// Delete SheepShaver globals
1940	+	vm_release((void *)base, size);
1941	+
1942	+	// Delete zero page
1943	+	vm_release((void *)zero_page, page_size);
1944	+
1945	+	#if EMULATED_PPC
1946	+	// Delete alternate stack for PowerPC interrupt routine
1947	+	vm_release((void *)sig_stack, SIG_STACK_SIZE);
1948	+	#endif
1949	+	}
1950	+	}
1951	+
1952	+
1953	+	/*
1954		*  Display alert
1955		*/
1956

Diff Legend

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