ViewVC Help

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

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

Comparing SheepShaver/src/Unix/main_unix.cpp (file contents):
Revision 1.13 by gbeauche, 2003-11-03T21:28:25Z vs.
Revision 1.84 by asvitkine, 2009-07-23T19:12:50Z

#	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-2008 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 80 | Line 89
89		#include <sys/mman.h>
90		#include <sys/ipc.h>
91		#include <sys/shm.h>
92	+	#include <sys/stat.h>
93		#include <signal.h>
94
95		#include "sysdeps.h"
#	Line 93 | Line 103
103		#include "xpram.h"
104		#include "timer.h"
105		#include "adb.h"
96	–	#include "sony.h"
97	–	#include "disk.h"
98	–	#include "cdrom.h"
99	–	#include "scsi.h"
106		#include "video.h"
101	–	#include "audio.h"
102	–	#include "ether.h"
103	–	#include "serial.h"
104	–	#include "clip.h"
105	–	#include "extfs.h"
107		#include "sys.h"
108		#include "macos_util.h"
109		#include "rom_patches.h"
110		#include "user_strings.h"
111		#include "vm_alloc.h"
112		#include "sigsegv.h"
113	+	#include "sigregs.h"
114	+	#include "rpc.h"
115
116		#define DEBUG 0
117		#include "debug.h"
118
119
120	+	#ifdef HAVE_DIRENT_H
121	+	#include <dirent.h>
122	+	#endif
123	+
124	+	#ifdef USE_SDL
125	+	#include <SDL.h>
126	+	#endif
127	+
128	+	#ifndef USE_SDL_VIDEO
129		#include <X11/Xlib.h>
130	+	#endif
131
132		#ifdef ENABLE_GTK
133		#include <gtk/gtk.h>
#	Line 131 | Line 144
144		#endif
145
146
147	+	// Enable emulation of unaligned lmw/stmw?
148	+	#define EMULATE_UNALIGNED_LOADSTORE_MULTIPLE 1
149	+
150		// Enable Execute68k() safety checks?
151		#define SAFE_EXEC_68K 0
152
#	Line 145 | Line 161
161		const char ROM_FILE_NAME[] = "ROM";
162		const char ROM_FILE_NAME2[] = "Mac OS ROM";
163
164	<	const uint32 RAM_BASE = 0x20000000;                     // Base address of RAM
165	<	const uint32 SIG_STACK_SIZE = 0x10000;          // Size of signal stack
166	<
167	<
168	<	#if !EMULATED_PPC
153	<	// Structure in which registers are saved in a signal handler;
154	<	// sigcontext->regs points to it
155	<	// (see arch/ppc/kernel/signal.c)
156	<	typedef struct {
157	<	uint32 u[4];
158	<	} __attribute((aligned(16))) vector128;
159	<	#include <linux/elf.h>
160	<
161	<	struct sigregs {
162	<	elf_gregset_t   gp_regs;                                // Identical to pt_regs
163	<	double                  fp_regs[ELF_NFPREG];    // f0..f31 and fpsrc
164	<	//more (uninteresting) stuff following here
165	<	};
164	>	#if REAL_ADDRESSING
165	>	const uintptr RAM_BASE = 0x20000000;            // Base address of RAM
166	>	#else
167	>	// FIXME: needs to be >= 0x04000000
168	>	const uintptr RAM_BASE = 0x10000000;            // Base address of RAM
169		#endif
170	+	const uint32 SIG_STACK_SIZE = 0x10000;          // Size of signal stack
171
172
173		// Global variables (exported)
174		#if !EMULATED_PPC
175	<	void *TOC;                              // Small data pointer (r13)
175	>	void *TOC = NULL;               // Pointer to Thread Local Storage (r2)
176	>	void *R13 = NULL;               // Pointer to .sdata section (r13 under Linux)
177		#endif
178		uint32 RAMBase;                 // Base address of Mac RAM
179		uint32 RAMSize;                 // Size of Mac RAM
175	–	uint32 SheepStack1Base; // SheepShaver first alternate stack base
176	–	uint32 SheepStack2Base; // SheepShaver second alternate stack base
177	–	uint32 SheepThunksBase; // SheepShaver thunks base
180		uint32 KernelDataAddr;  // Address of Kernel Data
181		uint32 BootGlobsAddr;   // Address of BootGlobs structure at top of Mac RAM
182	+	uint32 DRCacheAddr;             // Address of DR Cache
183		uint32 PVR;                             // Theoretical PVR
184		int64 CPUClockSpeed;    // Processor clock speed (Hz)
185		int64 BusClockSpeed;    // Bus clock speed (Hz)
186	+	int64 TimebaseSpeed;    // Timebase clock speed (Hz)
187	+	uint8 *RAMBaseHost;             // Base address of Mac RAM (host address space)
188	+	uint8 *ROMBaseHost;             // Base address of Mac ROM (host address space)
189
190
191		// Global variables
192	+	#ifndef USE_SDL_VIDEO
193		char *x_display_name = NULL;                            // X11 display name
194		Display *x_display = NULL;                                      // X11 display handle
195	+	#ifdef X11_LOCK_TYPE
196	+	X11_LOCK_TYPE x_display_lock = X11_LOCK_INIT; // X11 display lock
197	+	#endif
198	+	#endif
199
200		static int zero_fd = 0;                                         // FD of /dev/zero
190	–	static bool sheep_area_mapped = false;          // Flag: SheepShaver data area mmap()ed
201		static bool lm_area_mapped = false;                     // Flag: Low Memory area mmap()ped
202		static int kernel_area = -1;                            // SHM ID of Kernel Data area
203		static bool rom_area_mapped = false;            // Flag: Mac ROM mmap()ped
204		static bool ram_area_mapped = false;            // Flag: Mac RAM mmap()ped
205	+	static bool dr_cache_area_mapped = false;       // Flag: Mac DR Cache mmap()ped
206	+	static bool dr_emulator_area_mapped = false;// Flag: Mac DR Emulator mmap()ped
207		static KernelData *kernel_data;                         // Pointer to Kernel Data
208		static EmulatorData *emulator_data;
209
210		static uint8 last_xpram[XPRAM_SIZE];            // Buffer for monitoring XPRAM changes
211
212		static bool nvram_thread_active = false;        // Flag: NVRAM watchdog installed
213	+	static volatile bool nvram_thread_cancel;       // Flag: Cancel NVRAM thread
214		static pthread_t nvram_thread;                          // NVRAM watchdog
215		static bool tick_thread_active = false;         // Flag: MacOS thread installed
216	+	static volatile bool tick_thread_cancel;        // Flag: Cancel 60Hz thread
217		static pthread_t tick_thread;                           // 60Hz thread
218		static pthread_t emul_thread;                           // MacOS thread
219
#	Line 207 | Line 221 | static bool ready_for_signals = false;
221		static int64 num_segv = 0;                                      // Number of handled SEGV signals
222
223		static struct sigaction sigusr2_action;         // Interrupt signal (of emulator thread)
224	<	#if !EMULATED_PPC
224	>	#if EMULATED_PPC
225	>	static uintptr sig_stack = 0;                           // Stack for PowerPC interrupt routine
226	>	#else
227		static struct sigaction sigsegv_action;         // Data access exception signal (of emulator thread)
228		static struct sigaction sigill_action;          // Illegal instruction signal (of emulator thread)
229	<	static void *sig_stack = NULL;                          // Stack for signal handlers
230	<	static void *extra_stack = NULL;                        // Stack for SIGSEGV inside interrupt handler
229	>	static stack_t sig_stack;                                       // Stack for signal handlers
230	>	static stack_t extra_stack;                                     // Stack for SIGSEGV inside interrupt handler
231		static bool emul_thread_fatal = false;          // Flag: MacOS thread crashed, tick thread shall dump debug output
232		static sigregs sigsegv_regs;                            // Register dump when crashed
233	+	static const char *crash_reason = NULL;         // Reason of the crash (SIGSEGV, SIGBUS, SIGILL)
234		#endif
235
236	+	static rpc_connection_t *gui_connection = NULL; // RPC connection to the GUI
237	+	static const char *gui_connection_path = NULL;  // GUI connection identifier
238	+
239	+	uint32  SheepMem::page_size;                            // Size of a native page
240	+	uintptr SheepMem::zero_page = 0;                        // Address of ro page filled in with zeros
241	+	uintptr SheepMem::base = 0x60000000;            // Address of SheepShaver data
242	+	uintptr SheepMem::proc;                                         // Bottom address of SheepShave procedures
243	+	uintptr SheepMem::data;                                         // Top of SheepShaver data (stack like storage)
244	+
245
246		// Prototypes
247	+	static bool kernel_data_init(void);
248	+	static void kernel_data_exit(void);
249		static void Quit(void);
250		static void *emul_func(void *arg);
251		static void *nvram_func(void *arg);
252		static void *tick_func(void *arg);
253		#if EMULATED_PPC
226	–	static void sigusr2_handler(int sig);
254		extern void emul_ppc(uint32 start);
255		extern void init_emul_ppc(void);
256		extern void exit_emul_ppc(void);
257	+	sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip);
258		#else
259	<	static void sigusr2_handler(int sig, sigcontext_struct *sc);
260	<	static void sigsegv_handler(int sig, sigcontext_struct *sc);
261	<	static void sigill_handler(int sig, sigcontext_struct *sc);
259	>	extern "C" void sigusr2_handler_init(int sig, siginfo_t *sip, void *scp);
260	>	extern "C" void sigusr2_handler(int sig, siginfo_t *sip, void *scp);
261	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp);
262	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp);
263		#endif
264
265
266		// From asm_linux.S
267		#if !EMULATED_PPC
239	–	extern "C" void *get_toc(void);
268		extern "C" void *get_sp(void);
269	<	extern "C" void flush_icache_range(void *start, void *end);
269	>	extern "C" void *get_r2(void);
270	>	extern "C" void set_r2(void *);
271	>	extern "C" void *get_r13(void);
272	>	extern "C" void set_r13(void *);
273	>	extern "C" void flush_icache_range(uint32 start, uint32 end);
274		extern "C" void jump_to_rom(uint32 entry, uint32 context);
275		extern "C" void quit_emulator(void);
276		extern "C" void execute_68k(uint32 pc, M68kRegisters *r);
#	Line 252 | Line 284 | extern void paranoia_check(void);
284
285		#if EMULATED_PPC
286		/*
287	+	*  Return signal stack base
288	+	*/
289	+
290	+	uintptr SignalStackBase(void)
291	+	{
292	+	return sig_stack + SIG_STACK_SIZE;
293	+	}
294	+
295	+
296	+	/*
297		*  Atomic operations
298		*/
299
#	Line 292 | Line 334 | int atomic_or(int *var, int v)
334
335
336		/*
337	+	*  Memory management helpers
338	+	*/
339	+
340	+	static inline int vm_mac_acquire(uint32 addr, uint32 size)
341	+	{
342	+	return vm_acquire_fixed(Mac2HostAddr(addr), size);
343	+	}
344	+
345	+	static inline int vm_mac_release(uint32 addr, uint32 size)
346	+	{
347	+	return vm_release(Mac2HostAddr(addr), size);
348	+	}
349	+
350	+
351	+	/*
352		*  Main program
353		*/
354
#	Line 304 | Line 361 | static void usage(const char *prg_name)
361		exit(0);
362		}
363
364	+	static bool valid_vmdir(const char *path)
365	+	{
366	+	const int suffix_len = sizeof(".sheepvm") - 1;
367	+	int len = strlen(path);
368	+	if (len > suffix_len && !strcmp(path + len - suffix_len, ".sheepvm")) {
369	+	struct stat d;
370	+	if (!stat(path, &d) && S_ISDIR(d.st_mode)) {
371	+	return true;
372	+	}
373	+	}
374	+	return false;
375	+	}
376	+
377		int main(int argc, char **argv)
378		{
379		char str[256];
310	–	uint32 *boot_globs;
311	–	int16 i16;
380		int rom_fd;
381		FILE *proc_file;
382		const char *rom_path;
383		uint32 rom_size, actual;
384		uint8 *rom_tmp;
385		time_t now, expire;
386	+	bool memory_mapped_from_zero;
387	+	const char *vmdir = NULL;
388	+
389	+	#ifdef USE_SDL_VIDEO
390	+	// Don't let SDL block the screensaver
391	+	putenv("SDL_VIDEO_ALLOW_SCREENSAVER=1");
392	+
393	+	// Make SDL pass through command-clicks and option-clicks unaltered
394	+	putenv("SDL_HAS3BUTTONMOUSE=1");
395	+	#endif
396
397		// Initialize variables
398		RAMBase = 0;
#	Line 325 | Line 403 | int main(int argc, char **argv)
403		printf(" %s\n", GetString(STR_ABOUT_TEXT2));
404
405		#if !EMULATED_PPC
406	+	#ifdef SYSTEM_CLOBBERS_R2
407		// Get TOC pointer
408	<	TOC = get_toc();
408	>	TOC = get_r2();
409	>	#endif
410	>	#ifdef SYSTEM_CLOBBERS_R13
411	>	// Get r13 register
412	>	R13 = get_r13();
413		#endif
331	–
332	–	#ifdef ENABLE_GTK
333	–	// Init GTK
334	–	gtk_set_locale();
335	–	gtk_init(&argc, &argv);
414		#endif
337	–
338	–	// Read preferences
339	–	PrefsInit(argc, argv);
415
416		// Parse command line arguments
417		for (int i=1; i<argc; i++) {
418		if (strcmp(argv[i], "--help") == 0) {
419		usage(argv[0]);
420	+	#ifndef USE_SDL_VIDEO
421		} else if (strcmp(argv[i], "--display") == 0) {
422		i++;
423		if (i < argc)
424		x_display_name = strdup(argv[i]);
425	<	} else if (argv[i][0] == '-') {
425	>	#endif
426	>	} else if (strcmp(argv[i], "--gui-connection") == 0) {
427	>	argv[i++] = NULL;
428	>	if (i < argc) {
429	>	gui_connection_path = argv[i];
430	>	argv[i] = NULL;
431	>	}
432	>	} else if (valid_vmdir(argv[i])) {
433	>	vmdir = argv[i];
434	>	argv[i] = NULL;
435	>	printf("Using %s as vmdir.\n", vmdir);
436	>	if (chdir(vmdir)) {
437	>	printf("Failed to chdir to %s. Good bye.", vmdir);
438	>	exit(1);
439	>	}
440	>	break;
441	>	}
442	>	}
443	>
444	>	// Remove processed arguments
445	>	for (int i=1; i<argc; i++) {
446	>	int k;
447	>	for (k=i; k<argc; k++)
448	>	if (argv[k] != NULL)
449	>	break;
450	>	if (k > i) {
451	>	k -= i;
452	>	for (int j=i+k; j<argc; j++)
453	>	argv[j-k] = argv[j];
454	>	argc -= k;
455	>	}
456	>	}
457	>
458	>	// Connect to the external GUI
459	>	if (gui_connection_path) {
460	>	if ((gui_connection = rpc_init_client(gui_connection_path)) == NULL) {
461	>	fprintf(stderr, "Failed to initialize RPC client connection to the GUI\n");
462	>	return 1;
463	>	}
464	>	}
465	>
466	>	#ifdef ENABLE_GTK
467	>	if (!gui_connection) {
468	>	// Init GTK
469	>	gtk_set_locale();
470	>	gtk_init(&argc, &argv);
471	>	}
472	>	#endif
473	>
474	>	// Read preferences
475	>	PrefsInit(vmdir, argc, argv);
476	>
477	>	// Any command line arguments left?
478	>	for (int i=1; i<argc; i++) {
479	>	if (argv[i][0] == '-') {
480		fprintf(stderr, "Unrecognized option '%s'\n", argv[i]);
481		usage(argv[0]);
482		}
483		}
484
485	+	#ifdef USE_SDL
486	+	// Initialize SDL system
487	+	int sdl_flags = 0;
488	+	#ifdef USE_SDL_VIDEO
489	+	sdl_flags |= SDL_INIT_VIDEO;
490	+	#endif
491	+	#ifdef USE_SDL_AUDIO
492	+	sdl_flags |= SDL_INIT_AUDIO;
493	+	#endif
494	+	assert(sdl_flags != 0);
495	+	if (SDL_Init(sdl_flags) == -1) {
496	+	char str[256];
497	+	sprintf(str, "Could not initialize SDL: %s.\n", SDL_GetError());
498	+	ErrorAlert(str);
499	+	goto quit;
500	+	}
501	+	atexit(SDL_Quit);
502	+
503	+	// Don't let SDL catch SIGINT and SIGTERM signals
504	+	signal(SIGINT, SIG_DFL);
505	+	signal(SIGTERM, SIG_DFL);
506	+	#endif
507	+
508	+	#ifndef USE_SDL_VIDEO
509		// Open display
510		x_display = XOpenDisplay(x_display_name);
511		if (x_display == NULL) {
#	Line 365 | Line 519 | int main(int argc, char **argv)
519		// Fork out, so we can return from fullscreen mode when things get ugly
520		XF86DGAForkApp(DefaultScreen(x_display));
521		#endif
522	+	#endif
523
524		#ifdef ENABLE_MON
525		// Initialize mon
526		mon_init();
527		#endif
528
529	+	#if !EMULATED_PPC
530	+	// Create and install stacks for signal handlers
531	+	sig_stack.ss_sp = malloc(SIG_STACK_SIZE);
532	+	D(bug("Signal stack at %p\n", sig_stack.ss_sp));
533	+	if (sig_stack.ss_sp == NULL) {
534	+	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
535	+	goto quit;
536	+	}
537	+	sig_stack.ss_flags = 0;
538	+	sig_stack.ss_size = SIG_STACK_SIZE;
539	+	if (sigaltstack(&sig_stack, NULL) < 0) {
540	+	sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno));
541	+	ErrorAlert(str);
542	+	goto quit;
543	+	}
544	+	extra_stack.ss_sp = malloc(SIG_STACK_SIZE);
545	+	D(bug("Extra stack at %p\n", extra_stack.ss_sp));
546	+	if (extra_stack.ss_sp == NULL) {
547	+	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
548	+	goto quit;
549	+	}
550	+	extra_stack.ss_flags = 0;
551	+	extra_stack.ss_size = SIG_STACK_SIZE;
552	+	#endif
553	+
554	+	#if !EMULATED_PPC
555	+	// Install SIGSEGV and SIGBUS handlers
556	+	sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
557	+	sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
558	+	sigsegv_action.sa_sigaction = sigsegv_handler;
559	+	sigsegv_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
560	+	#ifdef HAVE_SIGNAL_SA_RESTORER
561	+	sigsegv_action.sa_restorer = NULL;
562	+	#endif
563	+	if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
564	+	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGSEGV", strerror(errno));
565	+	ErrorAlert(str);
566	+	goto quit;
567	+	}
568	+	if (sigaction(SIGBUS, &sigsegv_action, NULL) < 0) {
569	+	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGBUS", strerror(errno));
570	+	ErrorAlert(str);
571	+	goto quit;
572	+	}
573	+	#else
574	+	// Install SIGSEGV handler for CPU emulator
575	+	if (!sigsegv_install_handler(sigsegv_handler)) {
576	+	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGSEGV", strerror(errno));
577	+	ErrorAlert(str);
578	+	goto quit;
579	+	}
580	+	#endif
581	+
582	+	// Initialize VM system
583	+	vm_init();
584	+
585		// Get system info
586		PVR = 0x00040000;                       // Default: 604
587		CPUClockSpeed = 100000000;      // Default: 100MHz
588		BusClockSpeed = 100000000;      // Default: 100MHz
589	<	#if !EMULATED_PPC
589	>	TimebaseSpeed =  25000000;      // Default:  25MHz
590	>	#if EMULATED_PPC
591	>	PVR = 0x000c0000;                       // Default: 7400 (with AltiVec)
592	>	#elif defined(__APPLE__) && defined(__MACH__)
593	>	proc_file = popen("ioreg -c IOPlatformDevice", "r");
594	>	if (proc_file) {
595	>	char line[256];
596	>	bool powerpc_node = false;
597	>	while (fgets(line, sizeof(line) - 1, proc_file)) {
598	>	// Read line
599	>	int len = strlen(line);
600	>	if (len == 0)
601	>	continue;
602	>	line[len - 1] = 0;
603	>
604	>	// Parse line
605	>	if (strstr(line, "o PowerPC,"))
606	>	powerpc_node = true;
607	>	else if (powerpc_node) {
608	>	uint32 value;
609	>	char head[256];
610	>	if (sscanf(line, "%[ |]\"cpu-version\" = <%x>", head, &value) == 2)
611	>	PVR = value;
612	>	else if (sscanf(line, "%[ |]\"clock-frequency\" = <%x>", head, &value) == 2)
613	>	CPUClockSpeed = value;
614	>	else if (sscanf(line, "%[ |]\"bus-frequency\" = <%x>", head, &value) == 2)
615	>	BusClockSpeed = value;
616	>	else if (sscanf(line, "%[ |]\"timebase-frequency\" = <%x>", head, &value) == 2)
617	>	TimebaseSpeed = value;
618	>	else if (strchr(line, '}'))
619	>	powerpc_node = false;
620	>	}
621	>	}
622	>	fclose(proc_file);
623	>	} else {
624	>	sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
625	>	WarningAlert(str);
626	>	}
627	>	#else
628		proc_file = fopen("/proc/cpuinfo", "r");
629		if (proc_file) {
630	+	// CPU specs from Linux kernel
631	+	// TODO: make it more generic with features (e.g. AltiVec) and
632	+	// cache information and friends for NameRegistry
633	+	static const struct {
634	+	uint32 pvr_mask;
635	+	uint32 pvr_value;
636	+	const char *cpu_name;
637	+	}
638	+	cpu_specs[] = {
639	+	{ 0xffff0000, 0x00010000, "601" },
640	+	{ 0xffff0000, 0x00030000, "603" },
641	+	{ 0xffff0000, 0x00060000, "603e" },
642	+	{ 0xffff0000, 0x00070000, "603ev" },
643	+	{ 0xffff0000, 0x00040000, "604" },
644	+	{ 0xfffff000, 0x00090000, "604e" },
645	+	{ 0xffff0000, 0x00090000, "604r" },
646	+	{ 0xffff0000, 0x000a0000, "604ev" },
647	+	{ 0xffffffff, 0x00084202, "740/750" },
648	+	{ 0xfffff000, 0x00083000, "745/755" },
649	+	{ 0xfffffff0, 0x00080100, "750CX" },
650	+	{ 0xfffffff0, 0x00082200, "750CX" },
651	+	{ 0xfffffff0, 0x00082210, "750CXe" },
652	+	{ 0xffffff00, 0x70000100, "750FX" },
653	+	{ 0xffffffff, 0x70000200, "750FX" },
654	+	{ 0xffff0000, 0x70000000, "750FX" },
655	+	{ 0xffff0000, 0x70020000, "750GX" },
656	+	{ 0xffff0000, 0x00080000, "740/750" },
657	+	{ 0xffffffff, 0x000c1101, "7400 (1.1)" },
658	+	{ 0xffff0000, 0x000c0000, "7400" },
659	+	{ 0xffff0000, 0x800c0000, "7410" },
660	+	{ 0xffffffff, 0x80000200, "7450" },
661	+	{ 0xffffffff, 0x80000201, "7450" },
662	+	{ 0xffff0000, 0x80000000, "7450" },
663	+	{ 0xffffff00, 0x80010100, "7455" },
664	+	{ 0xffffffff, 0x80010200, "7455" },
665	+	{ 0xffff0000, 0x80010000, "7455" },
666	+	{ 0xffff0000, 0x80020000, "7457" },
667	+	{ 0xffff0000, 0x80030000, "7447A" },
668	+	{ 0xffff0000, 0x80040000, "7448" },
669	+	{ 0x7fff0000, 0x00810000, "82xx" },
670	+	{ 0x7fff0000, 0x00820000, "8280" },
671	+	{ 0xffff0000, 0x00400000, "Power3 (630)" },
672	+	{ 0xffff0000, 0x00410000, "Power3 (630+)" },
673	+	{ 0xffff0000, 0x00360000, "I-star" },
674	+	{ 0xffff0000, 0x00370000, "S-star" },
675	+	{ 0xffff0000, 0x00350000, "Power4" },
676	+	{ 0xffff0000, 0x00390000, "PPC970" },
677	+	{ 0xffff0000, 0x003c0000, "PPC970FX" },
678	+	{ 0xffff0000, 0x003a0000, "POWER5 (gr)" },
679	+	{ 0xffff0000, 0x003b0000, "POWER5+ (gs)" },
680	+	{ 0xffff0000, 0x003e0000, "POWER6" },
681	+	{ 0xffff0000, 0x00700000, "Cell Broadband Engine" },
682	+	{ 0x7fff0000, 0x00900000, "PA6T" },
683	+	{ 0, 0, 0 }
684	+	};
685	+
686		char line[256];
687		while(fgets(line, 255, proc_file)) {
688		// Read line
#	Line 388 | Line 693 | int main(int argc, char **argv)
693
694		// Parse line
695		int i;
696	+	float f;
697		char value[256];
698	<	if (sscanf(line, "cpu : %s", value) == 1) {
699	<	if (strcmp(value, "601") == 0)
700	<	PVR = 0x00010000;
701	<	else if (strcmp(value, "603") == 0)
702	<	PVR = 0x00030000;
703	<	else if (strcmp(value, "604") == 0)
704	<	PVR = 0x00040000;
705	<	else if (strcmp(value, "603e") == 0)
706	<	PVR = 0x00060000;
707	<	else if (strcmp(value, "603ev") == 0)
708	<	PVR = 0x00070000;
403	<	else if (strcmp(value, "604e") == 0)
404	<	PVR = 0x00090000;
405	<	else if (strcmp(value, "604ev5") == 0)
406	<	PVR = 0x000a0000;
407	<	else if (strcmp(value, "750") == 0)
408	<	PVR = 0x00080000;
409	<	else if (strcmp(value, "821") == 0)
410	<	PVR = 0x00320000;
411	<	else if (strcmp(value, "860") == 0)
412	<	PVR = 0x00500000;
413	<	else
698	>	if (sscanf(line, "cpu : %[^,]", value) == 1) {
699	>	// Search by name
700	>	const char *cpu_name = NULL;
701	>	for (int i = 0; cpu_specs[i].pvr_mask != 0; i++) {
702	>	if (strcmp(cpu_specs[i].cpu_name, value) == 0) {
703	>	cpu_name = cpu_specs[i].cpu_name;
704	>	PVR = cpu_specs[i].pvr_value;
705	>	break;
706	>	}
707	>	}
708	>	if (cpu_name == NULL)
709		printf("WARNING: Unknown CPU type '%s', assuming 604\n", value);
710	+	else
711	+	printf("Found a PowerPC %s processor\n", cpu_name);
712		}
713	<	if (sscanf(line, "clock : %dMHz", &i) == 1)
713	>	if (sscanf(line, "clock : %fMHz", &f) == 1)
714	>	CPUClockSpeed = BusClockSpeed = ((int64)f) * 1000000;
715	>	else if (sscanf(line, "clock : %dMHz", &i) == 1)
716		CPUClockSpeed = BusClockSpeed = i * 1000000;
717		}
718		fclose(proc_file);
#	Line 421 | Line 720 | int main(int argc, char **argv)
720		sprintf(str, GetString(STR_PROC_CPUINFO_WARN), strerror(errno));
721		WarningAlert(str);
722		}
723	+
724	+	// Get actual bus frequency
725	+	proc_file = fopen("/proc/device-tree/clock-frequency", "r");
726	+	if (proc_file) {
727	+	union { uint8 b[4]; uint32 l; } value;
728	+	if (fread(value.b, sizeof(value), 1, proc_file) == 1)
729	+	BusClockSpeed = value.l;
730	+	fclose(proc_file);
731	+	}
732	+
733	+	// Get actual timebase frequency
734	+	TimebaseSpeed = BusClockSpeed / 4;
735	+	DIR *cpus_dir;
736	+	if ((cpus_dir = opendir("/proc/device-tree/cpus")) != NULL) {
737	+	struct dirent *cpu_entry;
738	+	while ((cpu_entry = readdir(cpus_dir)) != NULL) {
739	+	if (strstr(cpu_entry->d_name, "PowerPC,") == cpu_entry->d_name) {
740	+	char timebase_freq_node[256];
741	+	sprintf(timebase_freq_node, "/proc/device-tree/cpus/%s/timebase-frequency", cpu_entry->d_name);
742	+	proc_file = fopen(timebase_freq_node, "r");
743	+	if (proc_file) {
744	+	union { uint8 b[4]; uint32 l; } value;
745	+	if (fread(value.b, sizeof(value), 1, proc_file) == 1)
746	+	TimebaseSpeed = value.l;
747	+	fclose(proc_file);
748	+	}
749	+	}
750	+	}
751	+	closedir(cpus_dir);
752	+	}
753		#endif
754	+	// Remap any newer G4/G5 processor to plain G4 for compatibility
755	+	switch (PVR >> 16) {
756	+	case 0x8000:                            // 7450
757	+	case 0x8001:                            // 7455
758	+	case 0x8002:                            // 7457
759	+	case 0x8003:                            // 7447A
760	+	case 0x8004:                            // 7448
761	+	case 0x0039:                            //  970
762	+	case 0x003c:                            //  970FX
763	+	PVR = 0x000c0000;               // 7400
764	+	break;
765	+	}
766		D(bug("PVR: %08x (assumed)\n", PVR));
767
768		// Init system routines
#	Line 445 | Line 786 | int main(int argc, char **argv)
786		goto quit;
787		}
788
448	–	// Create Low Memory area (0x0000..0x3000)
449	–	if (vm_acquire_fixed((char *)0, 0x3000) < 0) {
450	–	sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
451	–	ErrorAlert(str);
452	–	goto quit;
453	–	}
454	–	lm_area_mapped = true;
455	–
789		// Create areas for Kernel Data
790	<	kernel_area = shmget(IPC_PRIVATE, KERNEL_AREA_SIZE, 0600);
791	<	if (kernel_area == -1) {
792	<	sprintf(str, GetString(STR_KD_SHMGET_ERR), strerror(errno));
790	>	if (!kernel_data_init())
791	>	goto quit;
792	>	kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE);
793	>	emulator_data = &kernel_data->ed;
794	>	KernelDataAddr = KERNEL_DATA_BASE;
795	>	D(bug("Kernel Data at %p (%08x)\n", kernel_data, KERNEL_DATA_BASE));
796	>	D(bug("Emulator Data at %p (%08x)\n", emulator_data, KERNEL_DATA_BASE + offsetof(KernelData, ed)));
797	>
798	>	// Create area for DR Cache
799	>	if (vm_mac_acquire(DR_EMULATOR_BASE, DR_EMULATOR_SIZE) < 0) {
800	>	sprintf(str, GetString(STR_DR_EMULATOR_MMAP_ERR), strerror(errno));
801		ErrorAlert(str);
802		goto quit;
803		}
804	<	if (shmat(kernel_area, (void *)KERNEL_DATA_BASE, 0) < 0) {
805	<	sprintf(str, GetString(STR_KD_SHMAT_ERR), strerror(errno));
804	>	dr_emulator_area_mapped = true;
805	>	if (vm_mac_acquire(DR_CACHE_BASE, DR_CACHE_SIZE) < 0) {
806	>	sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno));
807		ErrorAlert(str);
808		goto quit;
809		}
810	<	if (shmat(kernel_area, (void *)KERNEL_DATA2_BASE, 0) < 0) {
811	<	sprintf(str, GetString(STR_KD2_SHMAT_ERR), strerror(errno));
810	>	dr_cache_area_mapped = true;
811	>	#if !EMULATED_PPC
812	>	if (vm_protect((char *)DR_CACHE_BASE, DR_CACHE_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
813	>	sprintf(str, GetString(STR_DR_CACHE_MMAP_ERR), strerror(errno));
814		ErrorAlert(str);
815		goto quit;
816		}
817	<	kernel_data = (KernelData *)0x68ffe000;
818	<	emulator_data = &kernel_data->ed;
819	<	KernelDataAddr = (uint32)kernel_data;
476	<	D(bug("Kernel Data at %p, Emulator Data at %p\n", kernel_data, emulator_data));
817	>	#endif
818	>	DRCacheAddr = DR_CACHE_BASE;
819	>	D(bug("DR Cache at %p\n", DRCacheAddr));
820
821		// Create area for SheepShaver data
822	<	if (vm_acquire_fixed((char *)SHEEP_BASE, SHEEP_SIZE) < 0) {
822	>	if (!SheepMem::Init()) {
823		sprintf(str, GetString(STR_SHEEP_MEM_MMAP_ERR), strerror(errno));
824		ErrorAlert(str);
825		goto quit;
826		}
484	–	SheepStack1Base = SHEEP_BASE + 0x10000;
485	–	SheepStack2Base = SheepStack1Base + 0x10000;
486	–	SheepThunksBase = SheepStack2Base + 0x1000;
487	–	sheep_area_mapped = true;
827
828		// Create area for Mac ROM
829	<	if (vm_acquire_fixed((char *)ROM_BASE, ROM_AREA_SIZE) < 0) {
829	>	if (vm_mac_acquire(ROM_BASE, ROM_AREA_SIZE) < 0) {
830		sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
831		ErrorAlert(str);
832		goto quit;
833		}
834	<	#if !EMULATED_PPC || defined(__powerpc__)
835	<	if (vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
834	>	ROMBaseHost = Mac2HostAddr(ROM_BASE);
835	>	#if !EMULATED_PPC
836	>	if (vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
837		sprintf(str, GetString(STR_ROM_MMAP_ERR), strerror(errno));
838		ErrorAlert(str);
839		goto quit;
840		}
841		#endif
842		rom_area_mapped = true;
843	<	D(bug("ROM area at %08x\n", ROM_BASE));
843	>	D(bug("ROM area at %p (%08x)\n", ROMBaseHost, ROM_BASE));
844
845		// Create area for Mac RAM
846		RAMSize = PrefsFindInt32("ramsize");
#	Line 508 | Line 848 | int main(int argc, char **argv)
848		WarningAlert(GetString(STR_SMALL_RAM_WARN));
849		RAMSize = 8*1024*1024;
850		}
851	<
852	<	if (vm_acquire_fixed((char *)RAM_BASE, RAMSize) < 0) {
853	<	sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
854	<	ErrorAlert(str);
855	<	goto quit;
851	>	memory_mapped_from_zero = false;
852	>	#if REAL_ADDRESSING && HAVE_LINKER_SCRIPT
853	>	if (vm_mac_acquire(0, RAMSize) == 0) {
854	>	D(bug("Could allocate RAM from 0x0000\n"));
855	>	RAMBase = 0;
856	>	memory_mapped_from_zero = true;
857	>	}
858	>	#endif
859	>	if (!memory_mapped_from_zero) {
860	>	#ifndef PAGEZERO_HACK
861	>	// Create Low Memory area (0x0000..0x3000)
862	>	if (vm_mac_acquire(0, 0x3000) < 0) {
863	>	sprintf(str, GetString(STR_LOW_MEM_MMAP_ERR), strerror(errno));
864	>	ErrorAlert(str);
865	>	goto quit;
866	>	}
867	>	lm_area_mapped = true;
868	>	#endif
869	>	if (vm_mac_acquire(RAM_BASE, RAMSize) < 0) {
870	>	sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
871	>	ErrorAlert(str);
872	>	goto quit;
873	>	}
874	>	RAMBase = RAM_BASE;
875		}
876	+	RAMBaseHost = Mac2HostAddr(RAMBase);
877		#if !EMULATED_PPC
878	<	if (vm_protect((char *)RAM_BASE, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
878	>	if (vm_protect(RAMBaseHost, RAMSize, VM_PAGE_READ | VM_PAGE_WRITE | VM_PAGE_EXECUTE) < 0) {
879		sprintf(str, GetString(STR_RAM_MMAP_ERR), strerror(errno));
880		ErrorAlert(str);
881		goto quit;
882		}
883		#endif
524	–	RAMBase = RAM_BASE;
884		ram_area_mapped = true;
885	<	D(bug("RAM area at %08x\n", RAMBase));
885	>	D(bug("RAM area at %p (%08x)\n", RAMBaseHost, RAMBase));
886
887		if (RAMBase > ROM_BASE) {
888		ErrorAlert(GetString(STR_RAM_HIGHER_THAN_ROM_ERR));
#	Line 559 | Line 918 | int main(int argc, char **argv)
918		}
919		delete[] rom_tmp;
920
921	<	// Load NVRAM
922	<	XPRAMInit();
564	<
565	<	// Set boot volume
566	<	i16 = PrefsFindInt32("bootdrive");
567	<	XPRAM[0x1378] = i16 >> 8;
568	<	XPRAM[0x1379] = i16 & 0xff;
569	<	i16 = PrefsFindInt32("bootdriver");
570	<	XPRAM[0x137a] = i16 >> 8;
571	<	XPRAM[0x137b] = i16 & 0xff;
572	<
573	<	// Create BootGlobs at top of Mac memory
574	<	memset((void *)(RAMBase + RAMSize - 4096), 0, 4096);
575	<	BootGlobsAddr = RAMBase + RAMSize - 0x1c;
576	<	boot_globs = (uint32 *)BootGlobsAddr;
577	<	boot_globs[-5] = htonl(RAMBase + RAMSize);      // MemTop
578	<	boot_globs[0] = htonl(RAMBase);                         // First RAM bank
579	<	boot_globs[1] = htonl(RAMSize);
580	<	boot_globs[2] = htonl((uint32)-1);                      // End of bank table
581	<
582	<	// Init drivers
583	<	SonyInit();
584	<	DiskInit();
585	<	CDROMInit();
586	<	SCSIInit();
587	<
588	<	// Init external file system
589	<	ExtFSInit();
590	<
591	<	// Init audio
592	<	AudioInit();
593	<
594	<	// Init network
595	<	EtherInit();
596	<
597	<	// Init serial ports
598	<	SerialInit();
599	<
600	<	// Init Time Manager
601	<	TimerInit();
602	<
603	<	// Init clipboard
604	<	ClipInit();
605	<
606	<	// Init video
607	<	if (!VideoInit())
608	<	goto quit;
609	<
610	<	// Install ROM patches
611	<	if (!PatchROM()) {
612	<	ErrorAlert(GetString(STR_UNSUPPORTED_ROM_TYPE_ERR));
921	>	// Initialize everything
922	>	if (!InitAll(vmdir))
923		goto quit;
924	<	}
924	>	D(bug("Initialization complete\n"));
925
926		// Clear caches (as we loaded and patched code) and write protect ROM
927		#if !EMULATED_PPC
928	<	MakeExecutable(0, (void *)ROM_BASE, ROM_AREA_SIZE);
619	<	#endif
620	<	vm_protect((char *)ROM_BASE, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_EXECUTE);
621	<
622	<	// Initialize Kernel Data
623	<	memset(kernel_data, 0, sizeof(KernelData));
624	<	if (ROMType == ROMTYPE_NEWWORLD) {
625	<	static uint32 of_dev_tree[4] = {0, 0, 0, 0};
626	<	static uint8 vector_lookup_tbl[128];
627	<	static uint8 vector_mask_tbl[64];
628	<	memset((uint8 *)kernel_data + 0xb80, 0x3d, 0x80);
629	<	memset(vector_lookup_tbl, 0, 128);
630	<	memset(vector_mask_tbl, 0, 64);
631	<	kernel_data->v[0xb80 >> 2] = htonl(ROM_BASE);
632	<	kernel_data->v[0xb84 >> 2] = htonl((uint32)of_dev_tree);        // OF device tree base
633	<	kernel_data->v[0xb90 >> 2] = htonl((uint32)vector_lookup_tbl);
634	<	kernel_data->v[0xb94 >> 2] = htonl((uint32)vector_mask_tbl);
635	<	kernel_data->v[0xb98 >> 2] = htonl(ROM_BASE);                           // OpenPIC base
636	<	kernel_data->v[0xbb0 >> 2] = htonl(0);                                          // ADB base
637	<	kernel_data->v[0xc20 >> 2] = htonl(RAMSize);
638	<	kernel_data->v[0xc24 >> 2] = htonl(RAMSize);
639	<	kernel_data->v[0xc30 >> 2] = htonl(RAMSize);
640	<	kernel_data->v[0xc34 >> 2] = htonl(RAMSize);
641	<	kernel_data->v[0xc38 >> 2] = htonl(0x00010020);
642	<	kernel_data->v[0xc3c >> 2] = htonl(0x00200001);
643	<	kernel_data->v[0xc40 >> 2] = htonl(0x00010000);
644	<	kernel_data->v[0xc50 >> 2] = htonl(RAMBase);
645	<	kernel_data->v[0xc54 >> 2] = htonl(RAMSize);
646	<	kernel_data->v[0xf60 >> 2] = htonl(PVR);
647	<	kernel_data->v[0xf64 >> 2] = htonl(CPUClockSpeed);
648	<	kernel_data->v[0xf68 >> 2] = htonl(BusClockSpeed);
649	<	kernel_data->v[0xf6c >> 2] = htonl(CPUClockSpeed);
650	<	} else {
651	<	kernel_data->v[0xc80 >> 2] = htonl(RAMSize);
652	<	kernel_data->v[0xc84 >> 2] = htonl(RAMSize);
653	<	kernel_data->v[0xc90 >> 2] = htonl(RAMSize);
654	<	kernel_data->v[0xc94 >> 2] = htonl(RAMSize);
655	<	kernel_data->v[0xc98 >> 2] = htonl(0x00010020);
656	<	kernel_data->v[0xc9c >> 2] = htonl(0x00200001);
657	<	kernel_data->v[0xca0 >> 2] = htonl(0x00010000);
658	<	kernel_data->v[0xcb0 >> 2] = htonl(RAMBase);
659	<	kernel_data->v[0xcb4 >> 2] = htonl(RAMSize);
660	<	kernel_data->v[0xf80 >> 2] = htonl(PVR);
661	<	kernel_data->v[0xf84 >> 2] = htonl(CPUClockSpeed);
662	<	kernel_data->v[0xf88 >> 2] = htonl(BusClockSpeed);
663	<	kernel_data->v[0xf8c >> 2] = htonl(CPUClockSpeed);
664	<	}
665	<
666	<	// Initialize extra low memory
667	<	D(bug("Initializing Low Memory...\n"));
668	<	memset(NULL, 0, 0x3000);
669	<	WriteMacInt32(XLM_SIGNATURE, FOURCC('B','a','a','h'));                  // Signature to detect SheepShaver
670	<	WriteMacInt32(XLM_KERNEL_DATA, (uint32)kernel_data);                    // For trap replacement routines
671	<	WriteMacInt32(XLM_PVR, PVR);                                                                    // Theoretical PVR
672	<	WriteMacInt32(XLM_BUS_CLOCK, BusClockSpeed);                                    // For DriverServicesLib patch
673	<	WriteMacInt16(XLM_EXEC_RETURN_OPCODE, M68K_EXEC_RETURN);                // For Execute68k() (RTS from the executed 68k code will jump here and end 68k mode)
674	<	#if EMULATED_PPC
675	<	WriteMacInt32(XLM_ETHER_INIT, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_INIT));
676	<	WriteMacInt32(XLM_ETHER_TERM, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_TERM));
677	<	WriteMacInt32(XLM_ETHER_OPEN, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_OPEN));
678	<	WriteMacInt32(XLM_ETHER_CLOSE, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_CLOSE));
679	<	WriteMacInt32(XLM_ETHER_WPUT, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_WPUT));
680	<	WriteMacInt32(XLM_ETHER_RSRV, POWERPC_NATIVE_OP_FUNC(NATIVE_ETHER_RSRV));
681	<	WriteMacInt32(XLM_VIDEO_DOIO, POWERPC_NATIVE_OP_FUNC(NATIVE_VIDEO_DO_DRIVER_IO));
682	<	#else
683	<	WriteMacInt32(XLM_TOC, (uint32)TOC);                                                    // TOC pointer of emulator
684	<	WriteMacInt32(XLM_ETHER_INIT, (uint32)InitStreamModule);                // DLPI ethernet driver functions
685	<	WriteMacInt32(XLM_ETHER_TERM, (uint32)TerminateStreamModule);
686	<	WriteMacInt32(XLM_ETHER_OPEN, (uint32)ether_open);
687	<	WriteMacInt32(XLM_ETHER_CLOSE, (uint32)ether_close);
688	<	WriteMacInt32(XLM_ETHER_WPUT, (uint32)ether_wput);
689	<	WriteMacInt32(XLM_ETHER_RSRV, (uint32)ether_rsrv);
690	<	WriteMacInt32(XLM_VIDEO_DOIO, (uint32)VideoDoDriverIO);
928	>	flush_icache_range(ROM_BASE, ROM_BASE + ROM_AREA_SIZE);
929		#endif
930	<	D(bug("Low Memory initialized\n"));
930	>	vm_protect(ROMBaseHost, ROM_AREA_SIZE, VM_PAGE_READ | VM_PAGE_EXECUTE);
931
932		// Start 60Hz thread
933	+	tick_thread_cancel = false;
934		tick_thread_active = (pthread_create(&tick_thread, NULL, tick_func, NULL) == 0);
935		D(bug("Tick thread installed (%ld)\n", tick_thread));
936
937		// Start NVRAM watchdog thread
938		memcpy(last_xpram, XPRAM, XPRAM_SIZE);
939	+	nvram_thread_cancel = false;
940		nvram_thread_active = (pthread_create(&nvram_thread, NULL, nvram_func, NULL) == 0);
941		D(bug("NVRAM thread installed (%ld)\n", nvram_thread));
942
943		#if !EMULATED_PPC
704	–	// Create and install stacks for signal handlers
705	–	sig_stack = malloc(SIG_STACK_SIZE);
706	–	D(bug("Signal stack at %p\n", sig_stack));
707	–	if (sig_stack == NULL) {
708	–	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
709	–	goto quit;
710	–	}
711	–	extra_stack = malloc(SIG_STACK_SIZE);
712	–	D(bug("Extra stack at %p\n", extra_stack));
713	–	if (extra_stack == NULL) {
714	–	ErrorAlert(GetString(STR_NOT_ENOUGH_MEMORY_ERR));
715	–	goto quit;
716	–	}
717	–	struct sigaltstack new_stack;
718	–	new_stack.ss_sp = sig_stack;
719	–	new_stack.ss_flags = 0;
720	–	new_stack.ss_size = SIG_STACK_SIZE;
721	–	if (sigaltstack(&new_stack, NULL) < 0) {
722	–	sprintf(str, GetString(STR_SIGALTSTACK_ERR), strerror(errno));
723	–	ErrorAlert(str);
724	–	goto quit;
725	–	}
726	–	#endif
727	–
728	–	#if !EMULATED_PPC
729	–	// Install SIGSEGV handler
730	–	sigemptyset(&sigsegv_action.sa_mask);   // Block interrupts during SEGV handling
731	–	sigaddset(&sigsegv_action.sa_mask, SIGUSR2);
732	–	sigsegv_action.sa_handler = (__sighandler_t)sigsegv_handler;
733	–	sigsegv_action.sa_flags = SA_ONSTACK;
734	–	sigsegv_action.sa_restorer = NULL;
735	–	if (sigaction(SIGSEGV, &sigsegv_action, NULL) < 0) {
736	–	sprintf(str, GetString(STR_SIGSEGV_INSTALL_ERR), strerror(errno));
737	–	ErrorAlert(str);
738	–	goto quit;
739	–	}
740	–
944		// Install SIGILL handler
945		sigemptyset(&sigill_action.sa_mask);    // Block interrupts during ILL handling
946		sigaddset(&sigill_action.sa_mask, SIGUSR2);
947	<	sigill_action.sa_handler = (__sighandler_t)sigill_handler;
948	<	sigill_action.sa_flags = SA_ONSTACK;
947	>	sigill_action.sa_sigaction = sigill_handler;
948	>	sigill_action.sa_flags = SA_ONSTACK | SA_SIGINFO;
949	>	#ifdef HAVE_SIGNAL_SA_RESTORER
950		sigill_action.sa_restorer = NULL;
951	+	#endif
952		if (sigaction(SIGILL, &sigill_action, NULL) < 0) {
953	<	sprintf(str, GetString(STR_SIGILL_INSTALL_ERR), strerror(errno));
953	>	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGILL", strerror(errno));
954		ErrorAlert(str);
955		goto quit;
956		}
957		#endif
958
959	+	#if !EMULATED_PPC
960		// Install interrupt signal handler
961		sigemptyset(&sigusr2_action.sa_mask);
962	<	sigusr2_action.sa_handler = (__sighandler_t)sigusr2_handler;
963	<	sigusr2_action.sa_flags = 0;
964	<	#if !EMULATED_PPC
759	<	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART;
760	<	#endif
962	>	sigusr2_action.sa_sigaction = sigusr2_handler_init;
963	>	sigusr2_action.sa_flags = SA_ONSTACK | SA_RESTART | SA_SIGINFO;
964	>	#ifdef HAVE_SIGNAL_SA_RESTORER
965		sigusr2_action.sa_restorer = NULL;
966	+	#endif
967		if (sigaction(SIGUSR2, &sigusr2_action, NULL) < 0) {
968	<	sprintf(str, GetString(STR_SIGUSR2_INSTALL_ERR), strerror(errno));
968	>	sprintf(str, GetString(STR_SIG_INSTALL_ERR), "SIGUSR2", strerror(errno));
969		ErrorAlert(str);
970		goto quit;
971		}
972	+	#endif
973
974		// Get my thread ID and execute MacOS thread function
975		emul_thread = pthread_self();
#	Line 789 | Line 995 | static void Quit(void)
995
996		// Stop 60Hz thread
997		if (tick_thread_active) {
998	+	tick_thread_cancel = true;
999		pthread_cancel(tick_thread);
1000		pthread_join(tick_thread, NULL);
1001		}
1002
1003		// Stop NVRAM watchdog thread
1004		if (nvram_thread_active) {
1005	+	nvram_thread_cancel = true;
1006		pthread_cancel(nvram_thread);
1007		pthread_join(nvram_thread, NULL);
1008		}
1009
1010		#if !EMULATED_PPC
1011	<	// Uninstall SIGSEGV handler
1011	>	// Uninstall SIGSEGV and SIGBUS handlers
1012		sigemptyset(&sigsegv_action.sa_mask);
1013		sigsegv_action.sa_handler = SIG_DFL;
1014		sigsegv_action.sa_flags = 0;
1015		sigaction(SIGSEGV, &sigsegv_action, NULL);
1016	+	sigaction(SIGBUS, &sigsegv_action, NULL);
1017
1018		// Uninstall SIGILL handler
1019		sigemptyset(&sigill_action.sa_mask);
1020		sigill_action.sa_handler = SIG_DFL;
1021		sigill_action.sa_flags = 0;
1022		sigaction(SIGILL, &sigill_action, NULL);
814	–	#endif
815	–
816	–	// Save NVRAM
817	–	XPRAMExit();
818	–
819	–	// Exit clipboard
820	–	ClipExit();
821	–
822	–	// Exit Time Manager
823	–	TimerExit();
1023
1024	<	// Exit serial
1025	<	SerialExit();
1026	<
1027	<	// Exit network
1028	<	EtherExit();
1029	<
831	<	// Exit audio
832	<	AudioExit();
833	<
834	<	// Exit video
835	<	VideoExit();
1024	>	// Delete stacks for signal handlers
1025	>	if (sig_stack.ss_sp)
1026	>	free(sig_stack.ss_sp);
1027	>	if (extra_stack.ss_sp)
1028	>	free(extra_stack.ss_sp);
1029	>	#endif
1030
1031	<	// Exit external file system
1032	<	ExtFSExit();
1031	>	// Deinitialize everything
1032	>	ExitAll();
1033
1034	<	// Exit drivers
1035	<	SCSIExit();
842	<	CDROMExit();
843	<	DiskExit();
844	<	SonyExit();
1034	>	// Delete SheepShaver globals
1035	>	SheepMem::Exit();
1036
1037		// Delete RAM area
1038		if (ram_area_mapped)
1039	<	vm_release((char *)RAM_BASE, RAMSize);
1039	>	vm_mac_release(RAMBase, RAMSize);
1040
1041		// Delete ROM area
1042		if (rom_area_mapped)
1043	<	vm_release((char *)ROM_BASE, ROM_AREA_SIZE);
1043	>	vm_mac_release(ROM_BASE, ROM_AREA_SIZE);
1044	>
1045	>	// Delete DR cache areas
1046	>	if (dr_emulator_area_mapped)
1047	>	vm_mac_release(DR_EMULATOR_BASE, DR_EMULATOR_SIZE);
1048	>	if (dr_cache_area_mapped)
1049	>	vm_mac_release(DR_CACHE_BASE, DR_CACHE_SIZE);
1050
1051		// Delete Kernel Data area
1052	<	if (kernel_area >= 0) {
856	<	shmdt((void *)KERNEL_DATA_BASE);
857	<	shmdt((void *)KERNEL_DATA2_BASE);
858	<	shmctl(kernel_area, IPC_RMID, NULL);
859	<	}
1052	>	kernel_data_exit();
1053
1054		// Delete Low Memory area
1055		if (lm_area_mapped)
1056	<	munmap((char *)0x0000, 0x3000);
1056	>	vm_mac_release(0, 0x3000);
1057
1058		// Close /dev/zero
1059		if (zero_fd > 0)
#	Line 878 | Line 1071 | static void Quit(void)
1071		#endif
1072
1073		// Close X11 server connection
1074	+	#ifndef USE_SDL_VIDEO
1075		if (x_display)
1076		XCloseDisplay(x_display);
1077	+	#endif
1078	+
1079	+	// Notify GUI we are about to leave
1080	+	if (gui_connection) {
1081	+	if (rpc_method_invoke(gui_connection, RPC_METHOD_EXIT, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
1082	+	rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID);
1083	+	}
1084
1085		exit(0);
1086		}
1087
1088
1089		/*
1090	+	*  Initialize Kernel Data segments
1091	+	*/
1092	+
1093	+	static bool kernel_data_init(void)
1094	+	{
1095	+	char str[256];
1096	+	uint32 kernel_area_size = (KERNEL_AREA_SIZE + SHMLBA - 1) & -SHMLBA;
1097	+
1098	+	kernel_area = shmget(IPC_PRIVATE, kernel_area_size, 0600);
1099	+	if (kernel_area == -1) {
1100	+	sprintf(str, GetString(STR_KD_SHMGET_ERR), strerror(errno));
1101	+	ErrorAlert(str);
1102	+	return false;
1103	+	}
1104	+	void *kernel_addr = Mac2HostAddr(KERNEL_DATA_BASE & -SHMLBA);
1105	+	if (shmat(kernel_area, kernel_addr, 0) != kernel_addr) {
1106	+	sprintf(str, GetString(STR_KD_SHMAT_ERR), strerror(errno));
1107	+	ErrorAlert(str);
1108	+	return false;
1109	+	}
1110	+	kernel_addr = Mac2HostAddr(KERNEL_DATA2_BASE & -SHMLBA);
1111	+	if (shmat(kernel_area, kernel_addr, 0) != kernel_addr) {
1112	+	sprintf(str, GetString(STR_KD2_SHMAT_ERR), strerror(errno));
1113	+	ErrorAlert(str);
1114	+	return false;
1115	+	}
1116	+	return true;
1117	+	}
1118	+
1119	+
1120	+	/*
1121	+	*  Deallocate Kernel Data segments
1122	+	*/
1123	+
1124	+	static void kernel_data_exit(void)
1125	+	{
1126	+	if (kernel_area >= 0) {
1127	+	shmdt(Mac2HostAddr(KERNEL_DATA_BASE & -SHMLBA));
1128	+	shmdt(Mac2HostAddr(KERNEL_DATA2_BASE & -SHMLBA));
1129	+	shmctl(kernel_area, IPC_RMID, NULL);
1130	+	}
1131	+	}
1132	+
1133	+
1134	+	/*
1135		*  Jump into Mac ROM, start 680x0 emulator
1136		*/
1137
#	Line 954 | Line 1200 | void Execute68kTrap(uint16 trap, M68kReg
1200		uint16 proc[2] = {trap, M68K_RTS};
1201		Execute68k((uint32)proc, r);
1202		}
957	–
958	–
959	–	/*
960	–	*  Execute PPC code from EMUL_OP routine (real mode switch)
961	–	*/
962	–
963	–	void ExecutePPC(void (*func)())
964	–	{
965	–	uint32 tvect[2] = {(uint32)func, 0};    // Fake TVECT
966	–	RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
967	–	M68kRegisters r;
968	–	Execute68k((uint32)&desc, &r);
969	–	}
1203		#endif
1204
1205
#	Line 985 | Line 1218 | void QuitEmulator(void)
1218
1219
1220		/*
988	–	*  Pause/resume emulator
989	–	*/
990	–
991	–	void PauseEmulator(void)
992	–	{
993	–	pthread_kill(emul_thread, SIGSTOP);
994	–	}
995	–
996	–	void ResumeEmulator(void)
997	–	{
998	–	pthread_kill(emul_thread, SIGCONT);
999	–	}
1000	–
1001	–
1002	–	/*
1221		*  Dump 68k registers
1222		*/
1223
#	Line 1027 | Line 1245 | void Dump68kRegs(M68kRegisters *r)
1245		*  Make code executable
1246		*/
1247
1248	<	void MakeExecutable(int dummy, void *start, uint32 length)
1248	>	void MakeExecutable(int dummy, uint32 start, uint32 length)
1249		{
1250	<	if (((uintptr)start >= ROM_BASE) && ((uintptr)start < (ROM_BASE + ROM_SIZE)))
1250	>	if ((start >= ROM_BASE) && (start < (ROM_BASE + ROM_SIZE)))
1251		return;
1252		#if EMULATED_PPC
1253	<	FlushCodeCache((uintptr)start, (uintptr)start + length);
1253	>	FlushCodeCache(start, start + length);
1254		#else
1255	<	flush_icache_range(start, (void *)((uintptr)start + length));
1255	>	flush_icache_range(start, start + length);
1256		#endif
1257		}
1258
1259
1260		/*
1261	<	*  Patch things after system startup (gets called by disk driver accRun routine)
1261	>	*  NVRAM watchdog thread (saves NVRAM every minute)
1262		*/
1263
1264	<	void PatchAfterStartup(void)
1264	>	static void nvram_watchdog(void)
1265		{
1266	<	#if EMULATED_PPC
1267	<	ExecuteNative(NATIVE_VIDEO_INSTALL_ACCEL);
1268	<	#else
1269	<	ExecutePPC(VideoInstallAccel);
1052	<	#endif
1053	<	InstallExtFS();
1266	>	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
1267	>	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1268	>	SaveXPRAM();
1269	>	}
1270		}
1271
1056	–
1057	–	/*
1058	–	*  NVRAM watchdog thread (saves NVRAM every minute)
1059	–	*/
1060	–
1272		static void *nvram_func(void *arg)
1273		{
1274	<	struct timespec req = {60, 0};  // 1 minute
1275	<
1276	<	for (;;) {
1277	<	pthread_testcancel();
1067	<	nanosleep(&req, NULL);
1068	<	pthread_testcancel();
1069	<	if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) {
1070	<	memcpy(last_xpram, XPRAM, XPRAM_SIZE);
1071	<	SaveXPRAM();
1072	<	}
1274	>	while (!nvram_thread_cancel) {
1275	>	for (int i=0; i<60 && !nvram_thread_cancel; i++)
1276	>	Delay_usec(999999);             // Only wait 1 second so we quit promptly when nvram_thread_cancel becomes true
1277	>	nvram_watchdog();
1278		}
1279		return NULL;
1280		}
#	Line 1082 | Line 1287 | static void *nvram_func(void *arg)
1287		static void *tick_func(void *arg)
1288		{
1289		int tick_counter = 0;
1290	<	struct timespec req = {0, 16625000};
1290	>	uint64 start = GetTicks_usec();
1291	>	int64 ticks = 0;
1292	>	uint64 next = GetTicks_usec();
1293
1294	<	for (;;) {
1294	>	while (!tick_thread_cancel) {
1295
1296		// Wait
1297	<	nanosleep(&req, NULL);
1297	>	next += 16625;
1298	>	int64 delay = next - GetTicks_usec();
1299	>	if (delay > 0)
1300	>	Delay_usec(delay);
1301	>	else if (delay < -16625)
1302	>	next = GetTicks_usec();
1303	>	ticks++;
1304
1305		#if !EMULATED_PPC
1306		// Did we crash?
1307		if (emul_thread_fatal) {
1308
1309		// Yes, dump registers
1310	<	pt_regs *r = (pt_regs *)&sigsegv_regs;
1310	>	sigregs *r = &sigsegv_regs;
1311		char str[256];
1312	<	sprintf(str, "SIGSEGV\n"
1312	>	if (crash_reason == NULL)
1313	>	crash_reason = "SIGSEGV";
1314	>	sprintf(str, "%s\n"
1315		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1316		"  xer %08lx     cr %08lx  \n"
1317		"   r0 %08lx     r1 %08lx     r2 %08lx     r3 %08lx\n"
#	Line 1107 | Line 1322 | static void *tick_func(void *arg)
1322		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1323		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1324		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1325	+	crash_reason,
1326		r->nip, r->link, r->ctr, r->msr,
1327		r->xer, r->ccr,
1328		r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
#	Line 1142 | Line 1358 | static void *tick_func(void *arg)
1358		TriggerInterrupt();
1359		}
1360		}
1361	+
1362	+	uint64 end = GetTicks_usec();
1363	+	D(bug("%lld ticks in %lld usec = %f ticks/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
1364		return NULL;
1365		}
1366
#	Line 1152 | Line 1371 | static void *tick_func(void *arg)
1371
1372		void Set_pthread_attr(pthread_attr_t *attr, int priority)
1373		{
1374	<	// nothing to do
1374	>	#ifdef HAVE_PTHREADS
1375	>	pthread_attr_init(attr);
1376	>	#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
1377	>	// Some of these only work for superuser
1378	>	if (geteuid() == 0) {
1379	>	pthread_attr_setinheritsched(attr, PTHREAD_EXPLICIT_SCHED);
1380	>	pthread_attr_setschedpolicy(attr, SCHED_FIFO);
1381	>	struct sched_param fifo_param;
1382	>	fifo_param.sched_priority = ((sched_get_priority_min(SCHED_FIFO) +
1383	>	sched_get_priority_max(SCHED_FIFO)) / 2 +
1384	>	priority);
1385	>	pthread_attr_setschedparam(attr, &fifo_param);
1386	>	}
1387	>	if (pthread_attr_setscope(attr, PTHREAD_SCOPE_SYSTEM) != 0) {
1388	>	#ifdef PTHREAD_SCOPE_BOUND_NP
1389	>	// If system scope is not available (eg. we're not running
1390	>	// with CAP_SCHED_MGT capability on an SGI box), try bound
1391	>	// scope.  It exposes pthread scheduling to the kernel,
1392	>	// without setting realtime priority.
1393	>	pthread_attr_setscope(attr, PTHREAD_SCOPE_BOUND_NP);
1394	>	#endif
1395	>	}
1396	>	#endif
1397	>	#endif
1398		}
1399
1400
#	Line 1168 | Line 1410 | struct B2_mutex {
1410		pthread_mutexattr_init(&attr);
1411		// Initialize the mutex for priority inheritance --
1412		// required for accurate timing.
1413	<	#ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
1413	>	#if defined(HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL) && !defined(__CYGWIN__)
1414		pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT);
1415		#endif
1416		#if defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE) && defined(PTHREAD_MUTEX_NORMAL)
#	Line 1239 | Line 1481 | void B2_delete_mutex(B2_mutex *mutex)
1481		*  Trigger signal USR2 from another thread
1482		*/
1483
1484	<	#if !EMULATED_PPC || ASYNC_IRQ
1484	>	#if !EMULATED_PPC
1485		void TriggerInterrupt(void)
1486		{
1487	<	if (ready_for_signals)
1487	>	if (ready_for_signals) {
1488	>	idle_resume();
1489		pthread_kill(emul_thread, SIGUSR2);
1490	+	}
1491		}
1492		#endif
1493
#	Line 1271 | Line 1515 | void ClearInterruptFlag(uint32 flag)
1515
1516		void DisableInterrupt(void)
1517		{
1518	+	#if EMULATED_PPC
1519	+	WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) + 1);
1520	+	#else
1521		atomic_add((int *)XLM_IRQ_NEST, 1);
1522	+	#endif
1523		}
1524
1525
#	Line 1281 | Line 1529 | void DisableInterrupt(void)
1529
1530		void EnableInterrupt(void)
1531		{
1532	+	#if EMULATED_PPC
1533	+	WriteMacInt32(XLM_IRQ_NEST, int32(ReadMacInt32(XLM_IRQ_NEST)) - 1);
1534	+	#else
1535		atomic_add((int *)XLM_IRQ_NEST, -1);
1536	+	#endif
1537		}
1538
1539
#	Line 1289 | Line 1541 | void EnableInterrupt(void)
1541		*  USR2 handler
1542		*/
1543
1544	<	#if EMULATED_PPC
1545	<	static void sigusr2_handler(int sig)
1544	>	#if !EMULATED_PPC
1545	>	void sigusr2_handler(int sig, siginfo_t *sip, void *scp)
1546		{
1547	<	#if ASYNC_IRQ
1548	<	extern void HandleInterrupt(void);
1549	<	HandleInterrupt();
1547	>	machine_regs *r = MACHINE_REGISTERS(scp);
1548	>
1549	>	#ifdef SYSTEM_CLOBBERS_R2
1550	>	// Restore pointer to Thread Local Storage
1551	>	set_r2(TOC);
1552	>	#endif
1553	>	#ifdef SYSTEM_CLOBBERS_R13
1554	>	// Restore pointer to .sdata section
1555	>	set_r13(R13);
1556	>	#endif
1557	>
1558	>	#ifdef USE_SDL_VIDEO
1559	>	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
1560	>	SDL_PumpEvents();
1561		#endif
1299	–	}
1300	–	#else
1301	–	static void sigusr2_handler(int sig, sigcontext_struct *sc)
1302	–	{
1303	–	pt_regs *r = sc->regs;
1562
1563		// Do nothing if interrupts are disabled
1564		if (*(int32 *)XLM_IRQ_NEST > 0)
#	Line 1314 | Line 1572 | static void sigusr2_handler(int sig, sig
1572		case MODE_68K:
1573		// 68k emulator active, trigger 68k interrupt level 1
1574		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1575	<	r->ccr |= ntohl(kernel_data->v[0x674 >> 2]);
1575	>	r->cr() |= ntohl(kernel_data->v[0x674 >> 2]);
1576		break;
1577
1578		#if INTERRUPTS_IN_NATIVE_MODE
1579		case MODE_NATIVE:
1580		// 68k emulator inactive, in nanokernel?
1581	<	if (r->gpr[1] != KernelDataAddr) {
1581	>	if (r->gpr(1) != KernelDataAddr) {
1582	>
1583	>	// Set extra stack for SIGSEGV handler
1584	>	sigaltstack(&extra_stack, NULL);
1585	>
1586		// Prepare for 68k interrupt level 1
1587		WriteMacInt16(ntohl(kernel_data->v[0x67c >> 2]), 1);
1588		WriteMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc, ReadMacInt32(ntohl(kernel_data->v[0x658 >> 2]) + 0xdc) | ntohl(kernel_data->v[0x674 >> 2]));
1589
1590		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
1591	<	atomic_add((int32 *)XLM_IRQ_NEST, 1);
1591	>	DisableInterrupt();
1592		if (ROMType == ROMTYPE_NEWWORLD)
1593		ppc_interrupt(ROM_BASE + 0x312b1c, KernelDataAddr);
1594		else
1595		ppc_interrupt(ROM_BASE + 0x312a3c, KernelDataAddr);
1596	+
1597	+	// Reset normal stack
1598	+	sigaltstack(&sig_stack, NULL);
1599		}
1600		break;
1601		#endif
#	Line 1341 | Line 1606 | static void sigusr2_handler(int sig, sig
1606		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1607
1608		// Set extra stack for SIGSEGV handler
1609	<	struct sigaltstack new_stack;
1345	<	new_stack.ss_sp = extra_stack;
1346	<	new_stack.ss_flags = 0;
1347	<	new_stack.ss_size = SIG_STACK_SIZE;
1348	<	sigaltstack(&new_stack, NULL);
1609	>	sigaltstack(&extra_stack, NULL);
1610		#if 1
1611		// Execute full 68k interrupt routine
1612		M68kRegisters r;
#	Line 1367 | Line 1628 | static void sigusr2_handler(int sig, sig
1628		if (InterruptFlags & INTFLAG_VIA) {
1629		ClearInterruptFlag(INTFLAG_VIA);
1630		ADBInterrupt();
1631	<	ExecutePPC(VideoVBL);
1631	>	ExecuteNative(NATIVE_VIDEO_VBL);
1632		}
1633		}
1634		#endif
1635	<	// Reset normal signal stack
1636	<	new_stack.ss_sp = sig_stack;
1376	<	new_stack.ss_flags = 0;
1377	<	new_stack.ss_size = SIG_STACK_SIZE;
1378	<	sigaltstack(&new_stack, NULL);
1635	>	// Reset normal stack
1636	>	sigaltstack(&sig_stack, NULL);
1637		}
1638		break;
1639		#endif
#	Line 1389 | Line 1647 | static void sigusr2_handler(int sig, sig
1647		*/
1648
1649		#if !EMULATED_PPC
1650	<	static void sigsegv_handler(int sig, sigcontext_struct *sc)
1650	>	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp)
1651		{
1652	<	pt_regs *r = sc->regs;
1652	>	machine_regs *r = MACHINE_REGISTERS(scp);
1653
1654		// Get effective address
1655	<	uint32 addr = r->dar;
1655	>	uint32 addr = r->dar();
1656
1657	+	#ifdef SYSTEM_CLOBBERS_R2
1658	+	// Restore pointer to Thread Local Storage
1659	+	set_r2(TOC);
1660	+	#endif
1661	+	#ifdef SYSTEM_CLOBBERS_R13
1662	+	// Restore pointer to .sdata section
1663	+	set_r13(R13);
1664	+	#endif
1665	+
1666		#if ENABLE_VOSF
1667	<	// Handle screen fault.
1668	<	extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
1669	<	if (Screen_fault_handler((sigsegv_address_t)addr, (sigsegv_address_t)r->nip))
1667	>	// Handle screen fault
1668	>	#if SIGSEGV_CHECK_VERSION(1,0,0)
1669	>	sigsegv_info_t si;
1670	>	si.addr = (sigsegv_address_t)addr;
1671	>	si.pc = (sigsegv_address_t)r->pc();
1672	>	#endif
1673	>	extern bool Screen_fault_handler(sigsegv_info_t *sip);
1674	>	if (Screen_fault_handler(&si))
1675		return;
1676		#endif
1677
1678		num_segv++;
1679
1680	<	// Fault in Mac ROM or RAM?
1681	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1680	>	// Fault in Mac ROM or RAM or DR Cache?
1681	>	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));
1682		if (mac_fault) {
1683
1684		// "VM settings" during MacOS 8 installation
1685	<	if (r->nip == ROM_BASE + 0x488160 && r->gpr[20] == 0xf8000000) {
1686	<	r->nip += 4;
1687	<	r->gpr[8] = 0;
1685	>	if (r->pc() == ROM_BASE + 0x488160 && r->gpr(20) == 0xf8000000) {
1686	>	r->pc() += 4;
1687	>	r->gpr(8) = 0;
1688		return;
1689
1690		// MacOS 8.5 installation
1691	<	} else if (r->nip == ROM_BASE + 0x488140 && r->gpr[16] == 0xf8000000) {
1692	<	r->nip += 4;
1693	<	r->gpr[8] = 0;
1691	>	} else if (r->pc() == ROM_BASE + 0x488140 && r->gpr(16) == 0xf8000000) {
1692	>	r->pc() += 4;
1693	>	r->gpr(8) = 0;
1694		return;
1695
1696		// MacOS 8 serial drivers on startup
1697	<	} else if (r->nip == ROM_BASE + 0x48e080 && (r->gpr[8] == 0xf3012002 || r->gpr[8] == 0xf3012000)) {
1698	<	r->nip += 4;
1699	<	r->gpr[8] = 0;
1697	>	} else if (r->pc() == ROM_BASE + 0x48e080 && (r->gpr(8) == 0xf3012002 || r->gpr(8) == 0xf3012000)) {
1698	>	r->pc() += 4;
1699	>	r->gpr(8) = 0;
1700		return;
1701
1702		// MacOS 8.1 serial drivers on startup
1703	<	} else if (r->nip == ROM_BASE + 0x48c5e0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1704	<	r->nip += 4;
1703	>	} else if (r->pc() == ROM_BASE + 0x48c5e0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1704	>	r->pc() += 4;
1705		return;
1706	<	} else if (r->nip == ROM_BASE + 0x4a10a0 && (r->gpr[20] == 0xf3012002 || r->gpr[20] == 0xf3012000)) {
1707	<	r->nip += 4;
1706	>	} else if (r->pc() == ROM_BASE + 0x4a10a0 && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1707	>	r->pc() += 4;
1708	>	return;
1709	>
1710	>	// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
1711	>	} else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(16) == 0xf3012002 || r->gpr(16) == 0xf3012000)) {
1712	>	r->pc() += 4;
1713	>	return;
1714	>	} else if ((r->pc() - DR_CACHE_BASE) < DR_CACHE_SIZE && (r->gpr(20) == 0xf3012002 || r->gpr(20) == 0xf3012000)) {
1715	>	r->pc() += 4;
1716		return;
1717		}
1718
1719		// Get opcode and divide into fields
1720	<	uint32 opcode = *((uint32 *)r->nip);
1720	>	uint32 opcode = *((uint32 *)r->pc());
1721		uint32 primop = opcode >> 26;
1722		uint32 exop = (opcode >> 1) & 0x3ff;
1723		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1526 | Line 1806 | static void sigsegv_handler(int sig, sig
1806		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_NORM; break;
1807		case 45:        // sthu
1808		transfer_type = TYPE_STORE; transfer_size = SIZE_HALFWORD; addr_mode = MODE_U; break;
1809	+	#if EMULATE_UNALIGNED_LOADSTORE_MULTIPLE
1810	+	case 46:        // lmw
1811	+	if ((addr % 4) != 0) {
1812	+	uint32 ea = addr;
1813	+	D(bug("WARNING: unaligned lmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1814	+	for (int i = rd; i <= 31; i++) {
1815	+	r->gpr(i) = ReadMacInt32(ea);
1816	+	ea += 4;
1817	+	}
1818	+	r->pc() += 4;
1819	+	goto rti;
1820	+	}
1821	+	break;
1822	+	case 47:        // stmw
1823	+	if ((addr % 4) != 0) {
1824	+	uint32 ea = addr;
1825	+	D(bug("WARNING: unaligned stmw to EA=%08x from IP=%08x\n", ea, r->pc()));
1826	+	for (int i = rd; i <= 31; i++) {
1827	+	WriteMacInt32(ea, r->gpr(i));
1828	+	ea += 4;
1829	+	}
1830	+	r->pc() += 4;
1831	+	goto rti;
1832	+	}
1833	+	break;
1834	+	#endif
1835		}
1836
1837	<	// Ignore ROM writes
1838	<	if (transfer_type == TYPE_STORE && addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) {
1839	<	//                      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));
1837	>	// Ignore ROM writes (including to the zero page, which is read-only)
1838	>	if (transfer_type == TYPE_STORE &&
1839	>	((addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) ||
1840	>	(addr >= SheepMem::ZeroPage() && addr < SheepMem::ZeroPage() + SheepMem::PageSize()))) {
1841	>	//                      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()));
1842		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1843	<	r->gpr[ra] = addr;
1844	<	r->nip += 4;
1843	>	r->gpr(ra) = addr;
1844	>	r->pc() += 4;
1845		goto rti;
1846		}
1847
1848		// Ignore illegal memory accesses?
1849		if (PrefsFindBool("ignoresegv")) {
1850		if (addr_mode == MODE_U || addr_mode == MODE_UX)
1851	<	r->gpr[ra] = addr;
1851	>	r->gpr(ra) = addr;
1852		if (transfer_type == TYPE_LOAD)
1853	<	r->gpr[rd] = 0;
1854	<	r->nip += 4;
1853	>	r->gpr(rd) = 0;
1854	>	r->pc() += 4;
1855		goto rti;
1856		}
1857
#	Line 1551 | Line 1859 | static void sigsegv_handler(int sig, sig
1859		if (!PrefsFindBool("nogui")) {
1860		char str[256];
1861		if (transfer_type == TYPE_LOAD || transfer_type == TYPE_STORE)
1862	<	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]);
1862	>	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));
1863		else
1864	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
1864	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
1865		ErrorAlert(str);
1866		QuitEmulator();
1867		return;
#	Line 1561 | Line 1869 | static void sigsegv_handler(int sig, sig
1869		}
1870
1871		// For all other errors, jump into debugger (sort of...)
1872	+	crash_reason = (sig == SIGBUS) ? "SIGBUS" : "SIGSEGV";
1873		if (!ready_for_signals) {
1874	<	printf("SIGSEGV\n");
1875	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
1874	>	printf("%s\n");
1875	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
1876		printf(
1877		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
1878		"  xer %08lx     cr %08lx  \n"
#	Line 1575 | Line 1884 | static void sigsegv_handler(int sig, sig
1884		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
1885		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
1886		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
1887	<	r->nip, r->link, r->ctr, r->msr,
1888	<	r->xer, r->ccr,
1889	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
1890	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
1891	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
1892	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
1893	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
1894	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
1895	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
1896	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
1887	>	crash_reason,
1888	>	r->pc(), r->lr(), r->ctr(), r->msr(),
1889	>	r->xer(), r->cr(),
1890	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
1891	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
1892	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
1893	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
1894	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
1895	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
1896	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
1897	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
1898		exit(1);
1899		QuitEmulator();
1900		return;
1901		} else {
1902		// We crashed. Save registers, tell tick thread and loop forever
1903	<	sigsegv_regs = *(sigregs *)r;
1903	>	build_sigregs(&sigsegv_regs, r);
1904		emul_thread_fatal = true;
1905		for (;;) ;
1906		}
#	Line 1602 | Line 1912 | rti:;
1912		*  SIGILL handler
1913		*/
1914
1915	<	static void sigill_handler(int sig, sigcontext_struct *sc)
1915	>	static void sigill_handler(int sig, siginfo_t *sip, void *scp)
1916		{
1917	<	pt_regs *r = sc->regs;
1917	>	machine_regs *r = MACHINE_REGISTERS(scp);
1918		char str[256];
1919
1920	+	#ifdef SYSTEM_CLOBBERS_R2
1921	+	// Restore pointer to Thread Local Storage
1922	+	set_r2(TOC);
1923	+	#endif
1924	+	#ifdef SYSTEM_CLOBBERS_R13
1925	+	// Restore pointer to .sdata section
1926	+	set_r13(R13);
1927	+	#endif
1928	+
1929		// Fault in Mac ROM or RAM?
1930	<	bool mac_fault = (r->nip >= ROM_BASE) && (r->nip < (ROM_BASE + ROM_AREA_SIZE)) || (r->nip >= RAMBase) && (r->nip < (RAMBase + RAMSize));
1930	>	bool mac_fault = (r->pc() >= ROM_BASE) && (r->pc() < (ROM_BASE + ROM_AREA_SIZE)) || (r->pc() >= RAMBase) && (r->pc() < (RAMBase + RAMSize));
1931		if (mac_fault) {
1932
1933		// Get opcode and divide into fields
1934	<	uint32 opcode = *((uint32 *)r->nip);
1934	>	uint32 opcode = *((uint32 *)r->pc());
1935		uint32 primop = opcode >> 26;
1936		uint32 exop = (opcode >> 1) & 0x3ff;
1937		uint32 ra = (opcode >> 16) & 0x1f;
#	Line 1623 | Line 1942 | static void sigill_handler(int sig, sigc
1942		switch (primop) {
1943		case 9:         // POWER instructions
1944		case 22:
1945	<	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->nip, r->gpr[1], opcode);
1945	>	power_inst:             sprintf(str, GetString(STR_POWER_INSTRUCTION_ERR), r->pc(), r->gpr(1), opcode);
1946		ErrorAlert(str);
1947		QuitEmulator();
1948		return;
#	Line 1631 | Line 1950 | power_inst:            sprintf(str, GetString(STR_
1950		case 31:
1951		switch (exop) {
1952		case 83:        // mfmsr
1953	<	r->gpr[rd] = 0xf072;
1954	<	r->nip += 4;
1953	>	r->gpr(rd) = 0xf072;
1954	>	r->pc() += 4;
1955		goto rti;
1956
1957		case 210:       // mtsr
1958		case 242:       // mtsrin
1959		case 306:       // tlbie
1960	<	r->nip += 4;
1960	>	r->pc() += 4;
1961		goto rti;
1962
1963		case 339: {     // mfspr
#	Line 1654 | Line 1973 | power_inst:            sprintf(str, GetString(STR_
1973		case 957:       // PMC3
1974		case 958:       // PMC4
1975		case 959:       // SDA
1976	<	r->nip += 4;
1976	>	r->pc() += 4;
1977		goto rti;
1978		case 25:        // SDR1
1979	<	r->gpr[rd] = 0xdead001f;
1980	<	r->nip += 4;
1979	>	r->gpr(rd) = 0xdead001f;
1980	>	r->pc() += 4;
1981		goto rti;
1982		case 287:       // PVR
1983	<	r->gpr[rd] = PVR;
1984	<	r->nip += 4;
1983	>	r->gpr(rd) = PVR;
1984	>	r->pc() += 4;
1985		goto rti;
1986		}
1987		break;
#	Line 1698 | Line 2017 | power_inst:            sprintf(str, GetString(STR_
2017		case 957:       // PMC3
2018		case 958:       // PMC4
2019		case 959:       // SDA
2020	<	r->nip += 4;
2020	>	r->pc() += 4;
2021		goto rti;
2022		}
2023		break;
#	Line 1717 | Line 2036 | power_inst:            sprintf(str, GetString(STR_
2036
2037		// In GUI mode, show error alert
2038		if (!PrefsFindBool("nogui")) {
2039	<	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->nip, r->gpr[24], r->gpr[1], opcode);
2039	>	sprintf(str, GetString(STR_UNKNOWN_SEGV_ERR), r->pc(), r->gpr(24), r->gpr(1), opcode);
2040		ErrorAlert(str);
2041		QuitEmulator();
2042		return;
#	Line 1725 | Line 2044 | power_inst:            sprintf(str, GetString(STR_
2044		}
2045
2046		// For all other errors, jump into debugger (sort of...)
2047	+	crash_reason = "SIGILL";
2048		if (!ready_for_signals) {
2049	<	printf("SIGILL\n");
2050	<	printf(" sigcontext %p, pt_regs %p\n", sc, r);
2049	>	printf("%s\n");
2050	>	printf(" sigcontext %p, machine_regs %p\n", scp, r);
2051		printf(
2052		"   pc %08lx     lr %08lx    ctr %08lx    msr %08lx\n"
2053		"  xer %08lx     cr %08lx  \n"
#	Line 1739 | Line 2059 | power_inst:            sprintf(str, GetString(STR_
2059		"  r20 %08lx    r21 %08lx    r22 %08lx    r23 %08lx\n"
2060		"  r24 %08lx    r25 %08lx    r26 %08lx    r27 %08lx\n"
2061		"  r28 %08lx    r29 %08lx    r30 %08lx    r31 %08lx\n",
2062	<	r->nip, r->link, r->ctr, r->msr,
2063	<	r->xer, r->ccr,
2064	<	r->gpr[0], r->gpr[1], r->gpr[2], r->gpr[3],
2065	<	r->gpr[4], r->gpr[5], r->gpr[6], r->gpr[7],
2066	<	r->gpr[8], r->gpr[9], r->gpr[10], r->gpr[11],
2067	<	r->gpr[12], r->gpr[13], r->gpr[14], r->gpr[15],
2068	<	r->gpr[16], r->gpr[17], r->gpr[18], r->gpr[19],
2069	<	r->gpr[20], r->gpr[21], r->gpr[22], r->gpr[23],
2070	<	r->gpr[24], r->gpr[25], r->gpr[26], r->gpr[27],
2071	<	r->gpr[28], r->gpr[29], r->gpr[30], r->gpr[31]);
2062	>	crash_reason,
2063	>	r->pc(), r->lr(), r->ctr(), r->msr(),
2064	>	r->xer(), r->cr(),
2065	>	r->gpr(0), r->gpr(1), r->gpr(2), r->gpr(3),
2066	>	r->gpr(4), r->gpr(5), r->gpr(6), r->gpr(7),
2067	>	r->gpr(8), r->gpr(9), r->gpr(10), r->gpr(11),
2068	>	r->gpr(12), r->gpr(13), r->gpr(14), r->gpr(15),
2069	>	r->gpr(16), r->gpr(17), r->gpr(18), r->gpr(19),
2070	>	r->gpr(20), r->gpr(21), r->gpr(22), r->gpr(23),
2071	>	r->gpr(24), r->gpr(25), r->gpr(26), r->gpr(27),
2072	>	r->gpr(28), r->gpr(29), r->gpr(30), r->gpr(31));
2073		exit(1);
2074		QuitEmulator();
2075		return;
2076		} else {
2077		// We crashed. Save registers, tell tick thread and loop forever
2078	<	sigsegv_regs = *(sigregs *)r;
2078	>	build_sigregs(&sigsegv_regs, r);
2079		emul_thread_fatal = true;
2080		for (;;) ;
2081		}
#	Line 1764 | Line 2085 | rti:;
2085
2086
2087		/*
2088	+	*  Helpers to share 32-bit addressable data with MacOS
2089	+	*/
2090	+
2091	+	bool SheepMem::Init(void)
2092	+	{
2093	+	// Size of a native page
2094	+	page_size = getpagesize();
2095	+
2096	+	// Allocate SheepShaver globals
2097	+	proc = base;
2098	+	if (vm_mac_acquire(base, size) < 0)
2099	+	return false;
2100	+
2101	+	// Allocate page with all bits set to 0, right in the middle
2102	+	// This is also used to catch undesired overlaps between proc and data areas
2103	+	zero_page = proc + (size / 2);
2104	+	Mac_memset(zero_page, 0, page_size);
2105	+	if (vm_protect(Mac2HostAddr(zero_page), page_size, VM_PAGE_READ) < 0)
2106	+	return false;
2107	+
2108	+	#if EMULATED_PPC
2109	+	// Allocate alternate stack for PowerPC interrupt routine
2110	+	sig_stack = base + size;
2111	+	if (vm_mac_acquire(sig_stack, SIG_STACK_SIZE) < 0)
2112	+	return false;
2113	+	#endif
2114	+
2115	+	data = base + size;
2116	+	return true;
2117	+	}
2118	+
2119	+	void SheepMem::Exit(void)
2120	+	{
2121	+	if (data) {
2122	+	// Delete SheepShaver globals
2123	+	vm_mac_release(base, size);
2124	+
2125	+	#if EMULATED_PPC
2126	+	// Delete alternate stack for PowerPC interrupt routine
2127	+	vm_mac_release(sig_stack, SIG_STACK_SIZE);
2128	+	#endif
2129	+	}
2130	+	}
2131	+
2132	+
2133	+	/*
2134		*  Display alert
2135		*/
2136
#	Line 1812 | Line 2179 | void display_alert(int title_id, int pre
2179
2180		void ErrorAlert(const char *text)
2181		{
2182	<	#ifdef ENABLE_GTK
2182	>	if (gui_connection) {
2183	>	if (rpc_method_invoke(gui_connection, RPC_METHOD_ERROR_ALERT, RPC_TYPE_STRING, text, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR &&
2184	>	rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
2185	>	return;
2186	>	}
2187	>	#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
2188		if (PrefsFindBool("nogui") || x_display == NULL) {
2189		printf(GetString(STR_SHELL_ERROR_PREFIX), text);
2190		return;
#	Line 1831 | Line 2203 | void ErrorAlert(const char *text)
2203
2204		void WarningAlert(const char *text)
2205		{
2206	<	#ifdef ENABLE_GTK
2206	>	if (gui_connection) {
2207	>	if (rpc_method_invoke(gui_connection, RPC_METHOD_WARNING_ALERT, RPC_TYPE_STRING, text, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR &&
2208	>	rpc_method_wait_for_reply(gui_connection, RPC_TYPE_INVALID) == RPC_ERROR_NO_ERROR)
2209	>	return;
2210	>	}
2211	>	#if defined(ENABLE_GTK) && !defined(USE_SDL_VIDEO)
2212		if (PrefsFindBool("nogui") || x_display == NULL) {
2213		printf(GetString(STR_SHELL_WARNING_PREFIX), text);
2214		return;

Diff Legend

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