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.19 by gbeauche, 2003-12-05T12:41:19Z vs.
Revision 1.77 by gbeauche, 2006-10-26T05:25:19Z

#	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-2005 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 27 | Line 27
27		*  is slightly different from the SysV ABI used by Linux:
28		*    - Stack frames are different (e.g. LR is stored in 8(r1) under
29		*      MacOS, but in 4(r1) under Linux)
30	<	*    - There is no TOC under Linux; r2 is free for the user
30	>	*    - There is a pointer to Thread Local Storage (TLS) under Linux with
31	>	*      recent enough glibc. This is r2 in 32-bit mode and r13 in
32	>	*      64-bit mode (PowerOpen/AIX ABI)
33		*    - r13 is used as a small data pointer under Linux (but appearently
34		*      it is not used this way? To be sure, we specify -msdata=none
35		*      in the Makefile)
36	<	*    - As there is no TOC, there are also no TVECTs under Linux;
37	<	*      function pointers point directly to the function code
36	>	*    - There are no TVECTs under Linux; function pointers point
37	>	*      directly to the function code
38		*  The Execute*() functions have to account for this. Additionally, we
39		*  cannot simply call MacOS functions by getting their TVECT and jumping
40		*  to it. Such calls are done via the call_macos*() functions in
#	Line 65 | Line 67
67		*  ExecutePPC (or any function that might cause a mode switch). The signal
68		*  stack is restored before exiting the SIGUSR2 handler.
69		*
70	+	*  Note that POSIX standard says you can't modify the alternate
71	+	*  signal stack while the process is executing on it. There is a
72	+	*  hackaround though: we install a trampoline SIGUSR2 handler that
73	+	*  sets up an alternate stack itself and calls the real handler.
74	+	*  Then, when we call sigaltstack() there, we no longer get an EPERM,
75	+	*  i.e. it now works.
76	+	*
77		*  TODO:
78		*    check if SIGSEGV handler works for all registers (including FP!)
79		*/
#	Line 93 | Line 102
102		#include "xpram.h"
103		#include "timer.h"
104		#include "adb.h"
96	–	#include "sony.h"
97	–	#include "disk.h"
98	–	#include "cdrom.h"
99	–	#include "scsi.h"
105		#include "video.h"
101	–	#include "audio.h"
102	–	#include "ether.h"
103	–	#include "serial.h"
104	–	#include "clip.h"
105	–	#include "extfs.h"
106		#include "sys.h"
107		#include "macos_util.h"
108		#include "rom_patches.h"
109		#include "user_strings.h"
110		#include "vm_alloc.h"
111		#include "sigsegv.h"
112	<	#include "thunks.h"
112	>	#include "sigregs.h"
113	>	#include "rpc.h"
114
115		#define DEBUG 0
116		#include "debug.h"
117
118
119	+	#ifdef HAVE_DIRENT_H
120	+	#include <dirent.h>
121	+	#endif
122	+
123	+	#ifdef USE_SDL
124	+	#include <SDL.h>
125	+	#endif
126	+
127	+	#ifndef USE_SDL_VIDEO
128		#include <X11/Xlib.h>
129	+	#endif
130
131		#ifdef ENABLE_GTK
132		#include <gtk/gtk.h>
#	Line 132 | Line 143
143		#endif
144
145
146	+	// Enable emulation of unaligned lmw/stmw?
147	+	#define EMULATE_UNALIGNED_LOADSTORE_MULTIPLE 1
148	+
149		// Enable Execute68k() safety checks?
150		#define SAFE_EXEC_68K 0
151
#	Line 146 | Line 160
160		const char ROM_FILE_NAME[] = "ROM";
161		const char ROM_FILE_NAME2[] = "Mac OS ROM";
162
163	+	#if REAL_ADDRESSING
164		const uintptr RAM_BASE = 0x20000000;            // Base address of RAM
165	<	const uint32 SIG_STACK_SIZE = 0x10000;          // Size of signal stack
166	<
167	<
153	<	#if !EMULATED_PPC
154	<	// Structure in which registers are saved in a signal handler;
155	<	// sigcontext->regs points to it
156	<	// (see arch/ppc/kernel/signal.c)
157	<	typedef struct {
158	<	uint32 u[4];
159	<	} __attribute((aligned(16))) vector128;
160	<	#include <linux/elf.h>
161	<
162	<	struct sigregs {
163	<	elf_gregset_t   gp_regs;                                // Identical to pt_regs
164	<	double                  fp_regs[ELF_NFPREG];    // f0..f31 and fpsrc
165	<	//more (uninteresting) stuff following here
166	<	};
165	>	#else
166	>	// FIXME: needs to be >= 0x04000000
167	>	const uintptr RAM_BASE = 0x10000000;            // Base address of RAM
168		#endif
169	+	const uint32 SIG_STACK_SIZE = 0x10000;          // Size of signal stack
170
171
172		// Global variables (exported)
173		#if !EMULATED_PPC
174	<	void *TOC;                              // Small data pointer (r13)
174	>	void *TOC = NULL;               // Pointer to Thread Local Storage (r2)
175	>	void *R13 = NULL;               // Pointer to .sdata section (r13 under Linux)
176		#endif
177		uint32 RAMBase;                 // Base address of Mac RAM
178		uint32 RAMSize;                 // Size of Mac RAM
179		uint32 KernelDataAddr;  // Address of Kernel Data
180		uint32 BootGlobsAddr;   // Address of BootGlobs structure at top of Mac RAM
181	+	uint32 DRCacheAddr;             // Address of DR Cache
182		uint32 PVR;                             // Theoretical PVR
183		int64 CPUClockSpeed;    // Processor clock speed (Hz)
184		int64 BusClockSpeed;    // Bus clock speed (Hz)
185	+	int64 TimebaseSpeed;    // Timebase clock speed (Hz)
186	+	uint8 *RAMBaseHost;             // Base address of Mac RAM (host address space)
187	+	uint8 *ROMBaseHost;             // Base address of Mac ROM (host address space)
188
189
190		// Global variables
191	+	#ifndef USE_SDL_VIDEO
192		char *x_display_name = NULL;                            // X11 display name
193		Display *x_display = NULL;                                      // X11 display handle
194	+	#ifdef X11_LOCK_TYPE
195	+	X11_LOCK_TYPE x_display_lock = X11_LOCK_INIT; // X11 display lock
196	+	#endif
197	+	#endif
198
199		static int zero_fd = 0;                                         // FD of /dev/zero
200		static bool lm_area_mapped = false;                     // Flag: Low Memory area mmap()ped
201		static int kernel_area = -1;                            // SHM ID of Kernel Data area
202		static bool rom_area_mapped = false;            // Flag: Mac ROM mmap()ped
203		static bool ram_area_mapped = false;            // Flag: Mac RAM mmap()ped
204	+	static bool dr_cache_area_mapped = false;       // Flag: Mac DR Cache mmap()ped
205	+	static bool dr_emulator_area_mapped = false;// Flag: Mac DR Emulator mmap()ped
206		static KernelData *kernel_data;                         // Pointer to Kernel Data
207		static EmulatorData *emulator_data;
208
209		static uint8 last_xpram[XPRAM_SIZE];            // Buffer for monitoring XPRAM changes
210
211		static bool nvram_thread_active = false;        // Flag: NVRAM watchdog installed
212	+	static volatile bool nvram_thread_cancel;       // Flag: Cancel NVRAM thread
213		static pthread_t nvram_thread;                          // NVRAM watchdog
214		static bool tick_thread_active = false;         // Flag: MacOS thread installed
215	+	static volatile bool tick_thread_cancel;        // Flag: Cancel 60Hz thread
216		static pthread_t tick_thread;                           // 60Hz thread
217		static pthread_t emul_thread;                           // MacOS thread
218
#	Line 204 | Line 220 | static bool ready_for_signals = false;
220		static int64 num_segv = 0;                                      // Number of handled SEGV signals
221
222		static struct sigaction sigusr2_action;         // Interrupt signal (of emulator thread)
223	<	#if !EMULATED_PPC
223	>	#if EMULATED_PPC
224	>	static uintptr sig_stack = 0;                           // Stack for PowerPC interrupt routine
225	>	#else
226		static struct sigaction sigsegv_action;         // Data access exception signal (of emulator thread)
227		static struct sigaction sigill_action;          // Illegal instruction signal (of emulator thread)
228	<	static void *sig_stack = NULL;                          // Stack for signal handlers
229	<	static void *extra_stack = NULL;                        // Stack for SIGSEGV inside interrupt handler
228	>	static struct sigaltstack sig_stack;            // Stack for signal handlers
229	>	static struct sigaltstack extra_stack;          // Stack for SIGSEGV inside interrupt handler
230		static bool emul_thread_fatal = false;          // Flag: MacOS thread crashed, tick thread shall dump debug output
231		static sigregs sigsegv_regs;                            // Register dump when crashed
232	+	static const char *crash_reason = NULL;         // Reason of the crash (SIGSEGV, SIGBUS, SIGILL)
233		#endif
234
235	+	static rpc_connection_t *gui_connection = NULL; // RPC connection to the GUI
236	+	static const char *gui_connection_path = NULL;  // GUI connection identifier
237	+
238	+	uint32  SheepMem::page_size;                            // Size of a native page
239		uintptr SheepMem::zero_page = 0;                        // Address of ro page filled in with zeros
240		uintptr SheepMem::base = 0x60000000;            // Address of SheepShaver data
241	<	uintptr SheepMem::top = 0;                                      // Top of SheepShaver data (stack like storage)
241	>	uintptr SheepMem::proc;                                         // Bottom address of SheepShave procedures
242	>	uintptr SheepMem::data;                                         // Top of SheepShaver data (stack like storage)
243
244
245		// Prototypes
246	+	static bool kernel_data_init(void);
247	+	static void kernel_data_exit(void);
248		static void Quit(void);
249		static void *emul_func(void *arg);
250		static void *nvram_func(void *arg);
251		static void *tick_func(void *arg);
252		#if EMULATED_PPC
227	–	static void sigusr2_handler(int sig);
253		extern void emul_ppc(uint32 start);
254		extern void init_emul_ppc(void);
255		extern void exit_emul_ppc(void);
256	+	sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
257		#else
258	<	static void sigusr2_handler(int sig, sigcontext_struct *sc);
259	<	static void sigsegv_handler(int sig, sigcontext_struct *sc);
260	<	static void sigill_handler(int sig, sigcontext_struct *sc);
258	>	extern "C" void sigusr2_handler_init(int sig, siginfo_t *sip, void *scp);
259	>	extern "C" void sigusr2_handler(int sig, siginfo_t *sip, void *scp);
260	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp);
261	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp);
262		#endif
263
264
265		// From asm_linux.S
266		#if !EMULATED_PPC
240	–	extern "C" void *get_toc(void);
267		extern "C" void *get_sp(void);
268	<	extern "C" void flush_icache_range(void *start, void *end);
268	>	extern "C" void *get_r2(void);
269	>	extern "C" void set_r2(void *);
270	>	extern "C" void *get_r13(void);
271	>	extern "C" void set_r13(void *);
272	>	extern "C" void flush_icache_range(uint32 start, uint32 end);
273		extern "C" void jump_to_rom(uint32 entry, uint32 context);
274		extern "C" void quit_emulator(void);
275		extern "C" void execute_68k(uint32 pc, M68kRegisters *r);
#	Line 253 | Line 283 | extern void paranoia_check(void);
283
284		#if EMULATED_PPC
285		/*
286	+	*  Return signal stack base
287	+	*/
288	+
289	+	uintptr SignalStackBase(void)
290	+	{
291	+	return sig_stack + SIG_STACK_SIZE;
292	+	}
293	+
294	+
295	+	/*
296		*  Atomic operations
297		*/
298
#	Line 293 | Line 333 | int atomic_or(int *var, int v)
333
334
335		/*
336	+	*  Memory management helpers
337	+	*/
338	+
339	+	static inline int vm_mac_acquire(uint32 addr, uint32 size)
340	+	{
341	+	return vm_acquire_fixed(Mac2HostAddr(addr), size);
342	+	}
343	+
344	+	static inline int vm_mac_release(uint32 addr, uint32 size)
345	+	{
346	+	return vm_release(Mac2HostAddr(addr), size);
347	+	}
348	+
349	+
350	+	/*
351		*  Main program
352		*/
353
#	Line 308 | Line 363 | static void usage(const char *prg_name)
363		int main(int argc, char **argv)
364		{
365		char str[256];
311	–	uint32 *boot_globs;
312	–	int16 i16;
366		int rom_fd;
367		FILE *proc_file;
368		const char *rom_path;
369		uint32 rom_size, actual;
370		uint8 *rom_tmp;
371		time_t now, expire;
372	+	bool memory_mapped_from_zero;
373
374		// Initialize variables
375		RAMBase = 0;
#	Line 326 | Line 380 | int main(int argc, char **argv)
380		printf(" %s\n", GetString(STR_ABOUT_TEXT2));
381
382		#if !EMULATED_PPC
383	+	#ifdef SYSTEM_CLOBBERS_R2
384		// Get TOC pointer
385	<	TOC = get_toc();
385	>	TOC = get_r2();
386	>	#endif
387	>	#ifdef SYSTEM_CLOBBERS_R13
388	>	// Get r13 register
389	>	R13 = get_r13();
390		#endif
332	–
333	–	#ifdef ENABLE_GTK
334	–	// Init GTK
335	–	gtk_set_locale();
336	–	gtk_init(&argc, &argv);
391		#endif
338	–
339	–	// Read preferences
340	–	PrefsInit(argc, argv);
392
393		// Parse command line arguments
394		for (int i=1; i<argc; i++) {
395		if (strcmp(argv[i], "--help") == 0) {
396		usage(argv[0]);
397	+	#ifndef USE_SDL_VIDEO
398		} else if (strcmp(argv[i], "--display") == 0) {
399		i++;
400		if (i < argc)
401		x_display_name = strdup(argv[i]);
402	<	} else if (argv[i][0] == '-') {
402	>	#endif
403	>	} else if (strcmp(argv[i], "--gui-connection") == 0) {
404	>	argv[i++] = NULL;
405	>	if (i < argc) {
406	>	gui_connection_path = argv[i];
407	>	argv[i] = NULL;
408	>	}
409	>	}
410	>	}
411	>
412	>	// Remove processed arguments
413	>	for (int i=1; i<argc; i++) {
414	>	int k;
415	>	for (k=i; k<argc; k++)
416	>	if (argv[k] != NULL)
417	>	break;
418	>	if (k > i) {
419	>	k -= i;
420	>	for (int j=i+k; j<argc; j++)
421	>	argv[j-k] = argv[j];
422	>	argc -= k;
423	>	}
424	>	}
425	>
426	>	// Connect to the external GUI
427	>	if (gui_connection_path) {
428	>	if ((gui_connection = rpc_init_client(gui_connection_path)) == NULL) {
429	>	fprintf(stderr, "Failed to initialize RPC client connection to the GUI\n");
430	>	return 1;
431	>	}
432	>	}
433	>
434	>	#ifdef ENABLE_GTK
435	>	if (!gui_connection) {
436	>	// Init GTK
437	>	gtk_set_locale();
438	>	gtk_init(&argc, &argv);
439	>	}
440	>	#endif
441	>
442	>	// Read preferences
443	>	PrefsInit(argc, argv);
444	>
445	>	// Any command line arguments left?
446	>	for (int i=1; i<argc; i++) {
447	>	if (argv[i][0] == '-') {
448		fprintf(stderr, "Unrecognized option '%s'\n", argv[i]);
449		usage(argv[0]);
450		}
451		}
452
453	+	#ifdef USE_SDL
454	+	// Initialize SDL system
455	+	int sdl_flags = 0;
456	+	#ifdef USE_SDL_VIDEO
457	+	sdl_flags |= SDL_INIT_VIDEO;
458	+	#endif
459	+	#ifdef USE_SDL_AUDIO
460	+	sdl_flags |= SDL_INIT_AUDIO;
461	+	#endif
462	+	assert(sdl_flags != 0);
463	+	if (SDL_Init(sdl_flags) == -1) {
464	+	char str[256];
465	+	sprintf(str, "Could not initialize SDL: %s.\n", SDL_GetError());
466	+	ErrorAlert(str);
467	+	goto quit;
468	+	}
469	+	atexit(SDL_Quit);
470	+
471	+	// Don't let SDL catch SIGINT and SIGTERM signals
472	+	signal(SIGINT, SIG_DFL);
473	+	signal(SIGTERM, SIG_DFL);
474	+	#endif
475	+
476	+	#ifndef USE_SDL_VIDEO
477		// Open display
478		x_display = XOpenDisplay(x_display_name);
479		if (x_display == NULL) {
#	Line 366 | Line 487 | int main(int argc, char **argv)
487		// Fork out, so we can return from fullscreen mode when things get ugly
488		XF86DGAForkApp(DefaultScreen(x_display));
489		#endif
490	+	#endif
491
492		#ifdef ENABLE_MON
493		// Initialize mon
494		mon_init();
495		#endif
496
497	+	#if !EMULATED_PPC
498	+	// Create and install stacks for signal handlers
499	+	sig_stack.ss_sp = malloc(SIG_STACK_SIZE);
500	+	D(bug("Signal stack at %p\n", sig_stack.ss_sp));
501	+	if (sig_stack.ss_sp == NULL) {
502	+	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
503	+	goto quit;
504	+	}
505	+	sig_stack.ss_flags = 0;
506	+	sig_stack.ss_size = SIG_STACK_SIZE;
507	+	if (sigaltstack(&sig_stack, NULL) < 0) {
508	+	sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno));
509	+	ErrorAlert(str);
510	+	goto quit;
511	+	}
512	+	extra_stack.ss_sp = malloc(SIG_STACK_SIZE);
513	+	D(bug("Extra stack at %p\n", extra_stack.ss_sp));
514	+	if (extra_stack.ss_sp == NULL) {
515	+	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
516	+	goto quit;
517	+	}
518	+	extra_stack.ss_flags = 0;
519	+	extra_stack.ss_size = SIG_STACK_SIZE;
520	+	#endif
521	+
522	+	#if !EMULATED_PPC
523	+	// Install SIGSEGV and SIGBUS handlers
524	+	sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
525	+	sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
526	+	sigsegv_action.sa_sigaction = sigsegv_handler;
527	+	sigsegv_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
528	+	#ifdef HAVE_SIGNAL_SA_RESTORER
529	+	sigsegv_action.sa_restorer = NULL;
530	+	#endif
531	+	if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
532	+	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGSEGV", strerror(errno));
533	+	ErrorAlert(str);
534	+	goto quit;
535	+	}
536	+	if (sigaction(SIGBUS, &sigsegv_action, NULL) < 0) {
537	+	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGBUS", strerror(errno));
538	+	ErrorAlert(str);
539	+	goto quit;
540	+	}
541	+	#else
542	+	// Install SIGSEGV handler for CPU emulator
543	+	if (!sigsegv_install_handler(sigsegv_handler)) {
544	+	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGSEGV", strerror(errno));
545	+	ErrorAlert(str);
546	+	goto quit;
547	+	}
548	+	#endif
549	+
550	+	// Initialize VM system
551	+	vm_init();
552	+
553		// Get system info
554		PVR = 0x00040000;                       // Default: 604
555		CPUClockSpeed = 100000000;      // Default: 100MHz
556		BusClockSpeed = 100000000;      // Default: 100MHz
557	<	#if !EMULATED_PPC
557	>	TimebaseSpeed =  25000000;      // Default:  25MHz
558	>	#if EMULATED_PPC
559	>	PVR = 0x000c0000;                       // Default: 7400 (with AltiVec)
560	>	#elif defined(__APPLE__) && defined(__MACH__)
561	>	proc_file = popen("ioreg -c IOPlatformDevice", "r");
562	>	if (proc_file) {
563	>	char line[256];
564	>	bool powerpc_node = false;
565	>	while (fgets(line, sizeof(line) - 1, proc_file)) {
566	>	// Read line
567	>	int len = strlen(line);
568	>	if (len == 0)
569	>	continue;
570	>	line[len - 1] = 0;
571	>
572	>	// Parse line
573	>	if (strstr(line, "o PowerPC,"))
574	>	powerpc_node = true;
575	>	else if (powerpc_node) {
576	>	uint32 value;
577	>	char head[256];
578	>	if (sscanf(line, "%[ |]\"cpu-version\" = <%x>", head, &value) == 2)
579	>	PVR = value;
580	>	else if (sscanf(line, "%[ |]\"clock-frequency\" = <%x>", head, &value) == 2)
581	>	CPUClockSpeed = value;
582	>	else if (sscanf(line, "%[ |]\"bus-frequency\" = <%x>", head, &value) == 2)
583	>	BusClockSpeed = value;
584	>	else if (sscanf(line, "%[ |]\"timebase-frequency\" = <%x>", head, &value) == 2)
585	>	TimebaseSpeed = value;
586	>	else if (strchr(line, '}'))
587	>	powerpc_node = false;
588	>	}
589	>	}
590	>	fclose(proc_file);
591	>	} else {
592	>	sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
593	>	WarningAlert(str);
594	>	}
595	>	#else
596		proc_file = fopen("/proc/cpuinfo", "r");
597		if (proc_file) {
598	+	// CPU specs from Linux kernel
599	+	// TODO: make it more generic with features (e.g. AltiVec) and
600	+	// cache information and friends for NameRegistry
601	+	static const struct {
602	+	uint32 pvr_mask;
603	+	uint32 pvr_value;
604	+	const char *cpu_name;
605	+	}
606	+	cpu_specs[] = {
607	+	{ 0xffff0000, 0x00010000, "601" },
608	+	{ 0xffff0000, 0x00030000, "603" },
609	+	{ 0xffff0000, 0x00060000, "603e" },
610	+	{ 0xffff0000, 0x00070000, "603ev" },
611	+	{ 0xffff0000, 0x00040000, "604" },
612	+	{ 0xfffff000, 0x00090000, "604e" },
613	+	{ 0xffff0000, 0x00090000, "604r" },
614	+	{ 0xffff0000, 0x000a0000, "604ev" },
615	+	{ 0xffffffff, 0x00084202, "740/750" },
616	+	{ 0xfffff000, 0x00083000, "745/755" },
617	+	{ 0xfffffff0, 0x00080100, "750CX" },
618	+	{ 0xfffffff0, 0x00082200, "750CX" },
619	+	{ 0xfffffff0, 0x00082210, "750CXe" },
620	+	{ 0xffffff00, 0x70000100, "750FX" },
621	+	{ 0xffffffff, 0x70000200, "750FX" },
622	+	{ 0xffff0000, 0x70000000, "750FX" },
623	+	{ 0xffff0000, 0x70020000, "750GX" },
624	+	{ 0xffff0000, 0x00080000, "740/750" },
625	+	{ 0xffffffff, 0x000c1101, "7400 (1.1)" },
626	+	{ 0xffff0000, 0x000c0000, "7400" },
627	+	{ 0xffff0000, 0x800c0000, "7410" },
628	+	{ 0xffffffff, 0x80000200, "7450" },
629	+	{ 0xffffffff, 0x80000201, "7450" },
630	+	{ 0xffff0000, 0x80000000, "7450" },
631	+	{ 0xffffff00, 0x80010100, "7455" },
632	+	{ 0xffffffff, 0x80010200, "7455" },
633	+	{ 0xffff0000, 0x80010000, "7455" },
634	+	{ 0xffff0000, 0x80020000, "7457" },
635	+	{ 0xffff0000, 0x80030000, "7447A" },
636	+	{ 0xffff0000, 0x80040000, "7448" },
637	+	{ 0x7fff0000, 0x00810000, "82xx" },
638	+	{ 0x7fff0000, 0x00820000, "8280" },
639	+	{ 0xffff0000, 0x00400000, "Power3 (630)" },
640	+	{ 0xffff0000, 0x00410000, "Power3 (630+)" },
641	+	{ 0xffff0000, 0x00360000, "I-star" },
642	+	{ 0xffff0000, 0x00370000, "S-star" },
643	+	{ 0xffff0000, 0x00350000, "Power4" },
644	+	{ 0xffff0000, 0x00390000, "PPC970" },
645	+	{ 0xffff0000, 0x003c0000, "PPC970FX" },
646	+	{ 0xffff0000, 0x003a0000, "POWER5 (gr)" },
647	+	{ 0xffff0000, 0x003b0000, "POWER5+ (gs)" },
648	+	{ 0xffff0000, 0x003e0000, "POWER6" },
649	+	{ 0xffff0000, 0x00700000, "Cell Broadband Engine" },
650	+	{ 0x7fff0000, 0x00900000, "PA6T" },
651	+	{ 0, 0, 0 }
652	+	};
653	+
654		char line[256];
655		while(fgets(line, 255, proc_file)) {
656		// Read line
#	Line 389 | Line 661 | int main(int argc, char **argv)
661
662		// Parse line
663		int i;
664	+	float f;
665		char value[256];
666	<	if (sscanf(line, "cpu : %s", value) == 1) {
667	<	if (strcmp(value, "601") == 0)
668	<	PVR = 0x00010000;
669	<	else if (strcmp(value, "603") == 0)
670	<	PVR = 0x00030000;
671	<	else if (strcmp(value, "604") == 0)
672	<	PVR = 0x00040000;
673	<	else if (strcmp(value, "603e") == 0)
674	<	PVR = 0x00060000;
675	<	else if (strcmp(value, "603ev") == 0)
676	<	PVR = 0x00070000;
404	<	else if (strcmp(value, "604e") == 0)
405	<	PVR = 0x00090000;
406	<	else if (strcmp(value, "604ev5") == 0)
407	<	PVR = 0x000a0000;
408	<	else if (strcmp(value, "750") == 0)
409	<	PVR = 0x00080000;
410	<	else if (strcmp(value, "821") == 0)
411	<	PVR = 0x00320000;
412	<	else if (strcmp(value, "860") == 0)
413	<	PVR = 0x00500000;
414	<	else
666	>	if (sscanf(line, "cpu : %[^,]", value) == 1) {
667	>	// Search by name
668	>	const char *cpu_name = NULL;
669	>	for (int i = 0; cpu_specs[i].pvr_mask != 0; i++) {
670	>	if (strcmp(cpu_specs[i].cpu_name, value) == 0) {
671	>	cpu_name = cpu_specs[i].cpu_name;
672	>	PVR = cpu_specs[i].pvr_value;
673	>	break;
674	>	}
675	>	}
676	>	if (cpu_name == NULL)
677		printf("WARNING: Unknown CPU type '%s', assuming 604\n", value);
678	+	else
679	+	printf("Found a PowerPC %s processor\n", cpu_name);
680		}
681	<	if (sscanf(line, "clock : %dMHz", &i) == 1)
681	>	if (sscanf(line, "clock : %fMHz", &f) == 1)
682	>	CPUClockSpeed = BusClockSpeed = ((int64)f) * 1000000;
683	>	else if (sscanf(line, "clock : %dMHz", &i) == 1)
684		CPUClockSpeed = BusClockSpeed = i * 1000000;
685		}
686		fclose(proc_file);
#	Line 422 | Line 688 | int main(int argc, char **argv)
688		sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
689		WarningAlert(str);
690		}
691	+
692	+	// Get actual bus frequency
693	+	proc_file = fopen("/proc/device-tree/clock-frequency", "r");
694	+	if (proc_file) {
695	+	union { uint8 b[4]; uint32 l; } value;
696	+	if (fread(value.b, sizeof(value), 1, proc_file) == 1)
697	+	BusClockSpeed = value.l;
698	+	fclose(proc_file);
699	+	}
700	+
701	+	// Get actual timebase frequency
702	+	TimebaseSpeed = BusClockSpeed / 4;
703	+	DIR *cpus_dir;
704	+	if ((cpus_dir = opendir("/proc/device-tree/cpus")) != NULL) {
705	+	struct dirent *cpu_entry;
706	+	while ((cpu_entry = readdir(cpus_dir)) != NULL) {
707	+	if (strstr(cpu_entry->d_name, "PowerPC,") == cpu_entry->d_name) {
708	+	char timebase_freq_node[256];
709	+	sprintf(timebase_freq_node, "/proc/device-tree/cpus/%s/timebase-frequency", cpu_entry->d_name);
710	+	proc_file = fopen(timebase_freq_node, "r");
711	+	if (proc_file) {
712	+	union { uint8 b[4]; uint32 l; } value;
713	+	if (fread(value.b, sizeof(value), 1, proc_file) == 1)
714	+	TimebaseSpeed = value.l;
715	+	fclose(proc_file);
716	+	}
717	+	}
718	+	}
719	+	closedir(cpus_dir);
720	+	}
721		#endif
722	+	// Remap any newer G4/G5 processor to plain G4 for compatibility
723	+	switch (PVR >> 16) {
724	+	case 0x8000:                            // 7450
725	+	case 0x8001:                            // 7455
726	+	case 0x8002:                            // 7457
727	+	case 0x8003:                            // 7447A
728	+	case 0x8004:                            // 7448
729	+	case 0x0039:                            //  970
730	+	case 0x003c:                            //  970FX
731	+	PVR = 0x000c0000;               // 7400
732	+	break;
733	+	}
734		D(bug("PVR: %08x (assumed)\n", PVR));
735
736		// Init system routines
#	Line 446 | Line 754 | int main(int argc, char **argv)
754		goto quit;
755		}
756
757	<	// Create Low Memory area (0x0000..0x3000)
758	<	if (vm_acquire_fixed((char *)0, 0x3000) < 0) {
451	<	sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
452	<	ErrorAlert(str);
757	>	// Create areas for Kernel Data
758	>	if (!kernel_data_init())
759		goto quit;
760	<	}
761	<	lm_area_mapped = true;
760	>	kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE);
761	>	emulator_data = &kernel_data->ed;
762	>	KernelDataAddr = KERNEL_DATA_BASE;
763	>	D(bug("Kernel Data at %p (%08x)\n", kernel_data, KERNEL_DATA_BASE));
764	>	D(bug("Emulator Data at %p (%08x)\n", emulator_data, KERNEL_DATA_BASE + offsetof(KernelData, ed)));
765
766	<	// Create areas for Kernel Data
767	<	kernel_area = shmget(IPC_PRIVATE, KERNEL_AREA_SIZE, 0600);
768	<	if (kernel_area == -1) {
460	<	sprintf(str, GetString(STR_KD_SHMGET_ERR), strerror(errno));
766	>	// Create area for DR Cache
767	>	if (vm_mac_acquire(DR_EMULATOR_BASE, DR_EMULATOR_SIZE) < 0) {
768	>	sprintf(str, GetString(STR_DR_EMULATOR_MMAP_ERR), strerror(errno));
769		ErrorAlert(str);
770		goto quit;
771		}
772	<	if (shmat(kernel_area, (void *)KERNEL_DATA_BASE, 0) < 0) {
773	<	sprintf(str, GetString(STR_KD_SHMAT_ERR), strerror(errno));
772	>	dr_emulator_area_mapped = true;
773	>	if (vm_mac_acquire(DR_CACHE_BASE, DR_CACHE_SIZE) < 0) {
774	>	sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno));
775		ErrorAlert(str);
776		goto quit;
777		}
778	<	if (shmat(kernel_area, (void *)KERNEL_DATA2_BASE, 0) < 0) {
779	<	sprintf(str, GetString(STR_KD2_SHMAT_ERR), strerror(errno));
778	>	dr_cache_area_mapped = true;
779	>	#if !EMULATED_PPC
780	>	if (vm_protect((char *)DR_CACHE_BASE, DR_CACHE_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
781	>	sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno));
782		ErrorAlert(str);
783		goto quit;
784		}
785	<	kernel_data = (KernelData *)KERNEL_DATA_BASE;
786	<	emulator_data = &kernel_data->ed;
787	<	KernelDataAddr = KERNEL_DATA_BASE;
477	<	D(bug("Kernel Data at %p, Emulator Data at %p\n", kernel_data, emulator_data));
785	>	#endif
786	>	DRCacheAddr = DR_CACHE_BASE;
787	>	D(bug("DR Cache at %p\n", DRCacheAddr));
788
789		// Create area for SheepShaver data
790		if (!SheepMem::Init()) {
#	Line 484 | Line 794 | int main(int argc, char **argv)
794		}
795
796		// Create area for Mac ROM
797	<	if (vm_acquire_fixed((char *)ROM_BASE, ROM_AREA_SIZE) < 0) {
797	>	if (vm_mac_acquire(ROM_BASE, ROM_AREA_SIZE) < 0) {
798		sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
799		ErrorAlert(str);
800		goto quit;
801		}
802	<	#if !EMULATED_PPC || defined(__powerpc__)
803	<	if (vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
802	>	ROMBaseHost = Mac2HostAddr(ROM_BASE);
803	>	#if !EMULATED_PPC
804	>	if (vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
805		sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
806		ErrorAlert(str);
807		goto quit;
808		}
809		#endif
810		rom_area_mapped = true;
811	<	D(bug("ROM area at %08x\n", ROM_BASE));
811	>	D(bug("ROM area at %p (%08x)\n", ROMBaseHost, ROM_BASE));
812
813		// Create area for Mac RAM
814		RAMSize = PrefsFindInt32("ramsize");
#	Line 505 | Line 816 | int main(int argc, char **argv)
816		WarningAlert(GetString(STR_SMALL_RAM_WARN));
817		RAMSize = 8*1024*1024;
818		}
819	<
820	<	if (vm_acquire_fixed((char *)RAM_BASE, RAMSize) < 0) {
821	<	sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
822	<	ErrorAlert(str);
823	<	goto quit;
819	>	memory_mapped_from_zero = false;
820	>	#if REAL_ADDRESSING && HAVE_LINKER_SCRIPT
821	>	if (vm_mac_acquire(0, RAMSize) == 0) {
822	>	D(bug("Could allocate RAM from 0x0000\n"));
823	>	RAMBase = 0;
824	>	memory_mapped_from_zero = true;
825		}
826	+	#endif
827	+	if (!memory_mapped_from_zero) {
828	+	#ifndef PAGEZERO_HACK
829	+	// Create Low Memory area (0x0000..0x3000)
830	+	if (vm_mac_acquire(0, 0x3000) < 0) {
831	+	sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
832	+	ErrorAlert(str);
833	+	goto quit;
834	+	}
835	+	lm_area_mapped = true;
836	+	#endif
837	+	if (vm_mac_acquire(RAM_BASE, RAMSize) < 0) {
838	+	sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
839	+	ErrorAlert(str);
840	+	goto quit;
841	+	}
842	+	RAMBase = RAM_BASE;
843	+	}
844	+	RAMBaseHost = Mac2HostAddr(RAMBase);
845		#if !EMULATED_PPC
846	<	if (vm_protect((char *)RAM_BASE, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
846	>	if (vm_protect(RAMBaseHost, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
847		sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
848		ErrorAlert(str);
849		goto quit;
850		}
851		#endif
521	–	RAMBase = RAM_BASE;
852		ram_area_mapped = true;
853	<	D(bug("RAM area at %08x\n", RAMBase));
853	>	D(bug("RAM area at %p (%08x)\n", RAMBaseHost, RAMBase));
854
855		if (RAMBase > ROM_BASE) {
856		ErrorAlert(GetString(STR_RAM_HIGHER_THAN_ROM_ERR));
#	Line 556 | Line 886 | int main(int argc, char **argv)
886		}
887		delete[] rom_tmp;
888
889	<	// Load NVRAM
890	<	XPRAMInit();
561	<
562	<	// Set boot volume
563	<	i16 = PrefsFindInt32("bootdrive");
564	<	XPRAM[0x1378] = i16 >> 8;
565	<	XPRAM[0x1379] = i16 & 0xff;
566	<	i16 = PrefsFindInt32("bootdriver");
567	<	XPRAM[0x137a] = i16 >> 8;
568	<	XPRAM[0x137b] = i16 & 0xff;
569	<
570	<	// Create BootGlobs at top of Mac memory
571	<	memset((void *)(RAMBase + RAMSize - 4096), 0, 4096);
572	<	BootGlobsAddr = RAMBase + RAMSize - 0x1c;
573	<	boot_globs = (uint32 *)BootGlobsAddr;
574	<	boot_globs[-5] = htonl(RAMBase + RAMSize);      // MemTop
575	<	boot_globs[0] = htonl(RAMBase);                         // First RAM bank
576	<	boot_globs[1] = htonl(RAMSize);
577	<	boot_globs[2] = htonl((uint32)-1);                      // End of bank table
578	<
579	<	// Init thunks
580	<	if (!ThunksInit())
889	>	// Initialize everything
890	>	if (!InitAll())
891		goto quit;
892	<
583	<	// Init drivers
584	<	SonyInit();
585	<	DiskInit();
586	<	CDROMInit();
587	<	SCSIInit();
588	<
589	<	// Init external file system
590	<	ExtFSInit();
591	<
592	<	// Init audio
593	<	AudioInit();
594	<
595	<	// Init network
596	<	EtherInit();
597	<
598	<	// Init serial ports
599	<	SerialInit();
600	<
601	<	// Init Time Manager
602	<	TimerInit();
603	<
604	<	// Init clipboard
605	<	ClipInit();
606	<
607	<	// Init video
608	<	if (!VideoInit())
609	<	goto quit;
610	<
611	<	// Install ROM patches
612	<	if (!PatchROM()) {
613	<	ErrorAlert(GetString(STR_UNSUPPORTED_ROM_TYPE_ERR));
614	<	goto quit;
615	<	}
892	>	D(bug("Initialization complete\n"));
893
894		// Clear caches (as we loaded and patched code) and write protect ROM
895		#if !EMULATED_PPC
896	<	MakeExecutable(0, (void *)ROM_BASE, ROM_AREA_SIZE);
620	<	#endif
621	<	vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_EXECUTE);
622	<
623	<	// Initialize Kernel Data
624	<	memset(kernel_data, 0, sizeof(KernelData));
625	<	if (ROMType == ROMTYPE_NEWWORLD) {
626	<	uintptr of_dev_tree = SheepMem::Reserve(4 * sizeof(uint32));
627	<	memset((void *)of_dev_tree, 0, 4 * sizeof(uint32));
628	<	uintptr vector_lookup_tbl = SheepMem::Reserve(128);
629	<	uintptr vector_mask_tbl = SheepMem::Reserve(64);
630	<	memset((uint8 *)kernel_data + 0xb80, 0x3d, 0x80);
631	<	memset((void *)vector_lookup_tbl, 0, 128);
632	<	memset((void *)vector_mask_tbl, 0, 64);
633	<	kernel_data->v[0xb80 >> 2] = htonl(ROM_BASE);
634	<	kernel_data->v[0xb84 >> 2] = htonl(of_dev_tree);                        // OF device tree base
635	<	kernel_data->v[0xb90 >> 2] = htonl(vector_lookup_tbl);
636	<	kernel_data->v[0xb94 >> 2] = htonl(vector_mask_tbl);
637	<	kernel_data->v[0xb98 >> 2] = htonl(ROM_BASE);                           // OpenPIC base
638	<	kernel_data->v[0xbb0 >> 2] = htonl(0);                                          // ADB base
639	<	kernel_data->v[0xc20 >> 2] = htonl(RAMSize);
640	<	kernel_data->v[0xc24 >> 2] = htonl(RAMSize);
641	<	kernel_data->v[0xc30 >> 2] = htonl(RAMSize);
642	<	kernel_data->v[0xc34 >> 2] = htonl(RAMSize);
643	<	kernel_data->v[0xc38 >> 2] = htonl(0x00010020);
644	<	kernel_data->v[0xc3c >> 2] = htonl(0x00200001);
645	<	kernel_data->v[0xc40 >> 2] = htonl(0x00010000);
646	<	kernel_data->v[0xc50 >> 2] = htonl(RAMBase);
647	<	kernel_data->v[0xc54 >> 2] = htonl(RAMSize);
648	<	kernel_data->v[0xf60 >> 2] = htonl(PVR);
649	<	kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed);
650	<	kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed);
651	<	kernel_data->v[0xf6c >> 2] = htonl(CPUClockSpeed);
652	<	} else {
653	<	kernel_data->v[0xc80 >> 2] = htonl(RAMSize);
654	<	kernel_data->v[0xc84 >> 2] = htonl(RAMSize);
655	<	kernel_data->v[0xc90 >> 2] = htonl(RAMSize);
656	<	kernel_data->v[0xc94 >> 2] = htonl(RAMSize);
657	<	kernel_data->v[0xc98 >> 2] = htonl(0x00010020);
658	<	kernel_data->v[0xc9c >> 2] = htonl(0x00200001);
659	<	kernel_data->v[0xca0 >> 2] = htonl(0x00010000);
660	<	kernel_data->v[0xcb0 >> 2] = htonl(RAMBase);
661	<	kernel_data->v[0xcb4 >> 2] = htonl(RAMSize);
662	<	kernel_data->v[0xf80 >> 2] = htonl(PVR);
663	<	kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed);
664	<	kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed);
665	<	kernel_data->v[0xf8c >> 2] = htonl(CPUClockSpeed);
666	<	}
667	<
668	<	// Initialize extra low memory
669	<	D(bug("Initializing Low Memory...\n"));
670	<	memset(NULL, 0, 0x3000);
671	<	WriteMacInt32(XLM_SIGNATURE, FOURCC('B','a','a','h'));                  // Signature to detect SheepShaver
672	<	WriteMacInt32(XLM_KERNEL_DATA, KernelDataAddr);                                 // For trap replacement routines
673	<	WriteMacInt32(XLM_PVR, PVR);                                                                    // Theoretical PVR
674	<	WriteMacInt32(XLM_BUS_CLOCK, BusClockSpeed);                                    // For DriverServicesLib patch
675	<	WriteMacInt16(XLM_EXEC_RETURN_OPCODE, M68K_EXEC_RETURN);                // For Execute68k() (RTS from the executed 68k code will jump here and end 68k mode)
676	<	WriteMacInt32(XLM_ZERO_PAGE, SheepMem::ZeroPage());                             // Pointer to read-only page with all bits set to 0
677	<	#if !EMULATED_PPC
678	<	WriteMacInt32(XLM_TOC, (uint32)TOC);                                                            // TOC pointer of emulator
896	>	flush_icache_range(ROM_BASE, ROM_BASE + ROM_AREA_SIZE);
897		#endif
898	<	WriteMacInt32(XLM_ETHER_INIT, NativeFunction(NATIVE_ETHER_INIT));       // DLPI ethernet driver functions
681	<	WriteMacInt32(XLM_ETHER_TERM, NativeFunction(NATIVE_ETHER_TERM));
682	<	WriteMacInt32(XLM_ETHER_OPEN, NativeFunction(NATIVE_ETHER_OPEN));
683	<	WriteMacInt32(XLM_ETHER_CLOSE, NativeFunction(NATIVE_ETHER_CLOSE));
684	<	WriteMacInt32(XLM_ETHER_WPUT, NativeFunction(NATIVE_ETHER_WPUT));
685	<	WriteMacInt32(XLM_ETHER_RSRV, NativeFunction(NATIVE_ETHER_RSRV));
686	<	WriteMacInt32(XLM_VIDEO_DOIO, NativeFunction(NATIVE_VIDEO_DO_DRIVER_IO));
687	<	D(bug("Low Memory initialized\n"));
898	>	vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_EXECUTE);
899
900		// Start 60Hz thread
901	+	tick_thread_cancel = false;
902		tick_thread_active = (pthread_create(&tick_thread, NULL, tick_func, NULL) == 0);
903		D(bug("Tick thread installed (%ld)\n", tick_thread));
904
905		// Start NVRAM watchdog thread
906		memcpy(last_xpram, XPRAM, XPRAM_SIZE);
907	+	nvram_thread_cancel = false;
908		nvram_thread_active = (pthread_create(&nvram_thread, NULL, nvram_func, NULL) == 0);
909		D(bug("NVRAM thread installed (%ld)\n", nvram_thread));
910
911		#if !EMULATED_PPC
699	–	// Create and install stacks for signal handlers
700	–	sig_stack = malloc(SIG_STACK_SIZE);
701	–	D(bug("Signal stack at %p\n", sig_stack));
702	–	if (sig_stack == NULL) {
703	–	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
704	–	goto quit;
705	–	}
706	–	extra_stack = malloc(SIG_STACK_SIZE);
707	–	D(bug("Extra stack at %p\n", extra_stack));
708	–	if (extra_stack == NULL) {
709	–	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
710	–	goto quit;
711	–	}
712	–	struct sigaltstack new_stack;
713	–	new_stack.ss_sp = sig_stack;
714	–	new_stack.ss_flags = 0;
715	–	new_stack.ss_size = SIG_STACK_SIZE;
716	–	if (sigaltstack(&new_stack, NULL) < 0) {
717	–	sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno));
718	–	ErrorAlert(str);
719	–	goto quit;
720	–	}
721	–	#endif
722	–
723	–	#if !EMULATED_PPC
724	–	// Install SIGSEGV handler
725	–	sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
726	–	sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
727	–	sigsegv_action.sa_handler = (__sighandler_t)sigsegv_handler;
728	–	sigsegv_action.sa_flags = SA_ONSTACK;
729	–	sigsegv_action.sa_restorer = NULL;
730	–	if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
731	–	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
732	–	ErrorAlert(str);
733	–	goto quit;
734	–	}
735	–
912		// Install SIGILL handler
913		sigemptyset(&sigill_action.sa_mask);    // Block interrupts during ILL handling
914		sigaddset(&sigill_action.sa_mask, SIGUSR2);
915	<	sigill_action.sa_handler = (__sighandler_t)sigill_handler;
916	<	sigill_action.sa_flags = SA_ONSTACK;
915	>	sigill_action.sa_sigaction = sigill_handler;
916	>	sigill_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
917	>	#ifdef HAVE_SIGNAL_SA_RESTORER
918		sigill_action.sa_restorer = NULL;
919	+	#endif
920		if (sigaction(SIGILL, &sigill_action, NULL) < 0) {
921	<	sprintf(str, GetString(STR_SIGILL_INSTALL_ERR), strerror(errno));
921	>	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGILL", strerror(errno));
922		ErrorAlert(str);
923		goto quit;
924		}
925		#endif
926
927	+	#if !EMULATED_PPC
928		// Install interrupt signal handler
929		sigemptyset(&sigusr2_action.sa_mask);
930	<	sigusr2_action.sa_handler = (__sighandler_t)sigusr2_handler;
931	<	sigusr2_action.sa_flags = 0;
932	<	#if !EMULATED_PPC
754	<	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART;
755	<	#endif
930	>	sigusr2_action.sa_sigaction = sigusr2_handler_init;
931	>	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO;
932	>	#ifdef HAVE_SIGNAL_SA_RESTORER
933		sigusr2_action.sa_restorer = NULL;
934	+	#endif
935		if (sigaction(SIGUSR2, &sigusr2_action, NULL) < 0) {
936	<	sprintf(str, GetString(STR_SIGUSR2_INSTALL_ERR), strerror(errno));
936	>	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGUSR2", strerror(errno));
937		ErrorAlert(str);
938		goto quit;
939		}
940	+	#endif
941
942		// Get my thread ID and execute MacOS thread function
943		emul_thread = pthread_self();
#	Line 784 | Line 963 | static void Quit(void)
963
964		// Stop 60Hz thread
965		if (tick_thread_active) {
966	+	tick_thread_cancel = true;
967		pthread_cancel(tick_thread);
968		pthread_join(tick_thread, NULL);
969		}
970
971		// Stop NVRAM watchdog thread
972		if (nvram_thread_active) {
973	+	nvram_thread_cancel = true;
974		pthread_cancel(nvram_thread);
975		pthread_join(nvram_thread, NULL);
976		}
977
978		#if !EMULATED_PPC
979	<	// Uninstall SIGSEGV handler
979	>	// Uninstall SIGSEGV and SIGBUS handlers
980		sigemptyset(&sigsegv_action.sa_mask);
981		sigsegv_action.sa_handler = SIG_DFL;
982		sigsegv_action.sa_flags = 0;
983		sigaction(SIGSEGV, &sigsegv_action, NULL);
984	+	sigaction(SIGBUS, &sigsegv_action, NULL);
985
986		// Uninstall SIGILL handler
987		sigemptyset(&sigill_action.sa_mask);
988		sigill_action.sa_handler = SIG_DFL;
989		sigill_action.sa_flags = 0;
990		sigaction(SIGILL, &sigill_action, NULL);
809	–	#endif
810	–
811	–	// Save NVRAM
812	–	XPRAMExit();
813	–
814	–	// Exit clipboard
815	–	ClipExit();
816	–
817	–	// Exit Time Manager
818	–	TimerExit();
991
992	<	// Exit serial
993	<	SerialExit();
994	<
995	<	// Exit network
996	<	EtherExit();
997	<
826	<	// Exit audio
827	<	AudioExit();
828	<
829	<	// Exit video
830	<	VideoExit();
831	<
832	<	// Exit external file system
833	<	ExtFSExit();
992	>	// Delete stacks for signal handlers
993	>	if (sig_stack.ss_sp)
994	>	free(sig_stack.ss_sp);
995	>	if (extra_stack.ss_sp)
996	>	free(extra_stack.ss_sp);
997	>	#endif
998
999	<	// Exit drivers
1000	<	SCSIExit();
837	<	CDROMExit();
838	<	DiskExit();
839	<	SonyExit();
999	>	// Deinitialize everything
1000	>	ExitAll();
1001
1002		// Delete SheepShaver globals
1003		SheepMem::Exit();
1004
1005		// Delete RAM area
1006		if (ram_area_mapped)
1007	<	vm_release((char *)RAM_BASE, RAMSize);
1007	>	vm_mac_release(RAMBase, RAMSize);
1008
1009		// Delete ROM area
1010		if (rom_area_mapped)
1011	<	vm_release((char *)ROM_BASE, ROM_AREA_SIZE);
1011	>	vm_mac_release(ROM_BASE, ROM_AREA_SIZE);
1012	>
1013	>	// Delete DR cache areas
1014	>	if (dr_emulator_area_mapped)
1015	>	vm_mac_release(DR_EMULATOR_BASE, DR_EMULATOR_SIZE);
1016	>	if (dr_cache_area_mapped)
1017	>	vm_mac_release(DR_CACHE_BASE, DR_CACHE_SIZE);
1018
1019		// Delete Kernel Data area
1020	<	if (kernel_area >= 0) {
854	<	shmdt((void *)KERNEL_DATA_BASE);
855	<	shmdt((void *)KERNEL_DATA2_BASE);
856	<	shmctl(kernel_area, IPC_RMID, NULL);
857	<	}
1020	>	kernel_data_exit();
1021
1022		// Delete Low Memory area
1023		if (lm_area_mapped)
1024	<	munmap((char *)0x0000, 0x3000);
1024	>	vm_mac_release(0, 0x3000);
1025
1026		// Close /dev/zero
1027		if (zero_fd > 0)
#	Line 876 | Line 1039 | static void Quit(void)
1039		#endif
1040
1041		// Close X11 server connection
1042	+	#ifndef USE_SDL_VIDEO
1043		if (x_display)
1044		XCloseDisplay(x_display);
1045	+	#endif
1046	+
1047	+	// Notify GUI we are about to leave
1048	+	if (gui_connection) {
1049	+	if (rpc_method_invoke(gui_connection, RPC_METHOD_EXIT, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
1050	+	rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID);
1051	+	}
1052
1053		exit(0);
1054		}
1055
1056
1057		/*
1058	+	*  Initialize Kernel Data segments
1059	+	*/
1060	+
1061	+	static bool kernel_data_init(void)
1062	+	{
1063	+	char str[256];
1064	+	uint32 kernel_area_size = (KERNEL_AREA_SIZE + SHMLBA - 1) & -SHMLBA;
1065	+
1066	+	kernel_area = shmget(IPC_PRIVATE, kernel_area_size, 0600);
1067	+	if (kernel_area == -1) {
1068	+	sprintf(str, GetString(STR_KD_SHMGET_ERR), strerror(errno));
1069	+	ErrorAlert(str);
1070	+	return false;
1071	+	}
1072	+	void *kernel_addr = Mac2HostAddr(KERNEL_DATA_BASE & -SHMLBA);
1073	+	if (shmat(kernel_area, kernel_addr, 0) != kernel_addr) {
1074	+	sprintf(str, GetString(STR_KD_SHMAT_ERR), strerror(errno));
1075	+	ErrorAlert(str);
1076	+	return false;
1077	+	}
1078	+	kernel_addr = Mac2HostAddr(KERNEL_DATA2_BASE & -SHMLBA);
1079	+	if (shmat(kernel_area, kernel_addr, 0) != kernel_addr) {
1080	+	sprintf(str, GetString(STR_KD2_SHMAT_ERR), strerror(errno));
1081	+	ErrorAlert(str);
1082	+	return false;
1083	+	}
1084	+	return true;
1085	+	}
1086	+
1087	+
1088	+	/*
1089	+	*  Deallocate Kernel Data segments
1090	+	*/
1091	+
1092	+	static void kernel_data_exit(void)
1093	+	{
1094	+	if (kernel_area >= 0) {
1095	+	shmdt(Mac2HostAddr(KERNEL_DATA_BASE & -SHMLBA));
1096	+	shmdt(Mac2HostAddr(KERNEL_DATA2_BASE & -SHMLBA));
1097	+	shmctl(kernel_area, IPC_RMID, NULL);
1098	+	}
1099	+	}
1100	+
1101	+
1102	+	/*
1103		*  Jump into Mac ROM, start 680x0 emulator
1104		*/
1105
#	Line 970 | Line 1186 | void QuitEmulator(void)
1186
1187
1188		/*
973	–	*  Pause/resume emulator
974	–	*/
975	–
976	–	void PauseEmulator(void)
977	–	{
978	–	pthread_kill(emul_thread, SIGSTOP);
979	–	}
980	–
981	–	void ResumeEmulator(void)
982	–	{
983	–	pthread_kill(emul_thread, SIGCONT);
984	–	}
985	–
986	–
987	–	/*
1189		*  Dump 68k registers
1190		*/
1191
#	Line 1012 | Line 1213 | void Dump68kRegs(M68kRegisters *r)
1213		*  Make code executable
1214		*/
1215
1216	<	void MakeExecutable(int dummy, void *start, uint32 length)
1216	>	void MakeExecutable(int dummy, uint32 start, uint32 length)
1217		{
1218	<	if (((uintptr)start >= ROM_BASE) && ((uintptr)start < (ROM_BASE + ROM_SIZE)))
1218	>	if ((start >= ROM_BASE) && (start < (ROM_BASE + ROM_SIZE)))
1219		return;
1220		#if EMULATED_PPC
1221	<	FlushCodeCache((uintptr)start, (uintptr)start + length);
1221	>	FlushCodeCache(start, start + length);
1222		#else
1223	<	flush_icache_range(start, (void *)((uintptr)start + length));
1223	>	flush_icache_range(start, start + length);
1224		#endif
1225		}
1226
1227
1228		/*
1229	<	*  Patch things after system startup (gets called by disk driver accRun routine)
1229	>	*  NVRAM watchdog thread (saves NVRAM every minute)
1230		*/
1231
1232	<	void PatchAfterStartup(void)
1232	>	static void nvram_watchdog(void)
1233		{
1234	<	ExecuteNative(NATIVE_VIDEO_INSTALL_ACCEL);
1235	<	InstallExtFS();
1234	>	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
1235	>	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1236	>	SaveXPRAM();
1237	>	}
1238		}
1239
1037	–
1038	–	/*
1039	–	*  NVRAM watchdog thread (saves NVRAM every minute)
1040	–	*/
1041	–
1240		static void *nvram_func(void *arg)
1241		{
1242	<	struct timespec req = {60, 0};  // 1 minute
1243	<
1244	<	for (;;) {
1245	<	pthread_testcancel();
1048	<	nanosleep(&req, NULL);
1049	<	pthread_testcancel();
1050	<	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
1051	<	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1052	<	SaveXPRAM();
1053	<	}
1242	>	while (!nvram_thread_cancel) {
1243	>	for (int i=0; i<60 && !nvram_thread_cancel; i++)
1244	>	Delay_usec(999999);             // Only wait 1 second so we quit promptly when nvram_thread_cancel becomes true
1245	>	nvram_watchdog();
1246		}
1247		return NULL;
1248		}
#	Line 1063 | Line 1255 | static void *nvram_func(void *arg)
1255		static void *tick_func(void *arg)
1256		{
1257		int tick_counter = 0;
1258	<	struct timespec req = {0, 16625000};
1258	>	uint64 start = GetTicks_usec();
1259	>	int64 ticks = 0;
1260	>	uint64 next = GetTicks_usec();
1261
1262	<	for (;;) {
1262	>	while (!tick_thread_cancel) {
1263
1264		// Wait
1265	<	nanosleep(&req, NULL);
1265	>	next += 16625;
1266	>	int64 delay = next - GetTicks_usec();
1267	>	if (delay > 0)
1268	>	Delay_usec(delay);
1269	>	else if (delay < -16625)
1270	>	next = GetTicks_usec();
1271	>	ticks++;
1272
1273		#if !EMULATED_PPC
1274		// Did we crash?
1275		if (emul_thread_fatal) {
1276
1277		// Yes, dump registers
1278	<	pt_regs *r = (pt_regs *)&sigsegv_regs;
1278	>	sigregs *r = &sigsegv_regs;
1279		char str[256];
1280	<	sprintf(str, "SIGSEGV\n"
1280	>	if (crash_reason == NULL)
1281	>	crash_reason = "SIGSEGV";
1282	>	sprintf(str, "%s\n"
1283		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1284		"  xer %08lx     cr %08lx  \n"
1285		"   r0 %08lx     r1 %08lx     r2 %08lx     r3 %08lx\n"
#	Line 1088 | Line 1290 | static void *tick_func(void *arg)
1290		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1291		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1292		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1293	+	crash_reason,
1294		r->nip, r->link, r->ctr, r->msr,
1295		r->xer, r->ccr,
1296		r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
#	Line 1123 | Line 1326 | static void *tick_func(void *arg)
1326		TriggerInterrupt();
1327		}
1328		}
1329	+
1330	+	uint64 end = GetTicks_usec();
1331	+	D(bug("%lld ticks in %lld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1332		return NULL;
1333		}
1334
#	Line 1172 | Line 1378 | struct B2_mutex {
1378		pthread_mutexattr_init(&attr);
1379		// Initialize the mutex for priority inheritance --
1380		// required for accurate timing.
1381	<	#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
1381	>	#if defined(HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL) && !defined(__CYGWIN__)
1382		pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
1383		#endif
1384		#if defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE) && defined(PTHREAD_MUTEX_NORMAL)
#	Line 1243 | Line 1449 | void B2_delete_mutex(B2_mutex *mutex)
1449		*  Trigger signal USR2 from another thread
1450		*/
1451
1452	<	#if !EMULATED_PPC || ASYNC_IRQ
1452	>	#if !EMULATED_PPC
1453		void TriggerInterrupt(void)
1454		{
1455	<	if (ready_for_signals)
1455	>	if (ready_for_signals) {
1456	>	idle_resume();
1457		pthread_kill(emul_thread, SIGUSR2);
1458	+	}
1459		}
1460		#endif
1461
#	Line 1275 | Line 1483 | void ClearInterruptFlag(uint32 flag)
1483
1484		void DisableInterrupt(void)
1485		{
1486	+	#if EMULATED_PPC
1487	+	WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) + 1);
1488	+	#else
1489		atomic_add((int *)XLM_IRQ_NEST, 1);
1490	+	#endif
1491		}
1492
1493
#	Line 1285 | Line 1497 | void DisableInterrupt(void)
1497
1498		void EnableInterrupt(void)
1499		{
1500	+	#if EMULATED_PPC
1501	+	WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) - 1);
1502	+	#else
1503		atomic_add((int *)XLM_IRQ_NEST, -1);
1504	+	#endif
1505		}
1506
1507
#	Line 1293 | Line 1509 | void EnableInterrupt(void)
1509		*  USR2 handler
1510		*/
1511
1512	<	#if EMULATED_PPC
1513	<	static void sigusr2_handler(int sig)
1512	>	#if !EMULATED_PPC
1513	>	void sigusr2_handler(int sig, siginfo_t *sip, void *scp)
1514		{
1515	<	#if ASYNC_IRQ
1516	<	extern void HandleInterrupt(void);
1517	<	HandleInterrupt();
1515	>	machine_regs *r = MACHINE_REGISTERS(scp);
1516	>
1517	>	#ifdef SYSTEM_CLOBBERS_R2
1518	>	// Restore pointer to Thread Local Storage
1519	>	set_r2(TOC);
1520	>	#endif
1521	>	#ifdef SYSTEM_CLOBBERS_R13
1522	>	// Restore pointer to .sdata section
1523	>	set_r13(R13);
1524	>	#endif
1525	>
1526	>	#ifdef USE_SDL_VIDEO
1527	>	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
1528	>	SDL_PumpEvents();
1529		#endif
1303	–	}
1304	–	#else
1305	–	static void sigusr2_handler(int sig, sigcontext_struct *sc)
1306	–	{
1307	–	pt_regs *r = sc->regs;
1530
1531		// Do nothing if interrupts are disabled
1532		if (*(int32 *)XLM_IRQ_NEST > 0)
#	Line 1318 | Line 1540 | static void sigusr2_handler(int sig, sig
1540		case MODE_68K:
1541		// 68k emulator active, trigger 68k interrupt level 1
1542		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1543	<	r->ccr |= ntohl(kernel_data->v[0x674 >> 2]);
1543	>	r->cr() |= ntohl(kernel_data->v[0x674 >> 2]);
1544		break;
1545
1546		#if INTERRUPTS_IN_NATIVE_MODE
1547		case MODE_NATIVE:
1548		// 68k emulator inactive, in nanokernel?
1549	<	if (r->gpr[1] != KernelDataAddr) {
1549	>	if (r->gpr(1) != KernelDataAddr) {
1550	>
1551	>	// Set extra stack for SIGSEGV handler
1552	>	sigaltstack(&extra_stack, NULL);
1553	>
1554		// Prepare for 68k interrupt level 1
1555		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1556		WriteMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc, ReadMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc) | ntohl(kernel_data->v[0x674 >> 2]));
1557
1558		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
1559	<	atomic_add((int32 *)XLM_IRQ_NEST, 1);
1559	>	DisableInterrupt();
1560		if (ROMType == ROMTYPE_NEWWORLD)
1561		ppc_interrupt(ROM_BASE + 0x312b1c, KernelDataAddr);
1562		else
1563		ppc_interrupt(ROM_BASE + 0x312a3c, KernelDataAddr);
1564	+
1565	+	// Reset normal stack
1566	+	sigaltstack(&sig_stack, NULL);
1567		}
1568		break;
1569		#endif
#	Line 1345 | Line 1574 | static void sigusr2_handler(int sig, sig
1574		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1575
1576		// Set extra stack for SIGSEGV handler
1577	<	struct sigaltstack new_stack;
1349	<	new_stack.ss_sp = extra_stack;
1350	<	new_stack.ss_flags = 0;
1351	<	new_stack.ss_size = SIG_STACK_SIZE;
1352	<	sigaltstack(&new_stack, NULL);
1577	>	sigaltstack(&extra_stack, NULL);
1578		#if 1
1579		// Execute full 68k interrupt routine
1580		M68kRegisters r;
#	Line 1375 | Line 1600 | static void sigusr2_handler(int sig, sig
1600		}
1601		}
1602		#endif
1603	<	// Reset normal signal stack
1604	<	new_stack.ss_sp = sig_stack;
1380	<	new_stack.ss_flags = 0;
1381	<	new_stack.ss_size = SIG_STACK_SIZE;
1382	<	sigaltstack(&new_stack, NULL);
1603	>	// Reset normal stack
1604	>	sigaltstack(&sig_stack, NULL);
1605		}
1606		break;
1607		#endif
#	Line 1393 | Line 1615 | static void sigusr2_handler(int sig, sig
1615		*/
1616
1617		#if !EMULATED_PPC
1618	<	static void sigsegv_handler(int sig, sigcontext_struct *sc)
1618	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp)
1619		{
1620	<	pt_regs *r = sc->regs;
1620	>	machine_regs *r = MACHINE_REGISTERS(scp);
1621
1622		// Get effective address
1623	<	uint32 addr = r->dar;
1623	>	uint32 addr = r->dar();
1624
1625	+	#ifdef SYSTEM_CLOBBERS_R2
1626	+	// Restore pointer to Thread Local Storage
1627	+	set_r2(TOC);
1628	+	#endif
1629	+	#ifdef SYSTEM_CLOBBERS_R13
1630	+	// Restore pointer to .sdata section
1631	+	set_r13(R13);
1632	+	#endif
1633	+
1634		#if ENABLE_VOSF
1635		// Handle screen fault.
1636		extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
1637	<	if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->nip))
1637	>	if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->pc()))
1638		return;
1639		#endif
1640
1641		num_segv++;
1642
1643	<	// Fault in Mac ROM or RAM?
1644	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1643	>	// Fault in Mac ROM or RAM or DR Cache?
1644	>	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));
1645		if (mac_fault) {
1646
1647		// "VM settings" during MacOS 8 installation
1648	<	if (r->nip == ROM_BASE + 0x488160 && r->gpr[20] == 0xf8000000) {
1649	<	r->nip += 4;
1650	<	r->gpr[8] = 0;
1648	>	if (r->pc() == ROM_BASE + 0x488160 && r->gpr(20) == 0xf8000000) {
1649	>	r->pc() += 4;
1650	>	r->gpr(8) = 0;
1651		return;
1652
1653		// MacOS 8.5 installation
1654	<	} else if (r->nip == ROM_BASE + 0x488140 && r->gpr[16] == 0xf8000000) {
1655	<	r->nip += 4;
1656	<	r->gpr[8] = 0;
1654	>	} else if (r->pc() == ROM_BASE + 0x488140 && r->gpr(16) == 0xf8000000) {
1655	>	r->pc() += 4;
1656	>	r->gpr(8) = 0;
1657		return;
1658
1659		// MacOS 8 serial drivers on startup
1660	<	} else if (r->nip == ROM_BASE + 0x48e080 && (r->gpr[8] == 0xf3012002 || r->gpr[8] == 0xf3012000)) {
1661	<	r->nip += 4;
1662	<	r->gpr[8] = 0;
1660	>	} else if (r->pc() == ROM_BASE + 0x48e080 && (r->gpr(8) == 0xf3012002 || r->gpr(8) == 0xf3012000)) {
1661	>	r->pc() += 4;
1662	>	r->gpr(8) = 0;
1663		return;
1664
1665		// MacOS 8.1 serial drivers on startup
1666	<	} else if (r->nip == ROM_BASE + 0x48c5e0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1667	<	r->nip += 4;
1666	>	} else if (r->pc() == ROM_BASE + 0x48c5e0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1667	>	r->pc() += 4;
1668	>	return;
1669	>	} else if (r->pc() == ROM_BASE + 0x4a10a0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1670	>	r->pc() += 4;
1671		return;
1672	<	} else if (r->nip == ROM_BASE + 0x4a10a0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1673	<	r->nip += 4;
1672	>
1673	>	// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
1674	>	} else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(16) == 0xf3012002 || r->gpr(16) == 0xf3012000)) {
1675	>	r->pc() += 4;
1676	>	return;
1677	>	} else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1678	>	r->pc() += 4;
1679		return;
1680		}
1681
1682		// Get opcode and divide into fields
1683	<	uint32 opcode = *((uint32 *)r->nip);
1683	>	uint32 opcode = *((uint32 *)r->pc());
1684		uint32 primop = opcode >> 26;
1685		uint32 exop = (opcode >> 1) & 0x3ff;
1686		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1530 | Line 1769 | static void sigsegv_handler(int sig, sig
1769		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_NORM; break;
1770		case 45:        // sthu
1771		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_U; break;
1772	+	#if EMULATE_UNALIGNED_LOADSTORE_MULTIPLE
1773	+	case 46:        // lmw
1774	+	if ((addr % 4) != 0) {
1775	+	uint32 ea = addr;
1776	+	D(bug("WARNING: unaligned lmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1777	+	for (int i = rd; i <= 31; i++) {
1778	+	r->gpr(i) = ReadMacInt32(ea);
1779	+	ea += 4;
1780	+	}
1781	+	r->pc() += 4;
1782	+	goto rti;
1783	+	}
1784	+	break;
1785	+	case 47:        // stmw
1786	+	if ((addr % 4) != 0) {
1787	+	uint32 ea = addr;
1788	+	D(bug("WARNING: unaligned stmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1789	+	for (int i = rd; i <= 31; i++) {
1790	+	WriteMacInt32(ea, r->gpr(i));
1791	+	ea += 4;
1792	+	}
1793	+	r->pc() += 4;
1794	+	goto rti;
1795	+	}
1796	+	break;
1797	+	#endif
1798		}
1799
1800	<	// Ignore ROM writes
1801	<	if (transfer_type == TYPE_STORE && addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) {
1802	<	//                      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));
1800	>	// Ignore ROM writes (including to the zero page, which is read-only)
1801	>	if (transfer_type == TYPE_STORE &&
1802	>	((addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) ||
1803	>	(addr >= SheepMem::ZeroPage() && addr < SheepMem::ZeroPage() + SheepMem::PageSize()))) {
1804	>	//                      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()));
1805		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1806	<	r->gpr[ra] = addr;
1807	<	r->nip += 4;
1806	>	r->gpr(ra) = addr;
1807	>	r->pc() += 4;
1808		goto rti;
1809		}
1810
1811		// Ignore illegal memory accesses?
1812		if (PrefsFindBool("ignoresegv")) {
1813		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1814	<	r->gpr[ra] = addr;
1814	>	r->gpr(ra) = addr;
1815		if (transfer_type == TYPE_LOAD)
1816	<	r->gpr[rd] = 0;
1817	<	r->nip += 4;
1816	>	r->gpr(rd) = 0;
1817	>	r->pc() += 4;
1818		goto rti;
1819		}
1820
#	Line 1555 | Line 1822 | static void sigsegv_handler(int sig, sig
1822		if (!PrefsFindBool("nogui")) {
1823		char str[256];
1824		if (transfer_type == TYPE_LOAD || transfer_type == TYPE_STORE)
1825	<	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]);
1825	>	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));
1826		else
1827	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
1827	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
1828		ErrorAlert(str);
1829		QuitEmulator();
1830		return;
#	Line 1565 | Line 1832 | static void sigsegv_handler(int sig, sig
1832		}
1833
1834		// For all other errors, jump into debugger (sort of...)
1835	+	crash_reason = (sig == SIGBUS) ? "SIGBUS" : "SIGSEGV";
1836		if (!ready_for_signals) {
1837	<	printf("SIGSEGV\n");
1838	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
1837	>	printf("%s\n");
1838	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
1839		printf(
1840		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1841		"  xer %08lx     cr %08lx  \n"
#	Line 1579 | Line 1847 | static void sigsegv_handler(int sig, sig
1847		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1848		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1849		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1850	<	r->nip, r->link, r->ctr, r->msr,
1851	<	r->xer, r->ccr,
1852	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
1853	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
1854	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
1855	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
1856	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
1857	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
1858	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
1859	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
1850	>	crash_reason,
1851	>	r->pc(), r->lr(), r->ctr(), r->msr(),
1852	>	r->xer(), r->cr(),
1853	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
1854	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
1855	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
1856	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
1857	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
1858	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
1859	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
1860	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
1861		exit(1);
1862		QuitEmulator();
1863		return;
1864		} else {
1865		// We crashed. Save registers, tell tick thread and loop forever
1866	<	sigsegv_regs = *(sigregs *)r;
1866	>	build_sigregs(&sigsegv_regs, r);
1867		emul_thread_fatal = true;
1868		for (;;) ;
1869		}
#	Line 1606 | Line 1875 | rti:;
1875		*  SIGILL handler
1876		*/
1877
1878	<	static void sigill_handler(int sig, sigcontext_struct *sc)
1878	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp)
1879		{
1880	<	pt_regs *r = sc->regs;
1880	>	machine_regs *r = MACHINE_REGISTERS(scp);
1881		char str[256];
1882
1883	+	#ifdef SYSTEM_CLOBBERS_R2
1884	+	// Restore pointer to Thread Local Storage
1885	+	set_r2(TOC);
1886	+	#endif
1887	+	#ifdef SYSTEM_CLOBBERS_R13
1888	+	// Restore pointer to .sdata section
1889	+	set_r13(R13);
1890	+	#endif
1891	+
1892		// Fault in Mac ROM or RAM?
1893	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1893	>	bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize));
1894		if (mac_fault) {
1895
1896		// Get opcode and divide into fields
1897	<	uint32 opcode = *((uint32 *)r->nip);
1897	>	uint32 opcode = *((uint32 *)r->pc());
1898		uint32 primop = opcode >> 26;
1899		uint32 exop = (opcode >> 1) & 0x3ff;
1900		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1627 | Line 1905 | static void sigill_handler(int sig, sigc
1905		switch (primop) {
1906		case 9:         // POWER instructions
1907		case 22:
1908	<	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->nip, r->gpr[1], opcode);
1908	>	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->pc(), r->gpr(1), opcode);
1909		ErrorAlert(str);
1910		QuitEmulator();
1911		return;
#	Line 1635 | Line 1913 | power_inst:            sprintf(str, GetString(STR_
1913		case 31:
1914		switch (exop) {
1915		case 83:        // mfmsr
1916	<	r->gpr[rd] = 0xf072;
1917	<	r->nip += 4;
1916	>	r->gpr(rd) = 0xf072;
1917	>	r->pc() += 4;
1918		goto rti;
1919
1920		case 210:       // mtsr
1921		case 242:       // mtsrin
1922		case 306:       // tlbie
1923	<	r->nip += 4;
1923	>	r->pc() += 4;
1924		goto rti;
1925
1926		case 339: {     // mfspr
#	Line 1658 | Line 1936 | power_inst:            sprintf(str, GetString(STR_
1936		case 957:       // PMC3
1937		case 958:       // PMC4
1938		case 959:       // SDA
1939	<	r->nip += 4;
1939	>	r->pc() += 4;
1940		goto rti;
1941		case 25:        // SDR1
1942	<	r->gpr[rd] = 0xdead001f;
1943	<	r->nip += 4;
1942	>	r->gpr(rd) = 0xdead001f;
1943	>	r->pc() += 4;
1944		goto rti;
1945		case 287:       // PVR
1946	<	r->gpr[rd] = PVR;
1947	<	r->nip += 4;
1946	>	r->gpr(rd) = PVR;
1947	>	r->pc() += 4;
1948		goto rti;
1949		}
1950		break;
#	Line 1702 | Line 1980 | power_inst:            sprintf(str, GetString(STR_
1980		case 957:       // PMC3
1981		case 958:       // PMC4
1982		case 959:       // SDA
1983	<	r->nip += 4;
1983	>	r->pc() += 4;
1984		goto rti;
1985		}
1986		break;
#	Line 1721 | Line 1999 | power_inst:            sprintf(str, GetString(STR_
1999
2000		// In GUI mode, show error alert
2001		if (!PrefsFindBool("nogui")) {
2002	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
2002	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
2003		ErrorAlert(str);
2004		QuitEmulator();
2005		return;
#	Line 1729 | Line 2007 | power_inst:            sprintf(str, GetString(STR_
2007		}
2008
2009		// For all other errors, jump into debugger (sort of...)
2010	+	crash_reason = "SIGILL";
2011		if (!ready_for_signals) {
2012	<	printf("SIGILL\n");
2013	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
2012	>	printf("%s\n");
2013	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
2014		printf(
2015		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
2016		"  xer %08lx     cr %08lx  \n"
#	Line 1743 | Line 2022 | power_inst:            sprintf(str, GetString(STR_
2022		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
2023		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
2024		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
2025	<	r->nip, r->link, r->ctr, r->msr,
2026	<	r->xer, r->ccr,
2027	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
2028	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
2029	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
2030	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
2031	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
2032	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
2033	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
2034	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
2025	>	crash_reason,
2026	>	r->pc(), r->lr(), r->ctr(), r->msr(),
2027	>	r->xer(), r->cr(),
2028	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
2029	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
2030	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
2031	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
2032	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
2033	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
2034	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
2035	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
2036		exit(1);
2037		QuitEmulator();
2038		return;
2039		} else {
2040		// We crashed. Save registers, tell tick thread and loop forever
2041	<	sigsegv_regs = *(sigregs *)r;
2041	>	build_sigregs(&sigsegv_regs, r);
2042		emul_thread_fatal = true;
2043		for (;;) ;
2044		}
#	Line 1773 | Line 2053 | rti:;
2053
2054		bool SheepMem::Init(void)
2055		{
2056	<	if (vm_acquire_fixed((char *)base, size) < 0)
2057	<	return false;
2056	>	// Size of a native page
2057	>	page_size = getpagesize();
2058
2059	<	zero_page = base + size;
2059	>	// Allocate SheepShaver globals
2060	>	proc = base;
2061	>	if (vm_mac_acquire(base, size) < 0)
2062	>	return false;
2063
2064	<	int page_size = getpagesize();
2065	<	if (vm_acquire_fixed((char *)zero_page, page_size) < 0)
2064	>	// Allocate page with all bits set to 0, right in the middle
2065	>	// This is also used to catch undesired overlaps between proc and data areas
2066	>	zero_page = proc + (size / 2);
2067	>	Mac_memset(zero_page, 0, page_size);
2068	>	if (vm_protect(Mac2HostAddr(zero_page), page_size, VM_PAGE_READ) < 0)
2069		return false;
2070	<	memset((char *)zero_page, 0, page_size);
2071	<	if (vm_protect((char *)zero_page, page_size, VM_PAGE_READ) < 0)
2070	>
2071	>	#if EMULATED_PPC
2072	>	// Allocate alternate stack for PowerPC interrupt routine
2073	>	sig_stack = base + size;
2074	>	if (vm_mac_acquire(sig_stack, SIG_STACK_SIZE) < 0)
2075		return false;
2076	+	#endif
2077
2078	<	top = base + size;
2078	>	data = base + size;
2079		return true;
2080		}
2081
2082		void SheepMem::Exit(void)
2083		{
2084	<	if (top) {
2085	<	// The zero page is next to SheepShaver globals
2086	<	vm_release((void *)base, size + getpagesize());
2084	>	if (data) {
2085	>	// Delete SheepShaver globals
2086	>	vm_mac_release(base, size);
2087	>
2088	>	#if EMULATED_PPC
2089	>	// Delete alternate stack for PowerPC interrupt routine
2090	>	vm_mac_release(sig_stack, SIG_STACK_SIZE);
2091	>	#endif
2092		}
2093		}
2094
#	Line 1847 | Line 2142 | void display_alert(int title_id, int pre
2142
2143		void ErrorAlert(const char *text)
2144		{
2145	<	#ifdef ENABLE_GTK
2145	>	if (gui_connection) {
2146	>	if (rpc_method_invoke(gui_connection, RPC_METHOD_ERROR_ALERT, RPC_TYPE_STRING, text, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR &&
2147	>	rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
2148	>	return;
2149	>	}
2150	>	#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
2151		if (PrefsFindBool("nogui") || x_display == NULL) {
2152		printf(GetString(STR_SHELL_ERROR_PREFIX), text);
2153		return;
#	Line 1866 | Line 2166 | void ErrorAlert(const char *text)
2166
2167		void WarningAlert(const char *text)
2168		{
2169	<	#ifdef ENABLE_GTK
2169	>	if (gui_connection) {
2170	>	if (rpc_method_invoke(gui_connection, RPC_METHOD_WARNING_ALERT, RPC_TYPE_STRING, text, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR &&
2171	>	rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
2172	>	return;
2173	>	}
2174	>	#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
2175		if (PrefsFindBool("nogui") || x_display == NULL) {
2176		printf(GetString(STR_SHELL_WARNING_PREFIX), text);
2177		return;

Diff Legend

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