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.75 by gbeauche, 2008-01-01T09:47:39Z

#	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-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 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	+	#include "timer.h"
42
43		#include <stdio.h>
44	+	#include <stdlib.h>
45	+	#ifdef HAVE_MALLOC_H
46	+	#include <malloc.h>
47	+	#endif
48	+
49	+	#ifdef USE_SDL_VIDEO
50	+	#include <SDL_events.h>
51	+	#endif
52
53		#if ENABLE_MON
54		#include "mon.h"
55		#include "mon_disass.h"
56		#endif
57
58	<	#define DEBUG 1
58	>	#define DEBUG 0
59		#include "debug.h"
60
61	+	// Emulation time statistics
62	+	#ifndef EMUL_TIME_STATS
63	+	#define EMUL_TIME_STATS 0
64	+	#endif
65	+
66	+	#if EMUL_TIME_STATS
67	+	static clock_t emul_start_time;
68	+	static uint32 interrupt_count = 0, ppc_interrupt_count = 0;
69	+	static clock_t interrupt_time = 0;
70	+	static uint32 exec68k_count = 0;
71	+	static clock_t exec68k_time = 0;
72	+	static uint32 native_exec_count = 0;
73	+	static clock_t native_exec_time = 0;
74	+	static uint32 macos_exec_count = 0;
75	+	static clock_t macos_exec_time = 0;
76	+	#endif
77	+
78		static void enter_mon(void)
79		{
80		// Start up mon in real-mode
#	Line 55 | Line 84 | static void enter_mon(void)
84		#endif
85		}
86
87	<	// Enable multicore (main/interrupts) cpu emulation?
88	<	#define MULTICORE_CPU 0
87	>	// From main_*.cpp
88	>	extern uintptr SignalStackBase();
89	>
90	>	// From rsrc_patches.cpp
91	>	extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
92	>	extern "C" void named_check_load_invoc(uint32 type, uint32 name, uint32 h);
93	>
94	>	// PowerPC EmulOp to exit from emulation looop
95	>	const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
96
97		// Enable Execute68k() safety checks?
98		#define SAFE_EXEC_68K 1
#	Line 70 | Line 106 | static void enter_mon(void)
106		// Interrupts in native mode?
107		#define INTERRUPTS_IN_NATIVE_MODE 1
108
109	<	// 68k Emulator Data
110	<	struct EmulatorData {
75	<	uint32  v[0x400];
76	<	};
109	>	// Pointer to Kernel Data
110	>	static KernelData * kernel_data;
111
112	<	// Kernel Data
113	<	struct KernelData {
80	<	uint32  v[0x400];
81	<	EmulatorData ed;
82	<	};
112	>	// SIGSEGV handler
113	>	sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
114
115	<	// Pointer to Kernel Data
116	<	static KernelData * const kernel_data = (KernelData *)0x68ffe000;
115	>	#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
116	>	// Special trampolines for EmulOp and NativeOp
117	>	static uint8 *emul_op_trampoline;
118	>	static uint8 *native_op_trampoline;
119	>	#endif
120
121
122		/**
123		*              PowerPC emulator glue with special 'sheep' opcodes
124		**/
125
126	<	struct sheepshaver_exec_return { };
126	>	enum {
127	>	PPC_I(SHEEP) = PPC_I(MAX),
128	>	PPC_I(SHEEP_MAX)
129	>	};
130
131		class sheepshaver_cpu
132		: public powerpc_cpu
#	Line 99 | Line 136 | class sheepshaver_cpu
136
137		public:
138
139	<	sheepshaver_cpu()
140	<	: powerpc_cpu()
104	<	{ init_decoder(); }
139	>	// Constructor
140	>	sheepshaver_cpu();
141
142	<	// Condition Register accessors
142	>	// CR & XER accessors
143		uint32 get_cr() const           { return cr().get(); }
144		void set_cr(uint32 v)           { cr().set(v); }
145	+	uint32 get_xer() const          { return xer().get(); }
146	+	void set_xer(uint32 v)          { xer().set(v); }
147	+
148	+	// Execute NATIVE_OP routine
149	+	void execute_native_op(uint32 native_op);
150
151	<	// Execution loop
152	<	void execute(uint32 pc);
151	>	// Execute EMUL_OP routine
152	>	void execute_emul_op(uint32 emul_op);
153
154		// Execute 68k routine
155		void execute_68k(uint32 entry, M68kRegisters *r);
#	Line 119 | Line 160 | public:
160		// Execute MacOS/PPC code
161		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
162
163	+	#if PPC_ENABLE_JIT
164	+	// Compile one instruction
165	+	virtual int compile1(codegen_context_t & cg_context);
166	+	#endif
167		// Resource manager thunk
168		void get_resource(uint32 old_get_resource);
169
170		// Handle MacOS interrupt
171	<	void interrupt(uint32 entry, sheepshaver_cpu *cpu);
127	<
128	<	// spcflags for interrupts handling
129	<	static uint32 spcflags;
171	>	void interrupt(uint32 entry);
172
173	<	// Lazy memory allocator (one item at a time)
174	<	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);
173	>	// Make sure the SIGSEGV handler can access CPU registers
174	>	friend sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip);
175		};
176
177	<	uint32 sheepshaver_cpu::spcflags = 0;
142	<	lazy_allocator< sheepshaver_cpu > allocator_helper< sheepshaver_cpu, lazy_allocator >::allocator;
143	<
144	<	void sheepshaver_cpu::init_decoder()
177	>	sheepshaver_cpu::sheepshaver_cpu()
178		{
179	<	#ifndef PPC_NO_STATIC_II_INDEX_TABLE
180	<	static bool initialized = false;
181	<	if (initialized)
182	<	return;
183	<	initialized = true;
179	>	init_decoder();
180	>
181	>	#if PPC_ENABLE_JIT
182	>	if (PrefsFindBool("jit"))
183	>	enable_jit();
184		#endif
185	+	}
186
187	+	void sheepshaver_cpu::init_decoder()
188	+	{
189		static const instr_info_t sheep_ii_table[] = {
190		{ "sheep",
191	<	(execute_fn)&sheepshaver_cpu::execute_sheep,
192	<	NULL,
193	<	D_form, 6, 0, CFLOW_TRAP
191	>	(execute_pmf)&sheepshaver_cpu::execute_sheep,
192	>	PPC_I(SHEEP),
193	>	D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
194		}
195		};
196
#	Line 167 | Line 203 | void sheepshaver_cpu::init_decoder()
203		}
204		}
205
170	–	// Forward declaration for native opcode handler
171	–	static void NativeOp(int selector);
172	–
206		/*              NativeOp instruction format:
207	<	+------------+--------------------------+--+----------+------------+
208	<	|      6     |                          |FN|    OP    |      2     |
209	<	+------------+--------------------------+--+----------+------------+
210	<	0         5 |6                       19 20 21      25 26        31
207	>	+------------+-------------------------+--+-----------+------------+
208	>	|      6     |                         |FN|    OP     |      2     |
209	>	+------------+-------------------------+--+-----------+------------+
210	>	0         5 |6                      18 19 20      25 26        31
211		*/
212
213	<	typedef bit_field< 20, 20 > FN_field;
214	<	typedef bit_field< 21, 25 > NATIVE_OP_field;
213	>	typedef bit_field< 19, 19 > FN_field;
214	>	typedef bit_field< 20, 25 > NATIVE_OP_field;
215		typedef bit_field< 26, 31 > EMUL_OP_field;
216
217	+	// Execute EMUL_OP routine
218	+	void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
219	+	{
220	+	M68kRegisters r68;
221	+	WriteMacInt32(XLM_68K_R25, gpr(25));
222	+	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
223	+	for (int i = 0; i < 8; i++)
224	+	r68.d[i] = gpr(8 + i);
225	+	for (int i = 0; i < 7; i++)
226	+	r68.a[i] = gpr(16 + i);
227	+	r68.a[7] = gpr(1);
228	+	uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8)
229	+	uint32 saved_xer = get_xer();
230	+	EmulOp(&r68, gpr(24), emul_op);
231	+	set_cr(saved_cr);
232	+	set_xer(saved_xer);
233	+	for (int i = 0; i < 8; i++)
234	+	gpr(8 + i) = r68.d[i];
235	+	for (int i = 0; i < 7; i++)
236	+	gpr(16 + i) = r68.a[i];
237	+	gpr(1) = r68.a[7];
238	+	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
239	+	}
240	+
241		// Execute SheepShaver instruction
242		void sheepshaver_cpu::execute_sheep(uint32 opcode)
243		{
#	Line 191 | Line 248 | void sheepshaver_cpu::execute_sheep(uint
248		case 0:         // EMUL_RETURN
249		QuitEmulator();
250		break;
251	<
251	>
252		case 1:         // EXEC_RETURN
253	<	throw sheepshaver_exec_return();
253	>	spcflags().set(SPCFLAG_CPU_EXEC_RETURN);
254		break;
255
256		case 2:         // EXEC_NATIVE
257	<	NativeOp(NATIVE_OP_field::extract(opcode));
257	>	execute_native_op(NATIVE_OP_field::extract(opcode));
258		if (FN_field::test(opcode))
259		pc() = lr();
260		else
261		pc() += 4;
262		break;
263
264	<	default: {      // EMUL_OP
265	<	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);
264	>	default:        // EMUL_OP
265	>	execute_emul_op(EMUL_OP_field::extract(opcode) - 3);
266		pc() += 4;
267		break;
268		}
226	–	}
269		}
270
271	<	// Checks for pending interrupts
272	<	struct execute_nothing {
273	<	static inline void execute(powerpc_cpu *) { }
274	<	};
271	>	// Compile one instruction
272	>	#if PPC_ENABLE_JIT
273	>	int sheepshaver_cpu::compile1(codegen_context_t & cg_context)
274	>	{
275	>	const instr_info_t *ii = cg_context.instr_info;
276	>	if (ii->mnemo != PPC_I(SHEEP))
277	>	return COMPILE_FAILURE;
278	>
279	>	int status = COMPILE_FAILURE;
280	>	powerpc_dyngen & dg = cg_context.codegen;
281	>	uint32 opcode = cg_context.opcode;
282
283	<	static void HandleInterrupt(void);
283	>	switch (opcode & 0x3f) {
284	>	case 0:         // EMUL_RETURN
285	>	dg.gen_invoke(QuitEmulator);
286	>	status = COMPILE_CODE_OK;
287	>	break;
288
289	<	struct execute_spcflags_check {
290	<	static inline void execute(powerpc_cpu *cpu) {
291	<	if (SPCFLAGS_TEST(SPCFLAG_ALL_BUT_EXEC_RETURN)) {
292	<	if (SPCFLAGS_TEST( SPCFLAG_ENTER_MON )) {
293	<	SPCFLAGS_CLEAR( SPCFLAG_ENTER_MON );
294	<	enter_mon();
295	<	}
296	<	if (SPCFLAGS_TEST( SPCFLAG_DOINT )) {
297	<	SPCFLAGS_CLEAR( SPCFLAG_DOINT );
298	<	HandleInterrupt();
299	<	}
300	<	if (SPCFLAGS_TEST( SPCFLAG_INT )) {
301	<	SPCFLAGS_CLEAR( SPCFLAG_INT );
302	<	SPCFLAGS_SET( SPCFLAG_DOINT );
289	>	case 1:         // EXEC_RETURN
290	>	dg.gen_spcflags_set(SPCFLAG_CPU_EXEC_RETURN);
291	>	// Don't check for pending interrupts, we do know we have to
292	>	// get out of this block ASAP
293	>	dg.gen_exec_return();
294	>	status = COMPILE_EPILOGUE_OK;
295	>	break;
296	>
297	>	case 2: {       // EXEC_NATIVE
298	>	uint32 selector = NATIVE_OP_field::extract(opcode);
299	>	switch (selector) {
300	>	#if !PPC_REENTRANT_JIT
301	>	// Filter out functions that may invoke Execute68k() or
302	>	// CallMacOS(), this would break reentrancy as they could
303	>	// invalidate the translation cache and even overwrite
304	>	// continuation code when we are done with them.
305	>	case NATIVE_PATCH_NAME_REGISTRY:
306	>	dg.gen_invoke(DoPatchNameRegistry);
307	>	status = COMPILE_CODE_OK;
308	>	break;
309	>	case NATIVE_VIDEO_INSTALL_ACCEL:
310	>	dg.gen_invoke(VideoInstallAccel);
311	>	status = COMPILE_CODE_OK;
312	>	break;
313	>	case NATIVE_VIDEO_VBL:
314	>	dg.gen_invoke(VideoVBL);
315	>	status = COMPILE_CODE_OK;
316	>	break;
317	>	case NATIVE_GET_RESOURCE:
318	>	case NATIVE_GET_1_RESOURCE:
319	>	case NATIVE_GET_IND_RESOURCE:
320	>	case NATIVE_GET_1_IND_RESOURCE:
321	>	case NATIVE_R_GET_RESOURCE: {
322	>	static const uint32 get_resource_ptr[] = {
323	>	XLM_GET_RESOURCE,
324	>	XLM_GET_1_RESOURCE,
325	>	XLM_GET_IND_RESOURCE,
326	>	XLM_GET_1_IND_RESOURCE,
327	>	XLM_R_GET_RESOURCE
328	>	};
329	>	uint32 old_get_resource = ReadMacInt32(get_resource_ptr[selector - NATIVE_GET_RESOURCE]);
330	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
331	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::get_resource).ptr();
332	>	dg.gen_invoke_CPU_im(func, old_get_resource);
333	>	status = COMPILE_CODE_OK;
334	>	break;
335	>	}
336	>	#endif
337	>	case NATIVE_CHECK_LOAD_INVOC:
338	>	dg.gen_load_T0_GPR(3);
339	>	dg.gen_load_T1_GPR(4);
340	>	dg.gen_se_16_32_T1();
341	>	dg.gen_load_T2_GPR(5);
342	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
343	>	status = COMPILE_CODE_OK;
344	>	break;
345	>	case NATIVE_NAMED_CHECK_LOAD_INVOC:
346	>	dg.gen_load_T0_GPR(3);
347	>	dg.gen_load_T1_GPR(4);
348	>	dg.gen_load_T2_GPR(5);
349	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))named_check_load_invoc);
350	>	status = COMPILE_CODE_OK;
351	>	break;
352	>	case NATIVE_NQD_SYNC_HOOK:
353	>	dg.gen_load_T0_GPR(3);
354	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_sync_hook);
355	>	dg.gen_store_T0_GPR(3);
356	>	status = COMPILE_CODE_OK;
357	>	break;
358	>	case NATIVE_NQD_BITBLT_HOOK:
359	>	dg.gen_load_T0_GPR(3);
360	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_bitblt_hook);
361	>	dg.gen_store_T0_GPR(3);
362	>	status = COMPILE_CODE_OK;
363	>	break;
364	>	case NATIVE_NQD_FILLRECT_HOOK:
365	>	dg.gen_load_T0_GPR(3);
366	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_fillrect_hook);
367	>	dg.gen_store_T0_GPR(3);
368	>	status = COMPILE_CODE_OK;
369	>	break;
370	>	case NATIVE_NQD_UNKNOWN_HOOK:
371	>	dg.gen_load_T0_GPR(3);
372	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_unknown_hook);
373	>	dg.gen_store_T0_GPR(3);
374	>	status = COMPILE_CODE_OK;
375	>	break;
376	>	case NATIVE_NQD_BITBLT:
377	>	dg.gen_load_T0_GPR(3);
378	>	dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
379	>	status = COMPILE_CODE_OK;
380	>	break;
381	>	case NATIVE_NQD_INVRECT:
382	>	dg.gen_load_T0_GPR(3);
383	>	dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
384	>	status = COMPILE_CODE_OK;
385	>	break;
386	>	case NATIVE_NQD_FILLRECT:
387	>	dg.gen_load_T0_GPR(3);
388	>	dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
389	>	status = COMPILE_CODE_OK;
390	>	break;
391	>	}
392	>	// Could we fully translate this NativeOp?
393	>	if (status == COMPILE_CODE_OK) {
394	>	if (!FN_field::test(opcode))
395	>	cg_context.done_compile = false;
396	>	else {
397	>	dg.gen_load_T0_LR_aligned();
398	>	dg.gen_set_PC_T0();
399	>	cg_context.done_compile = true;
400		}
401	+	break;
402		}
403	+	#if PPC_REENTRANT_JIT
404	+	// Try to execute NativeOp trampoline
405	+	if (!FN_field::test(opcode))
406	+	dg.gen_set_PC_im(cg_context.pc + 4);
407	+	else {
408	+	dg.gen_load_T0_LR_aligned();
409	+	dg.gen_set_PC_T0();
410	+	}
411	+	dg.gen_mov_32_T0_im(selector);
412	+	dg.gen_jmp(native_op_trampoline);
413	+	cg_context.done_compile = true;
414	+	status = COMPILE_EPILOGUE_OK;
415	+	break;
416	+	#endif
417	+	// Invoke NativeOp handler
418	+	if (!FN_field::test(opcode)) {
419	+	typedef void (*func_t)(dyngen_cpu_base, uint32);
420	+	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_native_op).ptr();
421	+	dg.gen_invoke_CPU_im(func, selector);
422	+	cg_context.done_compile = false;
423	+	status = COMPILE_CODE_OK;
424	+	}
425	+	// Otherwise, let it generate a call to execute_sheep() which
426	+	// will cause necessary updates to the program counter
427	+	break;
428		}
253	–	};
429
430	<	// Execution loop
431	<	void sheepshaver_cpu::execute(uint32 entry)
432	<	{
433	<	try {
434	<	pc() = entry;
435	<	powerpc_cpu::do_execute<execute_nothing, execute_spcflags_check>();
436	<	}
437	<	catch (sheepshaver_exec_return const &) {
438	<	// Nothing, simply return
430	>	default: {      // EMUL_OP
431	>	uint32 emul_op = EMUL_OP_field::extract(opcode) - 3;
432	>	#if PPC_REENTRANT_JIT
433	>	// Try to execute EmulOp trampoline
434	>	dg.gen_set_PC_im(cg_context.pc + 4);
435	>	dg.gen_mov_32_T0_im(emul_op);
436	>	dg.gen_jmp(emul_op_trampoline);
437	>	cg_context.done_compile = true;
438	>	status = COMPILE_EPILOGUE_OK;
439	>	break;
440	>	#endif
441	>	// Invoke EmulOp handler
442	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
443	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
444	>	dg.gen_invoke_CPU_im(func, emul_op);
445	>	cg_context.done_compile = false;
446	>	status = COMPILE_CODE_OK;
447	>	break;
448		}
265	–	catch (...) {
266	–	printf("ERROR: execute() received an unknown exception!\n");
267	–	QuitEmulator();
449		}
450	+	return status;
451		}
452	+	#endif
453
454		// Handle MacOS interrupt
455	<	void sheepshaver_cpu::interrupt(uint32 entry, sheepshaver_cpu *cpu)
455	>	void sheepshaver_cpu::interrupt(uint32 entry)
456		{
457	<	#if MULTICORE_CPU
458	<	// Initialize stack pointer from previous CPU running
459	<	gpr(1) = cpu->gpr(1);
460	<	#else
457	>	#if EMUL_TIME_STATS
458	>	ppc_interrupt_count++;
459	>	const clock_t interrupt_start = clock();
460	>	#endif
461	>
462		// Save program counters and branch registers
463		uint32 saved_pc = pc();
464		uint32 saved_lr = lr();
465		uint32 saved_ctr= ctr();
466	<	#endif
466	>	uint32 saved_sp = gpr(1);
467
468	<	// Create stack frame
469	<	gpr(1) -= 64;
468	>	// Initialize stack pointer to SheepShaver alternate stack base
469	>	gpr(1) = SignalStackBase() - 64;
470
471		// Build trampoline to return from interrupt
472	<	uint32 trampoline[] = { POWERPC_EMUL_OP | 1 };
472	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
473
474		// Prepare registers for nanokernel interrupt routine
475	<	kernel_data->v[0x004 >> 2] = gpr(1);
476	<	kernel_data->v[0x018 >> 2] = gpr(6);
475	>	kernel_data->v[0x004 >> 2] = htonl(gpr(1));
476	>	kernel_data->v[0x018 >> 2] = htonl(gpr(6));
477
478	<	gpr(6) = kernel_data->v[0x65c >> 2];
478	>	gpr(6) = ntohl(kernel_data->v[0x65c >> 2]);
479		assert(gpr(6) != 0);
480		WriteMacInt32(gpr(6) + 0x13c, gpr(7));
481		WriteMacInt32(gpr(6) + 0x144, gpr(8));
#	Line 302 | Line 486 | void sheepshaver_cpu::interrupt(uint32 e
486		WriteMacInt32(gpr(6) + 0x16c, gpr(13));
487
488		gpr(1)  = KernelDataAddr;
489	<	gpr(7)  = kernel_data->v[0x660 >> 2];
489	>	gpr(7)  = ntohl(kernel_data->v[0x660 >> 2]);
490		gpr(8)  = 0;
491	<	gpr(10) = (uint32)trampoline;
492	<	gpr(12) = (uint32)trampoline;
493	<	gpr(13) = cr().get();
491	>	gpr(10) = trampoline.addr();
492	>	gpr(12) = trampoline.addr();
493	>	gpr(13) = get_cr();
494
495		// rlwimi. r7,r7,8,0,0
496		uint32 result = op_ppc_rlwimi::apply(gpr(7), 8, 0x80000000, gpr(7));
#	Line 314 | Line 498 | void sheepshaver_cpu::interrupt(uint32 e
498		gpr(7) = result;
499
500		gpr(11) = 0xf072; // MSR (SRR1)
501	<	cr().set((gpr(11) & 0x0fff0000) | (cr().get() & ~0x0fff0000));
501	>	cr().set((gpr(11) & 0x0fff0000) | (get_cr() & ~0x0fff0000));
502
503		// Enter nanokernel
504		execute(entry);
505
322	–	// Cleanup stack
323	–	gpr(1) += 64;
324	–
325	–	#if !MULTICORE_CPU
506		// Restore program counters and branch registers
507		pc() = saved_pc;
508		lr() = saved_lr;
509		ctr()= saved_ctr;
510	+	gpr(1) = saved_sp;
511	+
512	+	#if EMUL_TIME_STATS
513	+	interrupt_time += (clock() - interrupt_start);
514		#endif
515		}
516
517		// Execute 68k routine
518		void sheepshaver_cpu::execute_68k(uint32 entry, M68kRegisters *r)
519		{
520	+	#if EMUL_TIME_STATS
521	+	exec68k_count++;
522	+	const clock_t exec68k_start = clock();
523	+	#endif
524	+
525		#if SAFE_EXEC_68K
526		if (ReadMacInt32(XLM_RUN_MODE) != MODE_EMUL_OP)
527		printf("FATAL: Execute68k() not called from EMUL_OP mode\n");
#	Line 342 | Line 531 | void sheepshaver_cpu::execute_68k(uint32
531		uint32 saved_pc = pc();
532		uint32 saved_lr = lr();
533		uint32 saved_ctr= ctr();
534	+	uint32 saved_cr = get_cr();
535
536		// Create MacOS stack frame
537	+	// FIXME: make sure MacOS doesn't expect PPC registers to live on top
538		uint32 sp = gpr(1);
539	<	gpr(1) -= 56 + 19*4 + 18*8;
539	>	gpr(1) -= 56;
540		WriteMacInt32(gpr(1), sp);
541
542		// Save PowerPC registers
543	<	memcpy(Mac2HostAddr(gpr(1)+56), &gpr(13), sizeof(uint32)*(32-13));
543	>	uint32 saved_GPRs[19];
544	>	memcpy(&saved_GPRs[0], &gpr(13), sizeof(uint32)*(32-13));
545		#if SAVE_FP_EXEC_68K
546	<	memcpy(Mac2HostAddr(gpr(1)+56+19*4), &fpr(14), sizeof(double)*(32-14));
546	>	double saved_FPRs[18];
547	>	memcpy(&saved_FPRs[0], &fpr(14), sizeof(double)*(32-14));
548		#endif
549
550		// Setup registers for 68k emulator
#	Line 365 | Line 558 | void sheepshaver_cpu::execute_68k(uint32
558		gpr(25) = ReadMacInt32(XLM_68K_R25);            // MSB of SR
559		gpr(26) = 0;
560		gpr(28) = 0;                                                            // VBR
561	<	gpr(29) = kernel_data->ed.v[0x74 >> 2];         // Pointer to opcode table
562	<	gpr(30) = kernel_data->ed.v[0x78 >> 2];         // Address of emulator
561	>	gpr(29) = ntohl(kernel_data->ed.v[0x74 >> 2]);          // Pointer to opcode table
562	>	gpr(30) = ntohl(kernel_data->ed.v[0x78 >> 2]);          // Address of emulator
563		gpr(31) = KernelDataAddr + 0x1000;
564
565		// Push return address (points to EXEC_RETURN opcode) on stack
#	Line 398 | Line 591 | void sheepshaver_cpu::execute_68k(uint32
591		r->a[i] = gpr(16 + i);
592
593		// Restore PowerPC registers
594	<	memcpy(&gpr(13), Mac2HostAddr(gpr(1)+56), sizeof(uint32)*(32-13));
594	>	memcpy(&gpr(13), &saved_GPRs[0], sizeof(uint32)*(32-13));
595		#if SAVE_FP_EXEC_68K
596	<	memcpy(&fpr(14), Mac2HostAddr(gpr(1)+56+19*4), sizeof(double)*(32-14));
596	>	memcpy(&fpr(14), &saved_FPRs[0], sizeof(double)*(32-14));
597		#endif
598
599		// Cleanup stack
600	<	gpr(1) += 56 + 19*4 + 18*8;
600	>	gpr(1) += 56;
601
602		// Restore program counters and branch registers
603		pc() = saved_pc;
604		lr() = saved_lr;
605		ctr()= saved_ctr;
606	+	set_cr(saved_cr);
607	+
608	+	#if EMUL_TIME_STATS
609	+	exec68k_time += (clock() - exec68k_start);
610	+	#endif
611		}
612
613		// Call MacOS PPC code
614		uint32 sheepshaver_cpu::execute_macos_code(uint32 tvect, int nargs, uint32 const *args)
615		{
616	+	#if EMUL_TIME_STATS
617	+	macos_exec_count++;
618	+	const clock_t macos_exec_start = clock();
619	+	#endif
620	+
621		// Save program counters and branch registers
622		uint32 saved_pc = pc();
623		uint32 saved_lr = lr();
624		uint32 saved_ctr= ctr();
625
626		// Build trampoline with EXEC_RETURN
627	<	uint32 trampoline[] = { POWERPC_EMUL_OP | 1 };
628	<	lr() = (uint32)trampoline;
627	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
628	>	lr() = trampoline.addr();
629
630		gpr(1) -= 64;                                                           // Create stack frame
631		uint32 proc = ReadMacInt32(tvect);                      // Get routine address
#	Line 453 | Line 656 | uint32 sheepshaver_cpu::execute_macos_co
656		lr() = saved_lr;
657		ctr()= saved_ctr;
658
659	+	#if EMUL_TIME_STATS
660	+	macos_exec_time += (clock() - macos_exec_start);
661	+	#endif
662	+
663		return retval;
664		}
665
#	Line 461 | Line 668 | inline void sheepshaver_cpu::execute_ppc
668		{
669		// Save branch registers
670		uint32 saved_lr = lr();
464	–	uint32 saved_ctr= ctr();
671
672	<	const uint32 trampoline[] = { POWERPC_EMUL_OP | 1 };
672	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
673	>	WriteMacInt32(trampoline.addr(), POWERPC_EXEC_RETURN);
674	>	lr() = trampoline.addr();
675
468	–	lr() = (uint32)trampoline;
469	–	ctr()= entry;
676		execute(entry);
677
678		// Restore branch registers
679		lr() = saved_lr;
474	–	ctr()= saved_ctr;
680		}
681
682		// Resource Manager thunk
478	–	extern "C" void check_load_invoc(uint32 type, int16 id, uint16 **h);
479	–
683		inline void sheepshaver_cpu::get_resource(uint32 old_get_resource)
684		{
685		uint32 type = gpr(3);
#	Line 487 | Line 690 | inline void sheepshaver_cpu::get_resourc
690
691		// Call old routine
692		execute_ppc(old_get_resource);
490	–	uint16 **handle = (uint16 **)gpr(3);
693
694		// Call CheckLoad()
695	+	uint32 handle = gpr(3);
696		check_load_invoc(type, id, handle);
697	<	gpr(3) = (uint32)handle;
697	>	gpr(3) = handle;
698
699		// Cleanup stack
700		gpr(1) += 56;
#	Line 502 | Line 705 | inline void sheepshaver_cpu::get_resourc
705		*              SheepShaver CPU engine interface
706		**/
707
708	<	static sheepshaver_cpu *main_cpu = NULL;                // CPU emulator to handle usual control flow
709	<	static sheepshaver_cpu *interrupt_cpu = NULL;   // CPU emulator to handle interrupts
507	<	static sheepshaver_cpu *current_cpu = NULL;             // Current CPU emulator context
708	>	// PowerPC CPU emulator
709	>	static sheepshaver_cpu *ppc_cpu = NULL;
710
711	<	static inline void cpu_push(sheepshaver_cpu *new_cpu)
711	>	void FlushCodeCache(uintptr start, uintptr end)
712		{
713	<	#if MULTICORE_CPU
714	<	current_cpu = new_cpu;
513	<	#endif
514	<	}
515	<
516	<	static inline void cpu_pop()
517	<	{
518	<	#if MULTICORE_CPU
519	<	current_cpu = main_cpu;
520	<	#endif
713	>	D(bug("FlushCodeCache(%08x, %08x)\n", start, end));
714	>	ppc_cpu->invalidate_cache_range(start, end);
715		}
716
717		// Dump PPC registers
718		static void dump_registers(void)
719		{
720	<	current_cpu->dump_registers();
720	>	ppc_cpu->dump_registers();
721		}
722
723		// Dump log
724		static void dump_log(void)
725		{
726	<	current_cpu->dump_log();
726	>	ppc_cpu->dump_log();
727		}
728
729		/*
730		*  Initialize CPU emulation
731		*/
732
733	<	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)
733	>	sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip)
734		{
547	–	const uintptr addr = (uintptr)sip->si_addr;
735		#if ENABLE_VOSF
736	<	// Handle screen fault.
737	<	extern bool Screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
738	<	if (Screen_fault_handler((sigsegv_address_t)addr, SIGSEGV_INVALID_PC))
739	<	return;
736	>	// Handle screen fault
737	>	extern bool Screen_fault_handler(sigsegv_info_t *sip);
738	>	if (Screen_fault_handler(sip))
739	>	return SIGSEGV_RETURN_SUCCESS;
740		#endif
741	<	#if defined(__powerpc__)
742	<	if (addr >= ROM_BASE && addr < ROM_BASE + ROM_SIZE) {
743	<	printf("IGNORE write access to ROM at %08x\n", addr);
744	<	(((ucontext_t *)scp)->uc_mcontext.regs)->nip += 4;
745	<	return;
746	<	}
747	<	if (addr >= 0xf3012000 && addr < 0xf3014000 && 0) {
748	<	printf("IGNORE write access to ROM at %08x\n", addr);
749	<	(((ucontext_t *)scp)->uc_mcontext.regs)->nip += 4;
750	<	return;
741	>
742	>	const uintptr addr = (uintptr)sigsegv_get_fault_address(sip);
743	>	#if HAVE_SIGSEGV_SKIP_INSTRUCTION
744	>	// Ignore writes to ROM
745	>	if ((addr - (uintptr)ROMBaseHost) < ROM_SIZE)
746	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
747	>
748	>	// Get program counter of target CPU
749	>	sheepshaver_cpu * const cpu = ppc_cpu;
750	>	const uint32 pc = cpu->pc();
751	>
752	>	// Fault in Mac ROM or RAM?
753	>	bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize)) || (pc >= DR_CACHE_BASE && pc < (DR_CACHE_BASE + DR_CACHE_SIZE));
754	>	if (mac_fault) {
755	>
756	>	// "VM settings" during MacOS 8 installation
757	>	if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
758	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
759	>
760	>	// MacOS 8.5 installation
761	>	else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
762	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
763	>
764	>	// MacOS 8 serial drivers on startup
765	>	else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
766	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
767	>
768	>	// MacOS 8.1 serial drivers on startup
769	>	else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
770	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
771	>	else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
772	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
773	>
774	>	// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
775	>	else if ((pc - DR_CACHE_BASE) < DR_CACHE_SIZE && (cpu->gpr(16) == 0xf3012002 || cpu->gpr(16) == 0xf3012000))
776	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
777	>	else if ((pc - DR_CACHE_BASE) < DR_CACHE_SIZE && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
778	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
779	>
780	>	// Ignore writes to the zero page
781	>	else if ((uint32)(addr - SheepMem::ZeroPage()) < (uint32)SheepMem::PageSize())
782	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
783	>
784	>	// Ignore all other faults, if requested
785	>	if (PrefsFindBool("ignoresegv"))
786	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
787		}
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();
788		#else
789	<	printf("Main CPU context\n");
573	<	main_cpu->dump_registers();
574	<	printf("Interrupts CPU context\n");
575	<	interrupt_cpu->dump_registers();
789	>	#error "FIXME: You don't have the capability to skip instruction within signal handlers"
790		#endif
791	<	current_cpu->dump_log();
791	>
792	>	fprintf(stderr, "SIGSEGV\n");
793	>	fprintf(stderr, "  pc %p\n", sigsegv_get_fault_instruction_address(sip));
794	>	fprintf(stderr, "  ea %p\n", sigsegv_get_fault_address(sip));
795	>	dump_registers();
796	>	ppc_cpu->dump_log();
797		enter_mon();
798		QuitEmulator();
799	+
800	+	return SIGSEGV_RETURN_FAILURE;
801		}
802
803		void init_emul_ppc(void)
804		{
805	+	// Get pointer to KernelData in host address space
806	+	kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE);
807	+
808		// Initialize main CPU emulator
809	<	main_cpu = new sheepshaver_cpu();
810	<	main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
809	>	ppc_cpu = new sheepshaver_cpu();
810	>	ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
811	>	ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
812		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
813
589	–	#if MULTICORE_CPU
590	–	// Initialize alternate CPU emulator to handle interrupts
591	–	interrupt_cpu = new sheepshaver_cpu();
592	–	#endif
593	–
594	–	// Install SIGSEGV handler
595	–	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);
600	–
814		#if ENABLE_MON
815		// Install "regs" command in cxmon
816		mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
817		mon_add_command("log", dump_log, "log                      Dump PowerPC emulation log\n");
818		#endif
819	+
820	+	#if EMUL_TIME_STATS
821	+	emul_start_time = clock();
822	+	#endif
823		}
824
825		/*
826	+	*  Deinitialize emulation
827	+	*/
828	+
829	+	void exit_emul_ppc(void)
830	+	{
831	+	#if EMUL_TIME_STATS
832	+	clock_t emul_end_time = clock();
833	+
834	+	printf("### Statistics for SheepShaver emulation parts\n");
835	+	const clock_t emul_time = emul_end_time - emul_start_time;
836	+	printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
837	+	printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
838	+	(double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
839	+	printf("Total ppc interrupt count: %d (%2.1f %%)\n", ppc_interrupt_count,
840	+	(double(ppc_interrupt_count) * 100.0) / double(interrupt_count));
841	+
842	+	#define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
843	+	printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
844	+	printf("Total " LABEL " time  : %.1f sec (%.1f%%)\n",                   \
845	+	double(VAR_PREFIX##_time) / double(CLOCKS_PER_SEC),          \
846	+	100.0 * double(VAR_PREFIX##_time) / double(emul_time));      \
847	+	} while (0)
848	+
849	+	PRINT_STATS("Execute68k[Trap] execution", exec68k);
850	+	PRINT_STATS("NativeOp execution", native_exec);
851	+	PRINT_STATS("MacOS routine execution", macos_exec);
852	+
853	+	#undef PRINT_STATS
854	+	printf("\n");
855	+	#endif
856	+
857	+	delete ppc_cpu;
858	+	ppc_cpu = NULL;
859	+	}
860	+
861	+	#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
862	+	// Initialize EmulOp trampolines
863	+	void init_emul_op_trampolines(basic_dyngen & dg)
864	+	{
865	+	typedef void (*func_t)(dyngen_cpu_base, uint32);
866	+	func_t func;
867	+
868	+	// EmulOp
869	+	emul_op_trampoline = dg.gen_start();
870	+	func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
871	+	dg.gen_invoke_CPU_T0(func);
872	+	dg.gen_exec_return();
873	+	dg.gen_end();
874	+
875	+	// NativeOp
876	+	native_op_trampoline = dg.gen_start();
877	+	func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_native_op).ptr();
878	+	dg.gen_invoke_CPU_T0(func);
879	+	dg.gen_exec_return();
880	+	dg.gen_end();
881	+
882	+	D(bug("EmulOp trampoline:   %p\n", emul_op_trampoline));
883	+	D(bug("NativeOp trampoline: %p\n", native_op_trampoline));
884	+	}
885	+	#endif
886	+
887	+	/*
888		*  Emulation loop
889		*/
890
891		void emul_ppc(uint32 entry)
892		{
893	<	current_cpu = main_cpu;
894	<	current_cpu->start_log();
895	<	current_cpu->execute(entry);
893	>	#if 0
894	>	ppc_cpu->start_log();
895	>	#endif
896	>	// start emulation loop and enable code translation or caching
897	>	ppc_cpu->execute(entry);
898		}
899
900		/*
901		*  Handle PowerPC interrupt
902		*/
903
623	–	// Atomic operations
624	–	extern int atomic_add(int *var, int v);
625	–	extern int atomic_and(int *var, int v);
626	–	extern int atomic_or(int *var, int v);
627	–
904		void TriggerInterrupt(void)
905		{
906	+	idle_resume();
907		#if 0
908		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
909		#else
910	<	SPCFLAGS_SET( SPCFLAG_INT );
910	>	// Trigger interrupt to main cpu only
911	>	if (ppc_cpu)
912	>	ppc_cpu->trigger_interrupt();
913		#endif
914		}
915
916	<	static void HandleInterrupt(void)
916	>	void HandleInterrupt(powerpc_registers *r)
917		{
918	+	#ifdef USE_SDL_VIDEO
919	+	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
920	+	SDL_PumpEvents();
921	+	#endif
922	+
923		// Do nothing if interrupts are disabled
924		if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
925		return;
926
927	<	// Do nothing if there is no interrupt pending
928	<	if (InterruptFlags == 0)
929	<	return;
930	<
647	<	// Disable MacOS stack sniffer
648	<	WriteMacInt32(0x110, 0);
927	>	// Update interrupt count
928	>	#if EMUL_TIME_STATS
929	>	interrupt_count++;
930	>	#endif
931
932		// Interrupt action depends on current run mode
933		switch (ReadMacInt32(XLM_RUN_MODE)) {
934		case MODE_68K:
935		// 68k emulator active, trigger 68k interrupt level 1
654	–	assert(current_cpu == main_cpu);
936		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
937	<	main_cpu->set_cr(main_cpu->get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
937	>	r->cr.set(r->cr.get() | tswap32(kernel_data->v[0x674 >> 2]));
938		break;
939
940		#if INTERRUPTS_IN_NATIVE_MODE
941		case MODE_NATIVE:
942		// 68k emulator inactive, in nanokernel?
943	<	assert(current_cpu == main_cpu);
944	<	if (main_cpu->gpr(1) != KernelDataAddr) {
943	>	if (r->gpr[1] != KernelDataAddr) {
944	>
945		// Prepare for 68k interrupt level 1
946		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
947		WriteMacInt32(tswap32(kernel_data->v[0x658 >> 2]) + 0xdc,
#	Line 669 | Line 950 | static void HandleInterrupt(void)
950
951		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
952		DisableInterrupt();
672	–	cpu_push(interrupt_cpu);
953		if (ROMType == ROMTYPE_NEWWORLD)
954	<	current_cpu->interrupt(ROM_BASE + 0x312b1c, main_cpu);
954	>	ppc_cpu->interrupt(ROM_BASE + 0x312b1c);
955		else
956	<	current_cpu->interrupt(ROM_BASE + 0x312a3c, main_cpu);
677	<	cpu_pop();
956	>	ppc_cpu->interrupt(ROM_BASE + 0x312a3c);
957		}
958		break;
959		#endif
#	Line 683 | Line 962 | static void HandleInterrupt(void)
962		case MODE_EMUL_OP:
963		// 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
964		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
965	+	#if EMUL_TIME_STATS
966	+	const clock_t interrupt_start = clock();
967	+	#endif
968		#if 1
969		// Execute full 68k interrupt routine
970		M68kRegisters r;
971		uint32 old_r25 = ReadMacInt32(XLM_68K_R25);     // Save interrupt level
972		WriteMacInt32(XLM_68K_R25, 0x21);                       // Execute with interrupt level 1
973	<	static const uint8 proc[] = {
973	>	static const uint8 proc_template[] = {
974		0x3f, 0x3c, 0x00, 0x00,                 // move.w       #$0000,-(sp)    (fake format word)
975		0x48, 0x7a, 0x00, 0x0a,                 // pea          @1(pc)                  (return address)
976		0x40, 0xe7,                                             // move         sr,-(sp)                (saved SR)
#	Line 696 | Line 978 | static void HandleInterrupt(void)
978		0x4e, 0xd0,                                             // jmp          (a0)
979		M68K_RTS >> 8, M68K_RTS & 0xff  // @1
980		};
981	<	Execute68k((uint32)proc, &r);
981	>	BUILD_SHEEPSHAVER_PROCEDURE(proc);
982	>	Execute68k(proc, &r);
983		WriteMacInt32(XLM_68K_R25, old_r25);            // Restore interrupt level
984		#else
985		// Only update cursor
#	Line 704 | Line 987 | static void HandleInterrupt(void)
987		if (InterruptFlags & INTFLAG_VIA) {
988		ClearInterruptFlag(INTFLAG_VIA);
989		ADBInterrupt();
990	<	ExecutePPC(VideoVBL);
990	>	ExecuteNative(NATIVE_VIDEO_VBL);
991		}
992		}
993		#endif
994	+	#if EMUL_TIME_STATS
995	+	interrupt_time += (clock() - interrupt_start);
996	+	#endif
997		}
998		break;
999		#endif
1000		}
1001		}
1002
1003	<	/*
1004	<	*  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	<
753	<	static void get_resource(void);
754	<	static void get_1_resource(void);
755	<	static void get_ind_resource(void);
756	<	static void get_1_ind_resource(void);
757	<	static void r_get_resource(void);
758	<
759	<	#define GPR(REG) current_cpu->gpr(REG)
760	<
761	<	static void NativeOp(int selector)
1003	>	// Execute NATIVE_OP routine
1004	>	void sheepshaver_cpu::execute_native_op(uint32 selector)
1005		{
1006	+	#if EMUL_TIME_STATS
1007	+	native_exec_count++;
1008	+	const clock_t native_exec_start = clock();
1009	+	#endif
1010	+
1011		switch (selector) {
1012		case NATIVE_PATCH_NAME_REGISTRY:
1013		DoPatchNameRegistry();
#	Line 771 | Line 1019 | static void NativeOp(int selector)
1019		VideoVBL();
1020		break;
1021		case NATIVE_VIDEO_DO_DRIVER_IO:
1022	<	GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
775	<	(void *)GPR(5), GPR(6), GPR(7));
1022	>	gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1023		break;
1024	<	case NATIVE_GET_RESOURCE:
1025	<	get_resource();
1024	>	case NATIVE_ETHER_AO_GET_HWADDR:
1025	>	AO_get_ethernet_address(gpr(3));
1026		break;
1027	<	case NATIVE_GET_1_RESOURCE:
1028	<	get_1_resource();
1027	>	case NATIVE_ETHER_AO_ADD_MULTI:
1028	>	AO_enable_multicast(gpr(3));
1029		break;
1030	<	case NATIVE_GET_IND_RESOURCE:
1031	<	get_ind_resource();
1030	>	case NATIVE_ETHER_AO_DEL_MULTI:
1031	>	AO_disable_multicast(gpr(3));
1032		break;
1033	<	case NATIVE_GET_1_IND_RESOURCE:
1034	<	get_1_ind_resource();
1033	>	case NATIVE_ETHER_AO_SEND_PACKET:
1034	>	AO_transmit_packet(gpr(3));
1035		break;
1036	<	case NATIVE_R_GET_RESOURCE:
1037	<	r_get_resource();
1036	>	case NATIVE_ETHER_IRQ:
1037	>	EtherIRQ();
1038	>	break;
1039	>	case NATIVE_ETHER_INIT:
1040	>	gpr(3) = InitStreamModule((void *)gpr(3));
1041	>	break;
1042	>	case NATIVE_ETHER_TERM:
1043	>	TerminateStreamModule();
1044	>	break;
1045	>	case NATIVE_ETHER_OPEN:
1046	>	gpr(3) = ether_open((queue_t *)gpr(3), (void *)gpr(4), gpr(5), gpr(6), (void*)gpr(7));
1047	>	break;
1048	>	case NATIVE_ETHER_CLOSE:
1049	>	gpr(3) = ether_close((queue_t *)gpr(3), gpr(4), (void *)gpr(5));
1050	>	break;
1051	>	case NATIVE_ETHER_WPUT:
1052	>	gpr(3) = ether_wput((queue_t *)gpr(3), (mblk_t *)gpr(4));
1053	>	break;
1054	>	case NATIVE_ETHER_RSRV:
1055	>	gpr(3) = ether_rsrv((queue_t *)gpr(3));
1056	>	break;
1057	>	case NATIVE_NQD_SYNC_HOOK:
1058	>	gpr(3) = NQD_sync_hook(gpr(3));
1059	>	break;
1060	>	case NATIVE_NQD_UNKNOWN_HOOK:
1061	>	gpr(3) = NQD_unknown_hook(gpr(3));
1062	>	break;
1063	>	case NATIVE_NQD_BITBLT_HOOK:
1064	>	gpr(3) = NQD_bitblt_hook(gpr(3));
1065	>	break;
1066	>	case NATIVE_NQD_BITBLT:
1067	>	NQD_bitblt(gpr(3));
1068	>	break;
1069	>	case NATIVE_NQD_FILLRECT_HOOK:
1070	>	gpr(3) = NQD_fillrect_hook(gpr(3));
1071	>	break;
1072	>	case NATIVE_NQD_INVRECT:
1073	>	NQD_invrect(gpr(3));
1074	>	break;
1075	>	case NATIVE_NQD_FILLRECT:
1076	>	NQD_fillrect(gpr(3));
1077		break;
1078		case NATIVE_SERIAL_NOTHING:
1079		case NATIVE_SERIAL_OPEN:
#	Line 806 | Line 1092 | static void NativeOp(int selector)
1092		SerialStatus,
1093		SerialClose
1094		};
1095	<	GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
1095	>	gpr(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](gpr(3), gpr(4));
1096		break;
1097		}
1098	<	case NATIVE_DISABLE_INTERRUPT:
1099	<	DisableInterrupt();
1098	>	case NATIVE_GET_RESOURCE:
1099	>	get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1100		break;
1101	<	case NATIVE_ENABLE_INTERRUPT:
1102	<	EnableInterrupt();
1101	>	case NATIVE_GET_1_RESOURCE:
1102	>	get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1103	>	break;
1104	>	case NATIVE_GET_IND_RESOURCE:
1105	>	get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1106	>	break;
1107	>	case NATIVE_GET_1_IND_RESOURCE:
1108	>	get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1109	>	break;
1110	>	case NATIVE_R_GET_RESOURCE:
1111	>	get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1112	>	break;
1113	>	case NATIVE_MAKE_EXECUTABLE:
1114	>	MakeExecutable(0, gpr(4), gpr(5));
1115	>	break;
1116	>	case NATIVE_CHECK_LOAD_INVOC:
1117	>	check_load_invoc(gpr(3), gpr(4), gpr(5));
1118	>	break;
1119	>	case NATIVE_NAMED_CHECK_LOAD_INVOC:
1120	>	named_check_load_invoc(gpr(3), gpr(4), gpr(5));
1121		break;
1122		default:
1123		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1124		QuitEmulator();
1125		break;
1126		}
823	–	}
824	–
825	–	/*
826	–	*  Execute native subroutine (LR must contain return address)
827	–	*/
1127
1128	<	void ExecuteNative(int selector)
1129	<	{
1130	<	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);
1128	>	#if EMUL_TIME_STATS
1129	>	native_exec_time += (clock() - native_exec_start);
1130	>	#endif
1131		}
1132
1133		/*
#	Line 844 | Line 1138 | void ExecuteNative(int selector)
1138
1139		void Execute68k(uint32 pc, M68kRegisters *r)
1140		{
1141	<	current_cpu->execute_68k(pc, r);
1141	>	ppc_cpu->execute_68k(pc, r);
1142		}
1143
1144		/*
#	Line 854 | Line 1148 | void Execute68k(uint32 pc, M68kRegisters
1148
1149		void Execute68kTrap(uint16 trap, M68kRegisters *r)
1150		{
1151	<	uint16 proc[2] = {trap, M68K_RTS};
1152	<	Execute68k((uint32)proc, r);
1151	>	SheepVar proc_var(4);
1152	>	uint32 proc = proc_var.addr();
1153	>	WriteMacInt16(proc, trap);
1154	>	WriteMacInt16(proc + 2, M68K_RTS);
1155	>	Execute68k(proc, r);
1156		}
1157
1158		/*
#	Line 864 | Line 1161 | void Execute68kTrap(uint16 trap, M68kReg
1161
1162		uint32 call_macos(uint32 tvect)
1163		{
1164	<	return current_cpu->execute_macos_code(tvect, 0, NULL);
1164	>	return ppc_cpu->execute_macos_code(tvect, 0, NULL);
1165		}
1166
1167		uint32 call_macos1(uint32 tvect, uint32 arg1)
1168		{
1169		const uint32 args[] = { arg1 };
1170	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1170	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1171		}
1172
1173		uint32 call_macos2(uint32 tvect, uint32 arg1, uint32 arg2)
1174		{
1175		const uint32 args[] = { arg1, arg2 };
1176	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1176	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1177		}
1178
1179		uint32 call_macos3(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3)
1180		{
1181		const uint32 args[] = { arg1, arg2, arg3 };
1182	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1182	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1183		}
1184
1185		uint32 call_macos4(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4)
1186		{
1187		const uint32 args[] = { arg1, arg2, arg3, arg4 };
1188	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1188	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1189		}
1190
1191		uint32 call_macos5(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5)
1192		{
1193		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5 };
1194	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1194	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1195		}
1196
1197		uint32 call_macos6(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5, uint32 arg6)
1198		{
1199		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6 };
1200	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1200	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1201		}
1202
1203		uint32 call_macos7(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5, uint32 arg6, uint32 arg7)
1204		{
1205		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1206	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
910	<	}
911	<
912	<	/*
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	<	/*
938	<	*  Resource Manager thunks
939	<	*/
940	<
941	<	void get_resource(void)
942	<	{
943	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
944	<	}
945	<
946	<	void get_1_resource(void)
947	<	{
948	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
949	<	}
950	<
951	<	void get_ind_resource(void)
952	<	{
953	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
954	<	}
955	<
956	<	void get_1_ind_resource(void)
957	<	{
958	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
959	<	}
960	<
961	<	void r_get_resource(void)
962	<	{
963	<	current_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1206	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1207		}

Diff Legend

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