ViewVC Help

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

root/cebix/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents):
Revision 1.2 by gbeauche, 2003-09-28T21:27:34Z vs.
Revision 1.35 by gbeauche, 2004-04-22T22:54:47Z

#	Line 1 | Line 1
1		/*
2		*  sheepshaver_glue.cpp - Glue Kheperix CPU to SheepShaver CPU engine interface
3		*
4	<	*  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 21 | Line 21
21		#include "sysdeps.h"
22		#include "cpu_emulation.h"
23		#include "main.h"
24	+	#include "prefs.h"
25		#include "xlowmem.h"
26		#include "emul_op.h"
27		#include "rom_patches.h"
28		#include "macos_util.h"
29		#include "block-alloc.hpp"
30		#include "sigsegv.h"
30	–	#include "spcflags.h"
31		#include "cpu/ppc/ppc-cpu.hpp"
32		#include "cpu/ppc/ppc-operations.hpp"
33	+	#include "cpu/ppc/ppc-instructions.hpp"
34	+	#include "thunks.h"
35
36		// Used for NativeOp trampolines
37		#include "video.h"
38		#include "name_registry.h"
39		#include "serial.h"
40	+	#include "ether.h"
41
42		#include <stdio.h>
43	+	#include <stdlib.h>
44
45		#if ENABLE_MON
46		#include "mon.h"
47		#include "mon_disass.h"
48		#endif
49
50	<	#define DEBUG 1
50	>	#define DEBUG 0
51		#include "debug.h"
52
53	+	// Emulation time statistics
54	+	#define EMUL_TIME_STATS 1
55	+
56	+	#if EMUL_TIME_STATS
57	+	static clock_t emul_start_time;
58	+	static uint32 interrupt_count = 0;
59	+	static clock_t interrupt_time = 0;
60	+	static uint32 exec68k_count = 0;
61	+	static clock_t exec68k_time = 0;
62	+	static uint32 native_exec_count = 0;
63	+	static clock_t native_exec_time = 0;
64	+	static uint32 macos_exec_count = 0;
65	+	static clock_t macos_exec_time = 0;
66	+	#endif
67	+
68		static void enter_mon(void)
69		{
70		// Start up mon in real-mode
#	Line 55 | Line 74 | static void enter_mon(void)
74		#endif
75		}
76
77	+	// From main_*.cpp
78	+	extern uintptr SignalStackBase();
79	+
80	+	// From rsrc_patches.cpp
81	+	extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
82	+
83	+	// PowerPC EmulOp to exit from emulation looop
84	+	const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
85	+
86		// Enable multicore (main/interrupts) cpu emulation?
87	<	#define MULTICORE_CPU 0
87	>	#define MULTICORE_CPU (ASYNC_IRQ ? 1 : 0)
88
89		// Enable Execute68k() safety checks?
90		#define SAFE_EXEC_68K 1
#	Line 70 | Line 98 | static void enter_mon(void)
98		// Interrupts in native mode?
99		#define INTERRUPTS_IN_NATIVE_MODE 1
100
101	<	// 68k Emulator Data
102	<	struct EmulatorData {
75	<	uint32  v[0x400];
76	<	};
101	>	// Pointer to Kernel Data
102	>	static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
103
104	<	// Kernel Data
105	<	struct KernelData {
80	<	uint32  v[0x400];
81	<	EmulatorData ed;
82	<	};
104	>	// SIGSEGV handler
105	>	static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
106
107	<	// Pointer to Kernel Data
108	<	static KernelData * const kernel_data = (KernelData *)0x68ffe000;
107	>	// JIT Compiler enabled?
108	>	static inline bool enable_jit_p()
109	>	{
110	>	return PrefsFindBool("jit");
111	>	}
112
113
114		/**
115		*              PowerPC emulator glue with special 'sheep' opcodes
116		**/
117
118	<	struct sheepshaver_exec_return { };
118	>	enum {
119	>	PPC_I(SHEEP) = PPC_I(MAX),
120	>	PPC_I(SHEEP_MAX)
121	>	};
122
123		class sheepshaver_cpu
124		: public powerpc_cpu
#	Line 99 | Line 128 | class sheepshaver_cpu
128
129		public:
130
131	<	sheepshaver_cpu()
132	<	: powerpc_cpu()
104	<	{ init_decoder(); }
131	>	// Constructor
132	>	sheepshaver_cpu();
133
134	<	// Condition Register accessors
134	>	// CR & XER accessors
135		uint32 get_cr() const           { return cr().get(); }
136		void set_cr(uint32 v)           { cr().set(v); }
137	+	uint32 get_xer() const          { return xer().get(); }
138	+	void set_xer(uint32 v)          { xer().set(v); }
139
140	<	// Execution loop
141	<	void execute(uint32 pc);
140	>	// Execute EMUL_OP routine
141	>	void execute_emul_op(uint32 emul_op);
142
143		// Execute 68k routine
144		void execute_68k(uint32 entry, M68kRegisters *r);
#	Line 119 | Line 149 | public:
149		// Execute MacOS/PPC code
150		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
151
152	+	// Compile one instruction
153	+	virtual bool compile1(codegen_context_t & cg_context);
154	+
155		// Resource manager thunk
156		void get_resource(uint32 old_get_resource);
157
158		// Handle MacOS interrupt
159	<	void interrupt(uint32 entry, sheepshaver_cpu *cpu);
160	<
128	<	// spcflags for interrupts handling
129	<	static uint32 spcflags;
159	>	void interrupt(uint32 entry);
160	>	void handle_interrupt();
161
162	<	// Lazy memory allocator (one item at a time)
163	<	void *operator new(size_t size)
133	<	{ return allocator_helper< sheepshaver_cpu, lazy_allocator >::allocate(); }
134	<	void operator delete(void *p)
135	<	{ allocator_helper< sheepshaver_cpu, lazy_allocator >::deallocate(p); }
136	<	// FIXME: really make surre array allocation fail at link time?
137	<	void *operator new[](size_t);
138	<	void operator delete[](void *p);
162	>	// Make sure the SIGSEGV handler can access CPU registers
163	>	friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
164		};
165
166	<	uint32 sheepshaver_cpu::spcflags = 0;
167	<	lazy_allocator< sheepshaver_cpu > allocator_helper< sheepshaver_cpu, lazy_allocator >::allocator;
166	>	// Memory allocator returning areas aligned on 16-byte boundaries
167	>	void *operator new(size_t size)
168	>	{
169	>	void *p;
170
171	<	void sheepshaver_cpu::init_decoder()
171	>	#if defined(HAVE_POSIX_MEMALIGN)
172	>	if (posix_memalign(&p, 16, size) != 0)
173	>	throw std::bad_alloc();
174	>	#elif defined(HAVE_MEMALIGN)
175	>	p = memalign(16, size);
176	>	#elif defined(HAVE_VALLOC)
177	>	p = valloc(size); // page-aligned!
178	>	#else
179	>	/* XXX: handle padding ourselves */
180	>	p = malloc(size);
181	>	#endif
182	>
183	>	return p;
184	>	}
185	>
186	>	void operator delete(void *p)
187		{
188	<	#ifndef PPC_NO_STATIC_II_INDEX_TABLE
189	<	static bool initialized = false;
190	<	if (initialized)
191	<	return;
150	<	initialized = true;
188	>	#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
189	>	#if defined(__GLIBC__)
190	>	// this is known to work only with GNU libc
191	>	free(p);
192		#endif
193	+	#else
194	+	free(p);
195	+	#endif
196	+	}
197	+
198	+	sheepshaver_cpu::sheepshaver_cpu()
199	+	: powerpc_cpu(enable_jit_p())
200	+	{
201	+	init_decoder();
202	+	}
203
204	+	void sheepshaver_cpu::init_decoder()
205	+	{
206		static const instr_info_t sheep_ii_table[] = {
207		{ "sheep",
208	<	(execute_fn)&sheepshaver_cpu::execute_sheep,
208	>	(execute_pmf)&sheepshaver_cpu::execute_sheep,
209		NULL,
210	<	D_form, 6, 0, CFLOW_TRAP
210	>	PPC_I(SHEEP),
211	>	D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
212		}
213		};
214
#	Line 171 | Line 225 | void sheepshaver_cpu::init_decoder()
225		static void NativeOp(int selector);
226
227		/*              NativeOp instruction format:
228	<	+------------+--------------------------+--+----------+------------+
229	<	|      6     |                          |FN|    OP    |      2     |
230	<	+------------+--------------------------+--+----------+------------+
231	<	0         5 |6                       19 20 21      25 26        31
228	>	+------------+-------------------------+--+-----------+------------+
229	>	|      6     |                         |FN|    OP     |      2     |
230	>	+------------+-------------------------+--+-----------+------------+
231	>	0         5 |6                      18 19 20      25 26        31
232		*/
233
234	<	typedef bit_field< 20, 20 > FN_field;
235	<	typedef bit_field< 21, 25 > NATIVE_OP_field;
234	>	typedef bit_field< 19, 19 > FN_field;
235	>	typedef bit_field< 20, 25 > NATIVE_OP_field;
236		typedef bit_field< 26, 31 > EMUL_OP_field;
237
238	+	// Execute EMUL_OP routine
239	+	void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
240	+	{
241	+	M68kRegisters r68;
242	+	WriteMacInt32(XLM_68K_R25, gpr(25));
243	+	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
244	+	for (int i = 0; i < 8; i++)
245	+	r68.d[i] = gpr(8 + i);
246	+	for (int i = 0; i < 7; i++)
247	+	r68.a[i] = gpr(16 + i);
248	+	r68.a[7] = gpr(1);
249	+	uint32 saved_cr = get_cr() & CR_field<2>::mask();
250	+	uint32 saved_xer = get_xer();
251	+	EmulOp(&r68, gpr(24), emul_op);
252	+	set_cr(saved_cr);
253	+	set_xer(saved_xer);
254	+	for (int i = 0; i < 8; i++)
255	+	gpr(8 + i) = r68.d[i];
256	+	for (int i = 0; i < 7; i++)
257	+	gpr(16 + i) = r68.a[i];
258	+	gpr(1) = r68.a[7];
259	+	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
260	+	}
261	+
262		// Execute SheepShaver instruction
263		void sheepshaver_cpu::execute_sheep(uint32 opcode)
264		{
#	Line 191 | Line 269 | void sheepshaver_cpu::execute_sheep(uint
269		case 0:         // EMUL_RETURN
270		QuitEmulator();
271		break;
272	<
272	>
273		case 1:         // EXEC_RETURN
274	<	throw sheepshaver_exec_return();
274	>	spcflags().set(SPCFLAG_CPU_EXEC_RETURN);
275		break;
276
277		case 2:         // EXEC_NATIVE
#	Line 204 | Line 282 | void sheepshaver_cpu::execute_sheep(uint
282		pc() += 4;
283		break;
284
285	<	default: {      // EMUL_OP
286	<	M68kRegisters r68;
209	<	WriteMacInt32(XLM_68K_R25, gpr(25));
210	<	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
211	<	for (int i = 0; i < 8; i++)
212	<	r68.d[i] = gpr(8 + i);
213	<	for (int i = 0; i < 7; i++)
214	<	r68.a[i] = gpr(16 + i);
215	<	r68.a[7] = gpr(1);
216	<	EmulOp(&r68, gpr(24), EMUL_OP_field::extract(opcode) - 3);
217	<	for (int i = 0; i < 8; i++)
218	<	gpr(8 + i) = r68.d[i];
219	<	for (int i = 0; i < 7; i++)
220	<	gpr(16 + i) = r68.a[i];
221	<	gpr(1) = r68.a[7];
222	<	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
285	>	default:        // EMUL_OP
286	>	execute_emul_op(EMUL_OP_field::extract(opcode) - 3);
287		pc() += 4;
288		break;
289		}
226	–	}
290		}
291
292	<	// Checks for pending interrupts
293	<	struct execute_nothing {
294	<	static inline void execute(powerpc_cpu *) { }
295	<	};
292	>	// Compile one instruction
293	>	bool sheepshaver_cpu::compile1(codegen_context_t & cg_context)
294	>	{
295	>	#if PPC_ENABLE_JIT
296	>	const instr_info_t *ii = cg_context.instr_info;
297	>	if (ii->mnemo != PPC_I(SHEEP))
298	>	return false;
299	>
300	>	bool compiled = false;
301	>	powerpc_dyngen & dg = cg_context.codegen;
302	>	uint32 opcode = cg_context.opcode;
303	>
304	>	switch (opcode & 0x3f) {
305	>	case 0:         // EMUL_RETURN
306	>	dg.gen_invoke(QuitEmulator);
307	>	compiled = true;
308	>	break;
309
310	<	static void HandleInterrupt(void);
310	>	case 1:         // EXEC_RETURN
311	>	dg.gen_spcflags_set(SPCFLAG_CPU_EXEC_RETURN);
312	>	compiled = true;
313	>	break;
314
315	<	struct execute_spcflags_check {
316	<	static inline void execute(powerpc_cpu *cpu) {
317	<	if (SPCFLAGS_TEST(SPCFLAG_ALL_BUT_EXEC_RETURN)) {
318	<	if (SPCFLAGS_TEST( SPCFLAG_ENTER_MON )) {
319	<	SPCFLAGS_CLEAR( SPCFLAG_ENTER_MON );
320	<	enter_mon();
321	<	}
322	<	if (SPCFLAGS_TEST( SPCFLAG_DOINT )) {
323	<	SPCFLAGS_CLEAR( SPCFLAG_DOINT );
324	<	HandleInterrupt();
325	<	}
326	<	if (SPCFLAGS_TEST( SPCFLAG_INT )) {
327	<	SPCFLAGS_CLEAR( SPCFLAG_INT );
328	<	SPCFLAGS_SET( SPCFLAG_DOINT );
315	>	case 2: {       // EXEC_NATIVE
316	>	uint32 selector = NATIVE_OP_field::extract(opcode);
317	>	switch (selector) {
318	>	case NATIVE_PATCH_NAME_REGISTRY:
319	>	dg.gen_invoke(DoPatchNameRegistry);
320	>	compiled = true;
321	>	break;
322	>	case NATIVE_VIDEO_INSTALL_ACCEL:
323	>	dg.gen_invoke(VideoInstallAccel);
324	>	compiled = true;
325	>	break;
326	>	case NATIVE_VIDEO_VBL:
327	>	dg.gen_invoke(VideoVBL);
328	>	compiled = true;
329	>	break;
330	>	case NATIVE_GET_RESOURCE:
331	>	case NATIVE_GET_1_RESOURCE:
332	>	case NATIVE_GET_IND_RESOURCE:
333	>	case NATIVE_GET_1_IND_RESOURCE:
334	>	case NATIVE_R_GET_RESOURCE: {
335	>	static const uint32 get_resource_ptr[] = {
336	>	XLM_GET_RESOURCE,
337	>	XLM_GET_1_RESOURCE,
338	>	XLM_GET_IND_RESOURCE,
339	>	XLM_GET_1_IND_RESOURCE,
340	>	XLM_R_GET_RESOURCE
341	>	};
342	>	uint32 old_get_resource = ReadMacInt32(get_resource_ptr[selector - NATIVE_GET_RESOURCE]);
343	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
344	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::get_resource).ptr();
345	>	dg.gen_invoke_CPU_im(func, old_get_resource);
346	>	compiled = true;
347	>	break;
348	>	}
349	>	case NATIVE_DISABLE_INTERRUPT:
350	>	dg.gen_invoke(DisableInterrupt);
351	>	compiled = true;
352	>	break;
353	>	case NATIVE_ENABLE_INTERRUPT:
354	>	dg.gen_invoke(EnableInterrupt);
355	>	compiled = true;
356	>	break;
357	>	case NATIVE_CHECK_LOAD_INVOC:
358	>	dg.gen_load_T0_GPR(3);
359	>	dg.gen_load_T1_GPR(4);
360	>	dg.gen_se_16_32_T1();
361	>	dg.gen_load_T2_GPR(5);
362	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
363	>	compiled = true;
364	>	break;
365	>	case NATIVE_BITBLT:
366	>	dg.gen_load_T0_GPR(3);
367	>	dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
368	>	compiled = true;
369	>	break;
370	>	case NATIVE_INVRECT:
371	>	dg.gen_load_T0_GPR(3);
372	>	dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
373	>	compiled = true;
374	>	break;
375	>	case NATIVE_FILLRECT:
376	>	dg.gen_load_T0_GPR(3);
377	>	dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
378	>	compiled = true;
379	>	break;
380	>	}
381	>	if (FN_field::test(opcode)) {
382	>	if (compiled) {
383	>	dg.gen_load_A0_LR();
384	>	dg.gen_set_PC_A0();
385		}
386	+	cg_context.done_compile = true;
387		}
388	+	else
389	+	cg_context.done_compile = false;
390	+	break;
391		}
253	–	};
392
393	<	// Execution loop
394	<	void sheepshaver_cpu::execute(uint32 entry)
395	<	{
396	<	try {
397	<	pc() = entry;
398	<	powerpc_cpu::do_execute<execute_nothing, execute_spcflags_check>();
399	<	}
262	<	catch (sheepshaver_exec_return const &) {
263	<	// Nothing, simply return
393	>	default: {      // EMUL_OP
394	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
395	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
396	>	dg.gen_invoke_CPU_im(func, EMUL_OP_field::extract(opcode) - 3);
397	>	cg_context.done_compile = false;
398	>	compiled = true;
399	>	break;
400		}
265	–	catch (...) {
266	–	printf("ERROR: execute() received an unknown exception!\n");
267	–	QuitEmulator();
401		}
402	+	return compiled;
403	+	#endif
404	+	return false;
405		}
406
407		// Handle MacOS interrupt
408	<	void sheepshaver_cpu::interrupt(uint32 entry, sheepshaver_cpu *cpu)
408	>	void sheepshaver_cpu::interrupt(uint32 entry)
409		{
410	<	#if MULTICORE_CPU
411	<	// Initialize stack pointer from previous CPU running
412	<	gpr(1) = cpu->gpr(1);
413	<	#else
410	>	#if EMUL_TIME_STATS
411	>	interrupt_count++;
412	>	const clock_t interrupt_start = clock();
413	>	#endif
414	>
415	>	#if !MULTICORE_CPU
416		// Save program counters and branch registers
417		uint32 saved_pc = pc();
418		uint32 saved_lr = lr();
419		uint32 saved_ctr= ctr();
420	+	uint32 saved_sp = gpr(1);
421		#endif
422
423	<	// Create stack frame
424	<	gpr(1) -= 64;
423	>	// Initialize stack pointer to SheepShaver alternate stack base
424	>	gpr(1) = SignalStackBase() - 64;
425
426		// Build trampoline to return from interrupt
427	<	uint32 trampoline[] = { POWERPC_EMUL_OP | 1 };
427	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
428
429		// Prepare registers for nanokernel interrupt routine
430	<	kernel_data->v[0x004 >> 2] = gpr(1);
431	<	kernel_data->v[0x018 >> 2] = gpr(6);
430	>	kernel_data->v[0x004 >> 2] = htonl(gpr(1));
431	>	kernel_data->v[0x018 >> 2] = htonl(gpr(6));
432
433	<	gpr(6) = kernel_data->v[0x65c >> 2];
433	>	gpr(6) = ntohl(kernel_data->v[0x65c >> 2]);
434		assert(gpr(6) != 0);
435		WriteMacInt32(gpr(6) + 0x13c, gpr(7));
436		WriteMacInt32(gpr(6) + 0x144, gpr(8));
#	Line 302 | Line 441 | void sheepshaver_cpu::interrupt(uint32 e
441		WriteMacInt32(gpr(6) + 0x16c, gpr(13));
442
443		gpr(1)  = KernelDataAddr;
444	<	gpr(7)  = kernel_data->v[0x660 >> 2];
444	>	gpr(7)  = ntohl(kernel_data->v[0x660 >> 2]);
445		gpr(8)  = 0;
446	<	gpr(10) = (uint32)trampoline;
447	<	gpr(12) = (uint32)trampoline;
448	<	gpr(13) = cr().get();
446	>	gpr(10) = trampoline.addr();
447	>	gpr(12) = trampoline.addr();
448	>	gpr(13) = get_cr();
449
450		// rlwimi. r7,r7,8,0,0
451		uint32 result = op_ppc_rlwimi::apply(gpr(7), 8, 0x80000000, gpr(7));
#	Line 314 | Line 453 | void sheepshaver_cpu::interrupt(uint32 e
453		gpr(7) = result;
454
455		gpr(11) = 0xf072; // MSR (SRR1)
456	<	cr().set((gpr(11) & 0x0fff0000) | (cr().get() & ~0x0fff0000));
456	>	cr().set((gpr(11) & 0x0fff0000) | (get_cr() & ~0x0fff0000));
457
458		// Enter nanokernel
459		execute(entry);
460
322	–	// Cleanup stack
323	–	gpr(1) += 64;
324	–
461		#if !MULTICORE_CPU
462		// Restore program counters and branch registers
463		pc() = saved_pc;
464		lr() = saved_lr;
465		ctr()= saved_ctr;
466	+	gpr(1) = saved_sp;
467	+	#endif
468	+
469	+	#if EMUL_TIME_STATS
470	+	interrupt_time += (clock() - interrupt_start);
471		#endif
472		}
473
474		// Execute 68k routine
475		void sheepshaver_cpu::execute_68k(uint32 entry, M68kRegisters *r)
476		{
477	+	#if EMUL_TIME_STATS
478	+	exec68k_count++;
479	+	const clock_t exec68k_start = clock();
480	+	#endif
481	+
482		#if SAFE_EXEC_68K
483		if (ReadMacInt32(XLM_RUN_MODE) != MODE_EMUL_OP)
484		printf("FATAL: Execute68k() not called from EMUL_OP mode\n");
#	Line 342 | Line 488 | void sheepshaver_cpu::execute_68k(uint32
488		uint32 saved_pc = pc();
489		uint32 saved_lr = lr();
490		uint32 saved_ctr= ctr();
491	+	uint32 saved_cr = get_cr();
492
493		// Create MacOS stack frame
494	+	// FIXME: make sure MacOS doesn't expect PPC registers to live on top
495		uint32 sp = gpr(1);
496	<	gpr(1) -= 56 + 19*4 + 18*8;
496	>	gpr(1) -= 56;
497		WriteMacInt32(gpr(1), sp);
498
499		// Save PowerPC registers
500	<	memcpy(Mac2HostAddr(gpr(1)+56), &gpr(13), sizeof(uint32)*(32-13));
500	>	uint32 saved_GPRs[19];
501	>	memcpy(&saved_GPRs[0], &gpr(13), sizeof(uint32)*(32-13));
502		#if SAVE_FP_EXEC_68K
503	<	memcpy(Mac2HostAddr(gpr(1)+56+19*4), &fpr(14), sizeof(double)*(32-14));
503	>	double saved_FPRs[18];
504	>	memcpy(&saved_FPRs[0], &fpr(14), sizeof(double)*(32-14));
505		#endif
506
507		// Setup registers for 68k emulator
#	Line 365 | Line 515 | void sheepshaver_cpu::execute_68k(uint32
515		gpr(25) = ReadMacInt32(XLM_68K_R25);            // MSB of SR
516		gpr(26) = 0;
517		gpr(28) = 0;                                                            // VBR
518	<	gpr(29) = kernel_data->ed.v[0x74 >> 2];         // Pointer to opcode table
519	<	gpr(30) = kernel_data->ed.v[0x78 >> 2];         // Address of emulator
518	>	gpr(29) = ntohl(kernel_data->ed.v[0x74 >> 2]);          // Pointer to opcode table
519	>	gpr(30) = ntohl(kernel_data->ed.v[0x78 >> 2]);          // Address of emulator
520		gpr(31) = KernelDataAddr + 0x1000;
521
522		// Push return address (points to EXEC_RETURN opcode) on stack
#	Line 398 | Line 548 | void sheepshaver_cpu::execute_68k(uint32
548		r->a[i] = gpr(16 + i);
549
550		// Restore PowerPC registers
551	<	memcpy(&gpr(13), Mac2HostAddr(gpr(1)+56), sizeof(uint32)*(32-13));
551	>	memcpy(&gpr(13), &saved_GPRs[0], sizeof(uint32)*(32-13));
552		#if SAVE_FP_EXEC_68K
553	<	memcpy(&fpr(14), Mac2HostAddr(gpr(1)+56+19*4), sizeof(double)*(32-14));
553	>	memcpy(&fpr(14), &saved_FPRs[0], sizeof(double)*(32-14));
554		#endif
555
556		// Cleanup stack
557	<	gpr(1) += 56 + 19*4 + 18*8;
557	>	gpr(1) += 56;
558
559		// Restore program counters and branch registers
560		pc() = saved_pc;
561		lr() = saved_lr;
562		ctr()= saved_ctr;
563	+	set_cr(saved_cr);
564	+
565	+	#if EMUL_TIME_STATS
566	+	exec68k_time += (clock() - exec68k_start);
567	+	#endif
568		}
569
570		// Call MacOS PPC code
571		uint32 sheepshaver_cpu::execute_macos_code(uint32 tvect, int nargs, uint32 const *args)
572		{
573	+	#if EMUL_TIME_STATS
574	+	macos_exec_count++;
575	+	const clock_t macos_exec_start = clock();
576	+	#endif
577	+
578		// Save program counters and branch registers
579		uint32 saved_pc = pc();
580		uint32 saved_lr = lr();
581		uint32 saved_ctr= ctr();
582
583		// Build trampoline with EXEC_RETURN
584	<	uint32 trampoline[] = { POWERPC_EMUL_OP | 1 };
585	<	lr() = (uint32)trampoline;
584	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
585	>	lr() = trampoline.addr();
586
587		gpr(1) -= 64;                                                           // Create stack frame
588		uint32 proc = ReadMacInt32(tvect);                      // Get routine address
#	Line 453 | Line 613 | uint32 sheepshaver_cpu::execute_macos_co
613		lr() = saved_lr;
614		ctr()= saved_ctr;
615
616	+	#if EMUL_TIME_STATS
617	+	macos_exec_time += (clock() - macos_exec_start);
618	+	#endif
619	+
620		return retval;
621		}
622
#	Line 461 | Line 625 | inline void sheepshaver_cpu::execute_ppc
625		{
626		// Save branch registers
627		uint32 saved_lr = lr();
464	–	uint32 saved_ctr= ctr();
628
629	<	const uint32 trampoline[] = { POWERPC_EMUL_OP | 1 };
629	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
630	>	WriteMacInt32(trampoline.addr(), POWERPC_EXEC_RETURN);
631	>	lr() = trampoline.addr();
632
468	–	lr() = (uint32)trampoline;
469	–	ctr()= entry;
633		execute(entry);
634
635		// Restore branch registers
636		lr() = saved_lr;
474	–	ctr()= saved_ctr;
637		}
638
639		// Resource Manager thunk
478	–	extern "C" void check_load_invoc(uint32 type, int16 id, uint16 **h);
479	–
640		inline void sheepshaver_cpu::get_resource(uint32 old_get_resource)
641		{
642		uint32 type = gpr(3);
#	Line 487 | Line 647 | inline void sheepshaver_cpu::get_resourc
647
648		// Call old routine
649		execute_ppc(old_get_resource);
490	–	uint16 **handle = (uint16 **)gpr(3);
650
651		// Call CheckLoad()
652	+	uint32 handle = gpr(3);
653		check_load_invoc(type, id, handle);
654	<	gpr(3) = (uint32)handle;
654	>	gpr(3) = handle;
655
656		// Cleanup stack
657		gpr(1) += 56;
#	Line 506 | Line 666 | static sheepshaver_cpu *main_cpu = NULL;
666		static sheepshaver_cpu *interrupt_cpu = NULL;   // CPU emulator to handle interrupts
667		static sheepshaver_cpu *current_cpu = NULL;             // Current CPU emulator context
668
669	+	void FlushCodeCache(uintptr start, uintptr end)
670	+	{
671	+	D(bug("FlushCodeCache(%08x, %08x)\n", start, end));
672	+	main_cpu->invalidate_cache_range(start, end);
673	+	#if MULTICORE_CPU
674	+	interrupt_cpu->invalidate_cache_range(start, end);
675	+	#endif
676	+	}
677	+
678		static inline void cpu_push(sheepshaver_cpu *new_cpu)
679		{
680		#if MULTICORE_CPU
#	Line 536 | Line 705 | static void dump_log(void)
705		*  Initialize CPU emulation
706		*/
707
708	<	static struct sigaction sigsegv_action;
540	<
541	<	#if defined(__powerpc__)
542	<	#include <sys/ucontext.h>
543	<	#endif
544	<
545	<	static void sigsegv_handler(int sig, siginfo_t *sip, void *scp)
708	>	static sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
709		{
547	–	const uintptr addr = (uintptr)sip->si_addr;
710		#if ENABLE_VOSF
711	<	// Handle screen fault.
712	<	extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
713	<	if (Screen_fault_handler((sigsegv_address_t)addr, SIGSEGV_INVALID_PC))
714	<	return;
711	>	// Handle screen fault
712	>	extern bool Screen_fault_handler(sigsegv_address_t, sigsegv_address_t);
713	>	if (Screen_fault_handler(fault_address, fault_instruction))
714	>	return SIGSEGV_RETURN_SUCCESS;
715		#endif
716	<	#if defined(__powerpc__)
717	<	if (addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) {
718	<	printf("IGNORE write access to ROM at %08x\n", addr);
719	<	(((ucontext_t *)scp)->uc_mcontext.regs)->nip += 4;
720	<	return;
721	<	}
722	<	if (addr >= 0xf3012000 && addr < 0xf3014000 && 0) {
723	<	printf("IGNORE write access to ROM at %08x\n", addr);
724	<	(((ucontext_t *)scp)->uc_mcontext.regs)->nip += 4;
725	<	return;
716	>
717	>	const uintptr addr = (uintptr)fault_address;
718	>	#if HAVE_SIGSEGV_SKIP_INSTRUCTION
719	>	// Ignore writes to ROM
720	>	if ((addr - ROM_BASE) < ROM_SIZE)
721	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
722	>
723	>	// Get program counter of target CPU
724	>	sheepshaver_cpu * const cpu = current_cpu;
725	>	const uint32 pc = cpu->pc();
726	>
727	>	// Fault in Mac ROM or RAM?
728	>	bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize));
729	>	if (mac_fault) {
730	>
731	>	// "VM settings" during MacOS 8 installation
732	>	if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
733	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
734	>
735	>	// MacOS 8.5 installation
736	>	else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
737	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
738	>
739	>	// MacOS 8 serial drivers on startup
740	>	else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
741	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
742	>
743	>	// MacOS 8.1 serial drivers on startup
744	>	else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
745	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
746	>	else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
747	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
748	>
749	>	// Ignore writes to the zero page
750	>	else if ((uint32)(addr - SheepMem::ZeroPage()) < (uint32)SheepMem::PageSize())
751	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
752	>
753	>	// Ignore all other faults, if requested
754	>	if (PrefsFindBool("ignoresegv"))
755	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
756		}
565	–	#endif
566	–	printf("Caught SIGSEGV at address %p\n", sip->si_addr);
567	–	printf("Native PC: %08x\n", (((ucontext_t *)scp)->uc_mcontext.regs)->nip);
568	–	printf("Current CPU: %s\n", current_cpu == main_cpu ? "main" : "interrupts");
569	–	#if 1
570	–	dump_registers();
757		#else
758	<	printf("Main CPU context\n");
573	<	main_cpu->dump_registers();
574	<	printf("Interrupts CPU context\n");
575	<	interrupt_cpu->dump_registers();
758	>	#error "FIXME: You don't have the capability to skip instruction within signal handlers"
759		#endif
760	+
761	+	printf("SIGSEGV\n");
762	+	printf("  pc %p\n", fault_instruction);
763	+	printf("  ea %p\n", fault_address);
764	+	printf(" cpu %s\n", current_cpu == main_cpu ? "main" : "interrupts");
765	+	dump_registers();
766		current_cpu->dump_log();
767		enter_mon();
768		QuitEmulator();
769	+
770	+	return SIGSEGV_RETURN_FAILURE;
771		}
772
773		void init_emul_ppc(void)
#	Line 584 | Line 775 | void init_emul_ppc(void)
775		// Initialize main CPU emulator
776		main_cpu = new sheepshaver_cpu();
777		main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
778	+	main_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
779		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
780
781		#if MULTICORE_CPU
#	Line 591 | Line 783 | void init_emul_ppc(void)
783		interrupt_cpu = new sheepshaver_cpu();
784		#endif
785
786	<	// Install SIGSEGV handler
787	<	sigemptyset(&sigsegv_action.sa_mask);
596	<	sigsegv_action.sa_sigaction = sigsegv_handler;
597	<	sigsegv_action.sa_flags = SA_SIGINFO;
598	<	sigsegv_action.sa_restorer = NULL;
599	<	sigaction(SIGSEGV, &sigsegv_action, NULL);
786	>	// Install the handler for SIGSEGV
787	>	sigsegv_install_handler(sigsegv_handler);
788
789		#if ENABLE_MON
790		// Install "regs" command in cxmon
791		mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
792		mon_add_command("log", dump_log, "log                      Dump PowerPC emulation log\n");
793		#endif
794	+
795	+	#if EMUL_TIME_STATS
796	+	emul_start_time = clock();
797	+	#endif
798	+	}
799	+
800	+	/*
801	+	*  Deinitialize emulation
802	+	*/
803	+
804	+	void exit_emul_ppc(void)
805	+	{
806	+	#if EMUL_TIME_STATS
807	+	clock_t emul_end_time = clock();
808	+
809	+	printf("### Statistics for SheepShaver emulation parts\n");
810	+	const clock_t emul_time = emul_end_time - emul_start_time;
811	+	printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
812	+	printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
813	+	(double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
814	+
815	+	#define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
816	+	printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
817	+	printf("Total " LABEL " time  : %.1f sec (%.1f%%)\n",                   \
818	+	double(VAR_PREFIX##_time) / double(CLOCKS_PER_SEC),          \
819	+	100.0 * double(VAR_PREFIX##_time) / double(emul_time));      \
820	+	} while (0)
821	+
822	+	PRINT_STATS("Execute68k[Trap] execution", exec68k);
823	+	PRINT_STATS("NativeOp execution", native_exec);
824	+	PRINT_STATS("MacOS routine execution", macos_exec);
825	+
826	+	#undef PRINT_STATS
827	+	printf("\n");
828	+	#endif
829	+
830	+	delete main_cpu;
831	+	#if MULTICORE_CPU
832	+	delete interrupt_cpu;
833	+	#endif
834		}
835
836		/*
#	Line 612 | Line 840 | void init_emul_ppc(void)
840		void emul_ppc(uint32 entry)
841		{
842		current_cpu = main_cpu;
843	+	#if 0
844		current_cpu->start_log();
845	+	#endif
846	+	// start emulation loop and enable code translation or caching
847		current_cpu->execute(entry);
848		}
849
#	Line 620 | Line 851 | void emul_ppc(uint32 entry)
851		*  Handle PowerPC interrupt
852		*/
853
854	<	// Atomic operations
855	<	extern int atomic_add(int *var, int v);
856	<	extern int atomic_and(int *var, int v);
857	<	extern int atomic_or(int *var, int v);
858	<
854	>	#if ASYNC_IRQ
855	>	void HandleInterrupt(void)
856	>	{
857	>	main_cpu->handle_interrupt();
858	>	}
859	>	#else
860		void TriggerInterrupt(void)
861		{
862		#if 0
863		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
864		#else
865	<	SPCFLAGS_SET( SPCFLAG_INT );
865	>	// Trigger interrupt to main cpu only
866	>	if (main_cpu)
867	>	main_cpu->trigger_interrupt();
868		#endif
869		}
870	+	#endif
871
872	<	static void HandleInterrupt(void)
872	>	void sheepshaver_cpu::handle_interrupt(void)
873		{
874		// Do nothing if interrupts are disabled
875	<	if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
875	>	if (*(int32 *)XLM_IRQ_NEST > 0)
876		return;
877
878		// Do nothing if there is no interrupt pending
#	Line 653 | Line 888 | static void HandleInterrupt(void)
888		// 68k emulator active, trigger 68k interrupt level 1
889		assert(current_cpu == main_cpu);
890		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
891	<	main_cpu->set_cr(main_cpu->get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
891	>	set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
892		break;
893
894		#if INTERRUPTS_IN_NATIVE_MODE
895		case MODE_NATIVE:
896		// 68k emulator inactive, in nanokernel?
897		assert(current_cpu == main_cpu);
898	<	if (main_cpu->gpr(1) != KernelDataAddr) {
898	>	if (gpr(1) != KernelDataAddr) {
899		// Prepare for 68k interrupt level 1
900		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
901		WriteMacInt32(tswap32(kernel_data->v[0x658 >> 2]) + 0xdc,
#	Line 671 | Line 906 | static void HandleInterrupt(void)
906		DisableInterrupt();
907		cpu_push(interrupt_cpu);
908		if (ROMType == ROMTYPE_NEWWORLD)
909	<	current_cpu->interrupt(ROM_BASE + 0x312b1c, main_cpu);
909	>	current_cpu->interrupt(ROM_BASE + 0x312b1c);
910		else
911	<	current_cpu->interrupt(ROM_BASE + 0x312a3c, main_cpu);
911	>	current_cpu->interrupt(ROM_BASE + 0x312a3c);
912		cpu_pop();
913		}
914		break;
#	Line 704 | Line 939 | static void HandleInterrupt(void)
939		if (InterruptFlags & INTFLAG_VIA) {
940		ClearInterruptFlag(INTFLAG_VIA);
941		ADBInterrupt();
942	<	ExecutePPC(VideoVBL);
942	>	ExecuteNative(NATIVE_VIDEO_VBL);
943		}
944		}
945		#endif
#	Line 714 | Line 949 | static void HandleInterrupt(void)
949		}
950		}
951
717	–	/*
718	–	*  Execute NATIVE_OP opcode (called by PowerPC emulator)
719	–	*/
720	–
721	–	#define POWERPC_NATIVE_OP_INIT(LR, OP) \
722	–	tswap32(POWERPC_EMUL_OP | ((LR) << 11) | (((uint32)OP) << 6) | 2)
723	–
724	–	// FIXME: Make sure 32-bit relocations are used
725	–	const uint32 NativeOpTable[NATIVE_OP_MAX] = {
726	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_PATCH_NAME_REGISTRY),
727	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_INSTALL_ACCEL),
728	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_VBL),
729	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_DO_DRIVER_IO),
730	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_IRQ),
731	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_INIT),
732	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_TERM),
733	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_OPEN),
734	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_CLOSE),
735	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_WPUT),
736	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_RSRV),
737	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_NOTHING),
738	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_OPEN),
739	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_IN),
740	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_OUT),
741	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CONTROL),
742	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_STATUS),
743	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CLOSE),
744	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_RESOURCE),
745	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_RESOURCE),
746	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_IND_RESOURCE),
747	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_IND_RESOURCE),
748	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_R_GET_RESOURCE),
749	–	POWERPC_NATIVE_OP_INIT(0, NATIVE_DISABLE_INTERRUPT),
750	–	POWERPC_NATIVE_OP_INIT(0, NATIVE_ENABLE_INTERRUPT),
751	–	};
752	–
952		static void get_resource(void);
953		static void get_1_resource(void);
954		static void get_ind_resource(void);
#	Line 760 | Line 959 | static void r_get_resource(void);
959
960		static void NativeOp(int selector)
961		{
962	+	#if EMUL_TIME_STATS
963	+	native_exec_count++;
964	+	const clock_t native_exec_start = clock();
965	+	#endif
966	+
967		switch (selector) {
968		case NATIVE_PATCH_NAME_REGISTRY:
969		DoPatchNameRegistry();
#	Line 774 | Line 978 | static void NativeOp(int selector)
978		GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
979		(void *)GPR(5), GPR(6), GPR(7));
980		break;
981	<	case NATIVE_GET_RESOURCE:
982	<	get_resource();
981	>	#ifdef WORDS_BIGENDIAN
982	>	case NATIVE_ETHER_IRQ:
983	>	EtherIRQ();
984		break;
985	<	case NATIVE_GET_1_RESOURCE:
986	<	get_1_resource();
985	>	case NATIVE_ETHER_INIT:
986	>	GPR(3) = InitStreamModule((void *)GPR(3));
987		break;
988	<	case NATIVE_GET_IND_RESOURCE:
989	<	get_ind_resource();
988	>	case NATIVE_ETHER_TERM:
989	>	TerminateStreamModule();
990		break;
991	<	case NATIVE_GET_1_IND_RESOURCE:
992	<	get_1_ind_resource();
991	>	case NATIVE_ETHER_OPEN:
992	>	GPR(3) = ether_open((queue_t *)GPR(3), (void *)GPR(4), GPR(5), GPR(6), (void*)GPR(7));
993	>	break;
994	>	case NATIVE_ETHER_CLOSE:
995	>	GPR(3) = ether_close((queue_t *)GPR(3), GPR(4), (void *)GPR(5));
996	>	break;
997	>	case NATIVE_ETHER_WPUT:
998	>	GPR(3) = ether_wput((queue_t *)GPR(3), (mblk_t *)GPR(4));
999		break;
1000	<	case NATIVE_R_GET_RESOURCE:
1001	<	r_get_resource();
1000	>	case NATIVE_ETHER_RSRV:
1001	>	GPR(3) = ether_rsrv((queue_t *)GPR(3));
1002	>	break;
1003	>	#else
1004	>	case NATIVE_ETHER_INIT:
1005	>	// FIXME: needs more complicated thunks
1006	>	GPR(3) = false;
1007	>	break;
1008	>	#endif
1009	>	case NATIVE_SYNC_HOOK:
1010	>	GPR(3) = NQD_sync_hook(GPR(3));
1011	>	break;
1012	>	case NATIVE_BITBLT_HOOK:
1013	>	GPR(3) = NQD_bitblt_hook(GPR(3));
1014	>	break;
1015	>	case NATIVE_BITBLT:
1016	>	NQD_bitblt(GPR(3));
1017	>	break;
1018	>	case NATIVE_FILLRECT_HOOK:
1019	>	GPR(3) = NQD_fillrect_hook(GPR(3));
1020	>	break;
1021	>	case NATIVE_INVRECT:
1022	>	NQD_invrect(GPR(3));
1023	>	break;
1024	>	case NATIVE_FILLRECT:
1025	>	NQD_fillrect(GPR(3));
1026		break;
1027		case NATIVE_SERIAL_NOTHING:
1028		case NATIVE_SERIAL_OPEN:
#	Line 809 | Line 1044 | static void NativeOp(int selector)
1044		GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
1045		break;
1046		}
1047	+	case NATIVE_GET_RESOURCE:
1048	+	case NATIVE_GET_1_RESOURCE:
1049	+	case NATIVE_GET_IND_RESOURCE:
1050	+	case NATIVE_GET_1_IND_RESOURCE:
1051	+	case NATIVE_R_GET_RESOURCE: {
1052	+	typedef void (*GetResourceCallback)(void);
1053	+	static const GetResourceCallback get_resource_callbacks[] = {
1054	+	get_resource,
1055	+	get_1_resource,
1056	+	get_ind_resource,
1057	+	get_1_ind_resource,
1058	+	r_get_resource
1059	+	};
1060	+	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1061	+	break;
1062	+	}
1063		case NATIVE_DISABLE_INTERRUPT:
1064		DisableInterrupt();
1065		break;
1066		case NATIVE_ENABLE_INTERRUPT:
1067		EnableInterrupt();
1068		break;
1069	+	case NATIVE_MAKE_EXECUTABLE:
1070	+	MakeExecutable(0, (void *)GPR(4), GPR(5));
1071	+	break;
1072	+	case NATIVE_CHECK_LOAD_INVOC:
1073	+	check_load_invoc(GPR(3), GPR(4), GPR(5));
1074	+	break;
1075		default:
1076		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1077		QuitEmulator();
1078		break;
1079		}
823	–	}
1080
1081	<	/*
1082	<	*  Execute native subroutine (LR must contain return address)
1083	<	*/
828	<
829	<	void ExecuteNative(int selector)
830	<	{
831	<	uint32 tvect[2];
832	<	tvect[0] = tswap32(POWERPC_NATIVE_OP_FUNC(selector));
833	<	tvect[1] = 0; // Fake TVECT
834	<	RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
835	<	M68kRegisters r;
836	<	Execute68k((uint32)&desc, &r);
1081	>	#if EMUL_TIME_STATS
1082	>	native_exec_time += (clock() - native_exec_start);
1083	>	#endif
1084		}
1085
1086		/*
#	Line 854 | Line 1101 | void Execute68k(uint32 pc, M68kRegisters
1101
1102		void Execute68kTrap(uint16 trap, M68kRegisters *r)
1103		{
1104	<	uint16 proc[2] = {trap, M68K_RTS};
1105	<	Execute68k((uint32)proc, r);
1104	>	SheepVar proc_var(4);
1105	>	uint32 proc = proc_var.addr();
1106	>	WriteMacInt16(proc, trap);
1107	>	WriteMacInt16(proc + 2, M68K_RTS);
1108	>	Execute68k(proc, r);
1109		}
1110
1111		/*
#	Line 910 | Line 1160 | uint32 call_macos7(uint32 tvect, uint32
1160		}
1161
1162		/*
913	–	*  Atomic operations
914	–	*/
915	–
916	–	int atomic_add(int *var, int v)
917	–	{
918	–	int ret = *var;
919	–	*var += v;
920	–	return ret;
921	–	}
922	–
923	–	int atomic_and(int *var, int v)
924	–	{
925	–	int ret = *var;
926	–	*var &= v;
927	–	return ret;
928	–	}
929	–
930	–	int atomic_or(int *var, int v)
931	–	{
932	–	int ret = *var;
933	–	*var |= v;
934	–	return ret;
935	–	}
936	–
937	–	/*
1163		*  Resource Manager thunks
1164		*/
1165

Diff Legend

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