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.29 by gbeauche, 2004-02-20T17:20:15Z vs.
Revision 1.46 by gbeauche, 2004-06-22T17:10:08Z

#	Line 38 | Line 38
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
46		#if ENABLE_MON
47		#include "mon.h"
#	Line 50 | Line 52
52		#include "debug.h"
53
54		// Emulation time statistics
55	<	#define EMUL_TIME_STATS 1
55	>	#ifndef EMUL_TIME_STATS
56	>	#define EMUL_TIME_STATS 0
57	>	#endif
58
59		#if EMUL_TIME_STATS
60		static clock_t emul_start_time;
61	<	static uint32 interrupt_count = 0;
61	>	static uint32 interrupt_count = 0, ppc_interrupt_count = 0;
62		static clock_t interrupt_time = 0;
63		static uint32 exec68k_count = 0;
64		static clock_t exec68k_time = 0;
#	Line 82 | Line 86 | extern "C" void check_load_invoc(uint32
86		// PowerPC EmulOp to exit from emulation looop
87		const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
88
89	<	// Enable multicore (main/interrupts) cpu emulation?
90	<	#define MULTICORE_CPU (ASYNC_IRQ ? 1 : 0)
89	>	// Enable interrupt routine safety checks?
90	>	#define SAFE_INTERRUPT_PPC 1
91
92		// Enable Execute68k() safety checks?
93		#define SAFE_EXEC_68K 1
#	Line 97 | Line 101 | const uint32 POWERPC_EXEC_RETURN = POWER
101		// Interrupts in native mode?
102		#define INTERRUPTS_IN_NATIVE_MODE 1
103
104	+	// Enable native EMUL_OPs to be run without a mode switch
105	+	#define ENABLE_NATIVE_EMUL_OP 1
106	+
107		// Pointer to Kernel Data
108		static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
109
110		// SIGSEGV handler
111		static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
112
113	+	#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
114	+	// Special trampolines for EmulOp and NativeOp
115	+	static uint8 *emul_op_trampoline;
116	+	static uint8 *native_op_trampoline;
117	+	#endif
118	+
119		// JIT Compiler enabled?
120		static inline bool enable_jit_p()
121		{
#	Line 125 | Line 138 | class sheepshaver_cpu
138		void init_decoder();
139		void execute_sheep(uint32 opcode);
140
141	+	// Filter out EMUL_OP routines that only call native code
142	+	bool filter_execute_emul_op(uint32 emul_op);
143	+
144	+	// "Native" EMUL_OP routines
145	+	void execute_emul_op_microseconds();
146	+	void execute_emul_op_idle_time_1();
147	+	void execute_emul_op_idle_time_2();
148	+
149	+	// CPU context to preserve on interrupt
150	+	class interrupt_context {
151	+	uint32 gpr[32];
152	+	uint32 pc;
153	+	uint32 lr;
154	+	uint32 ctr;
155	+	uint32 cr;
156	+	uint32 xer;
157	+	sheepshaver_cpu *cpu;
158	+	const char *where;
159	+	public:
160	+	interrupt_context(sheepshaver_cpu *_cpu, const char *_where);
161	+	~interrupt_context();
162	+	};
163	+
164		public:
165
166		// Constructor
#	Line 136 | Line 172 | public:
172		uint32 get_xer() const          { return xer().get(); }
173		void set_xer(uint32 v)          { xer().set(v); }
174
175	+	// Execute NATIVE_OP routine
176	+	void execute_native_op(uint32 native_op);
177	+
178		// Execute EMUL_OP routine
179		void execute_emul_op(uint32 emul_op);
180
#	Line 149 | Line 188 | public:
188		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
189
190		// Compile one instruction
191	<	virtual bool compile1(codegen_context_t & cg_context);
191	>	virtual int compile1(codegen_context_t & cg_context);
192
193		// Resource manager thunk
194		void get_resource(uint32 old_get_resource);
#	Line 167 | Line 206 | void *operator new(size_t size)
206		{
207		void *p;
208
209	<	/* XXX: try different approaches */
209	>	#if defined(HAVE_POSIX_MEMALIGN)
210		if (posix_memalign(&p, 16, size) != 0)
211		throw std::bad_alloc();
212	+	#elif defined(HAVE_MEMALIGN)
213	+	p = memalign(16, size);
214	+	#elif defined(HAVE_VALLOC)
215	+	p = valloc(size); // page-aligned!
216	+	#else
217	+	/* XXX: handle padding ourselves */
218	+	p = malloc(size);
219	+	#endif
220
221		return p;
222		}
223
224		void operator delete(void *p)
225		{
226	+	#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
227	+	#if defined(__GLIBC__)
228	+	// this is known to work only with GNU libc
229	+	free(p);
230	+	#endif
231	+	#else
232		free(p);
233	+	#endif
234		}
235
236		sheepshaver_cpu::sheepshaver_cpu()
#	Line 205 | Line 259 | void sheepshaver_cpu::init_decoder()
259		}
260		}
261
208	–	// Forward declaration for native opcode handler
209	–	static void NativeOp(int selector);
210	–
262		/*              NativeOp instruction format:
263	<	+------------+--------------------------+--+----------+------------+
264	<	|      6     |                          |FN|    OP    |      2     |
265	<	+------------+--------------------------+--+----------+------------+
266	<	0         5 |6                       19 20 21      25 26        31
263	>	+------------+-------------------------+--+-----------+------------+
264	>	|      6     |                         |FN|    OP     |      2     |
265	>	+------------+-------------------------+--+-----------+------------+
266	>	0         5 |6                      18 19 20      25 26        31
267		*/
268
269	<	typedef bit_field< 20, 20 > FN_field;
270	<	typedef bit_field< 21, 25 > NATIVE_OP_field;
269	>	typedef bit_field< 19, 19 > FN_field;
270	>	typedef bit_field< 20, 25 > NATIVE_OP_field;
271		typedef bit_field< 26, 31 > EMUL_OP_field;
272
273	+	// "Native" EMUL_OP routines
274	+	#define GPR_A(REG) gpr(16 + (REG))
275	+	#define GPR_D(REG) gpr( 8 + (REG))
276	+
277	+	void sheepshaver_cpu::execute_emul_op_microseconds()
278	+	{
279	+	Microseconds(GPR_A(0), GPR_D(0));
280	+	}
281	+
282	+	void sheepshaver_cpu::execute_emul_op_idle_time_1()
283	+	{
284	+	// Sleep if no events pending
285	+	if (ReadMacInt32(0x14c) == 0)
286	+	Delay_usec(16667);
287	+	GPR_A(0) = ReadMacInt32(0x2b6);
288	+	}
289	+
290	+	void sheepshaver_cpu::execute_emul_op_idle_time_2()
291	+	{
292	+	// Sleep if no events pending
293	+	if (ReadMacInt32(0x14c) == 0)
294	+	Delay_usec(16667);
295	+	GPR_D(0) = (uint32)-2;
296	+	}
297	+
298	+	// Filter out EMUL_OP routines that only call native code
299	+	bool sheepshaver_cpu::filter_execute_emul_op(uint32 emul_op)
300	+	{
301	+	switch (emul_op) {
302	+	case OP_MICROSECONDS:
303	+	execute_emul_op_microseconds();
304	+	return true;
305	+	case OP_IDLE_TIME:
306	+	execute_emul_op_idle_time_1();
307	+	return true;
308	+	case OP_IDLE_TIME_2:
309	+	execute_emul_op_idle_time_2();
310	+	return true;
311	+	}
312	+	return false;
313	+	}
314	+
315		// Execute EMUL_OP routine
316		void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
317		{
318	+	#if ENABLE_NATIVE_EMUL_OP
319	+	// First, filter out EMUL_OPs that can be executed without a mode switch
320	+	if (filter_execute_emul_op(emul_op))
321	+	return;
322	+	#endif
323	+
324		M68kRegisters r68;
325		WriteMacInt32(XLM_68K_R25, gpr(25));
326		WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
#	Line 259 | Line 358 | void sheepshaver_cpu::execute_sheep(uint
358		break;
359
360		case 2:         // EXEC_NATIVE
361	<	NativeOp(NATIVE_OP_field::extract(opcode));
361	>	execute_native_op(NATIVE_OP_field::extract(opcode));
362		if (FN_field::test(opcode))
363		pc() = lr();
364		else
#	Line 274 | Line 373 | void sheepshaver_cpu::execute_sheep(uint
373		}
374
375		// Compile one instruction
376	<	bool sheepshaver_cpu::compile1(codegen_context_t & cg_context)
376	>	int sheepshaver_cpu::compile1(codegen_context_t & cg_context)
377		{
378		#if PPC_ENABLE_JIT
379		const instr_info_t *ii = cg_context.instr_info;
380		if (ii->mnemo != PPC_I(SHEEP))
381	<	return false;
381	>	return COMPILE_FAILURE;
382
383	<	bool compiled = false;
383	>	int status = COMPILE_FAILURE;
384		powerpc_dyngen & dg = cg_context.codegen;
385		uint32 opcode = cg_context.opcode;
386
387		switch (opcode & 0x3f) {
388		case 0:         // EMUL_RETURN
389		dg.gen_invoke(QuitEmulator);
390	<	compiled = true;
390	>	status = COMPILE_CODE_OK;
391		break;
392
393		case 1:         // EXEC_RETURN
394		dg.gen_spcflags_set(SPCFLAG_CPU_EXEC_RETURN);
395	<	compiled = true;
395	>	// Don't check for pending interrupts, we do know we have to
396	>	// get out of this block ASAP
397	>	dg.gen_exec_return();
398	>	status = COMPILE_EPILOGUE_OK;
399		break;
400
401		case 2: {       // EXEC_NATIVE
402		uint32 selector = NATIVE_OP_field::extract(opcode);
403		switch (selector) {
404	+	#if !PPC_REENTRANT_JIT
405	+	// Filter out functions that may invoke Execute68k() or
406	+	// CallMacOS(), this would break reentrancy as they could
407	+	// invalidate the translation cache and even overwrite
408	+	// continuation code when we are done with them.
409		case NATIVE_PATCH_NAME_REGISTRY:
410		dg.gen_invoke(DoPatchNameRegistry);
411	<	compiled = true;
411	>	status = COMPILE_CODE_OK;
412		break;
413		case NATIVE_VIDEO_INSTALL_ACCEL:
414		dg.gen_invoke(VideoInstallAccel);
415	<	compiled = true;
415	>	status = COMPILE_CODE_OK;
416		break;
417		case NATIVE_VIDEO_VBL:
418		dg.gen_invoke(VideoVBL);
419	<	compiled = true;
419	>	status = COMPILE_CODE_OK;
420		break;
421		case NATIVE_GET_RESOURCE:
422		case NATIVE_GET_1_RESOURCE:
#	Line 327 | Line 434 | bool sheepshaver_cpu::compile1(codegen_c
434		typedef void (*func_t)(dyngen_cpu_base, uint32);
435		func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::get_resource).ptr();
436		dg.gen_invoke_CPU_im(func, old_get_resource);
437	<	compiled = true;
437	>	status = COMPILE_CODE_OK;
438		break;
439		}
333	–	case NATIVE_DISABLE_INTERRUPT:
334	–	dg.gen_invoke(DisableInterrupt);
335	–	compiled = true;
336	–	break;
337	–	case NATIVE_ENABLE_INTERRUPT:
338	–	dg.gen_invoke(EnableInterrupt);
339	–	compiled = true;
340	–	break;
440		case NATIVE_CHECK_LOAD_INVOC:
441		dg.gen_load_T0_GPR(3);
442		dg.gen_load_T1_GPR(4);
443		dg.gen_se_16_32_T1();
444		dg.gen_load_T2_GPR(5);
445		dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
446	<	compiled = true;
446	>	status = COMPILE_CODE_OK;
447	>	break;
448	>	#endif
449	>	case NATIVE_BITBLT:
450	>	dg.gen_load_T0_GPR(3);
451	>	dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
452	>	status = COMPILE_CODE_OK;
453	>	break;
454	>	case NATIVE_INVRECT:
455	>	dg.gen_load_T0_GPR(3);
456	>	dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
457	>	status = COMPILE_CODE_OK;
458	>	break;
459	>	case NATIVE_FILLRECT:
460	>	dg.gen_load_T0_GPR(3);
461	>	dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
462	>	status = COMPILE_CODE_OK;
463		break;
464		}
465	<	if (FN_field::test(opcode)) {
466	<	if (compiled) {
465	>	// Could we fully translate this NativeOp?
466	>	if (status == COMPILE_CODE_OK) {
467	>	if (!FN_field::test(opcode))
468	>	cg_context.done_compile = false;
469	>	else {
470		dg.gen_load_A0_LR();
471		dg.gen_set_PC_A0();
472	+	cg_context.done_compile = true;
473		}
474	<	cg_context.done_compile = true;
474	>	break;
475		}
476	<	else
476	>	#if PPC_REENTRANT_JIT
477	>	// Try to execute NativeOp trampoline
478	>	if (!FN_field::test(opcode))
479	>	dg.gen_set_PC_im(cg_context.pc + 4);
480	>	else {
481	>	dg.gen_load_A0_LR();
482	>	dg.gen_set_PC_A0();
483	>	}
484	>	dg.gen_mov_32_T0_im(selector);
485	>	dg.gen_jmp(native_op_trampoline);
486	>	cg_context.done_compile = true;
487	>	status = COMPILE_EPILOGUE_OK;
488	>	break;
489	>	#endif
490	>	// Invoke NativeOp handler
491	>	if (!FN_field::test(opcode)) {
492	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
493	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_native_op).ptr();
494	>	dg.gen_invoke_CPU_im(func, selector);
495		cg_context.done_compile = false;
496	+	status = COMPILE_CODE_OK;
497	+	}
498	+	// Otherwise, let it generate a call to execute_sheep() which
499	+	// will cause necessary updates to the program counter
500		break;
501		}
502
503		default: {      // EMUL_OP
504	+	uint32 emul_op = EMUL_OP_field::extract(opcode) - 3;
505	+	#if ENABLE_NATIVE_EMUL_OP
506	+	typedef void (*emul_op_func_t)(dyngen_cpu_base);
507	+	emul_op_func_t emul_op_func = 0;
508	+	switch (emul_op) {
509	+	case OP_MICROSECONDS:
510	+	emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_microseconds).ptr();
511	+	break;
512	+	case OP_IDLE_TIME:
513	+	emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_idle_time_1).ptr();
514	+	break;
515	+	case OP_IDLE_TIME_2:
516	+	emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_idle_time_2).ptr();
517	+	break;
518	+	}
519	+	if (emul_op_func) {
520	+	dg.gen_invoke_CPU(emul_op_func);
521	+	cg_context.done_compile = false;
522	+	status = COMPILE_CODE_OK;
523	+	break;
524	+	}
525	+	#endif
526	+	#if PPC_REENTRANT_JIT
527	+	// Try to execute EmulOp trampoline
528	+	dg.gen_set_PC_im(cg_context.pc + 4);
529	+	dg.gen_mov_32_T0_im(emul_op);
530	+	dg.gen_jmp(emul_op_trampoline);
531	+	cg_context.done_compile = true;
532	+	status = COMPILE_EPILOGUE_OK;
533	+	break;
534	+	#endif
535	+	// Invoke EmulOp handler
536		typedef void (*func_t)(dyngen_cpu_base, uint32);
537		func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
538	<	dg.gen_invoke_CPU_im(func, EMUL_OP_field::extract(opcode) - 3);
538	>	dg.gen_invoke_CPU_im(func, emul_op);
539		cg_context.done_compile = false;
540	<	compiled = true;
540	>	status = COMPILE_CODE_OK;
541		break;
542		}
543		}
544	<	return compiled;
544	>	return status;
545	>	#endif
546	>	return COMPILE_FAILURE;
547	>	}
548	>
549	>	// CPU context to preserve on interrupt
550	>	sheepshaver_cpu::interrupt_context::interrupt_context(sheepshaver_cpu *_cpu, const char *_where)
551	>	{
552	>	#if SAFE_INTERRUPT_PPC >= 2
553	>	cpu = _cpu;
554	>	where = _where;
555	>
556	>	// Save interrupt context
557	>	memcpy(&gpr[0], &cpu->gpr(0), sizeof(gpr));
558	>	pc = cpu->pc();
559	>	lr = cpu->lr();
560	>	ctr = cpu->ctr();
561	>	cr = cpu->get_cr();
562	>	xer = cpu->get_xer();
563	>	#endif
564	>	}
565	>
566	>	sheepshaver_cpu::interrupt_context::~interrupt_context()
567	>	{
568	>	#if SAFE_INTERRUPT_PPC >= 2
569	>	// Check whether CPU context was preserved by interrupt
570	>	if (memcmp(&gpr[0], &cpu->gpr(0), sizeof(gpr)) != 0) {
571	>	printf("FATAL: %s: interrupt clobbers registers\n", where);
572	>	for (int i = 0; i < 32; i++)
573	>	if (gpr[i] != cpu->gpr(i))
574	>	printf(" r%d: %08x -> %08x\n", i, gpr[i], cpu->gpr(i));
575	>	}
576	>	if (pc != cpu->pc())
577	>	printf("FATAL: %s: interrupt clobbers PC\n", where);
578	>	if (lr != cpu->lr())
579	>	printf("FATAL: %s: interrupt clobbers LR\n", where);
580	>	if (ctr != cpu->ctr())
581	>	printf("FATAL: %s: interrupt clobbers CTR\n", where);
582	>	if (cr != cpu->get_cr())
583	>	printf("FATAL: %s: interrupt clobbers CR\n", where);
584	>	if (xer != cpu->get_xer())
585	>	printf("FATAL: %s: interrupt clobbers XER\n", where);
586		#endif
373	–	return false;
587		}
588
589		// Handle MacOS interrupt
590		void sheepshaver_cpu::interrupt(uint32 entry)
591		{
592		#if EMUL_TIME_STATS
593	<	interrupt_count++;
593	>	ppc_interrupt_count++;
594		const clock_t interrupt_start = clock();
595		#endif
596
597	<	#if !MULTICORE_CPU
597	>	#if SAFE_INTERRUPT_PPC
598	>	static int depth = 0;
599	>	if (depth != 0)
600	>	printf("FATAL: sheepshaver_cpu::interrupt() called more than once: %d\n", depth);
601	>	depth++;
602	>	#endif
603	>
604		// Save program counters and branch registers
605		uint32 saved_pc = pc();
606		uint32 saved_lr = lr();
607		uint32 saved_ctr= ctr();
608		uint32 saved_sp = gpr(1);
390	–	#endif
609
610		// Initialize stack pointer to SheepShaver alternate stack base
611		gpr(1) = SignalStackBase() - 64;
#	Line 427 | Line 645 | void sheepshaver_cpu::interrupt(uint32 e
645		// Enter nanokernel
646		execute(entry);
647
430	–	#if !MULTICORE_CPU
648		// Restore program counters and branch registers
649		pc() = saved_pc;
650		lr() = saved_lr;
651		ctr()= saved_ctr;
652		gpr(1) = saved_sp;
436	–	#endif
653
654		#if EMUL_TIME_STATS
655		interrupt_time += (clock() - interrupt_start);
656		#endif
657	+
658	+	#if SAFE_INTERRUPT_PPC
659	+	depth--;
660	+	#endif
661		}
662
663		// Execute 68k routine
#	Line 631 | Line 851 | inline void sheepshaver_cpu::get_resourc
851		*              SheepShaver CPU engine interface
852		**/
853
854	<	static sheepshaver_cpu *main_cpu = NULL;                // CPU emulator to handle usual control flow
855	<	static sheepshaver_cpu *interrupt_cpu = NULL;   // CPU emulator to handle interrupts
636	<	static sheepshaver_cpu *current_cpu = NULL;             // Current CPU emulator context
854	>	// PowerPC CPU emulator
855	>	static sheepshaver_cpu *ppc_cpu = NULL;
856
857		void FlushCodeCache(uintptr start, uintptr end)
858		{
859		D(bug("FlushCodeCache(%08x, %08x)\n", start, end));
860	<	main_cpu->invalidate_cache_range(start, end);
642	<	#if MULTICORE_CPU
643	<	interrupt_cpu->invalidate_cache_range(start, end);
644	<	#endif
645	<	}
646	<
647	<	static inline void cpu_push(sheepshaver_cpu *new_cpu)
648	<	{
649	<	#if MULTICORE_CPU
650	<	current_cpu = new_cpu;
651	<	#endif
652	<	}
653	<
654	<	static inline void cpu_pop()
655	<	{
656	<	#if MULTICORE_CPU
657	<	current_cpu = main_cpu;
658	<	#endif
860	>	ppc_cpu->invalidate_cache_range(start, end);
861		}
862
863		// Dump PPC registers
864		static void dump_registers(void)
865		{
866	<	current_cpu->dump_registers();
866	>	ppc_cpu->dump_registers();
867		}
868
869		// Dump log
870		static void dump_log(void)
871		{
872	<	current_cpu->dump_log();
872	>	ppc_cpu->dump_log();
873		}
874
875		/*
#	Line 690 | Line 892 | static sigsegv_return_t sigsegv_handler(
892		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
893
894		// Get program counter of target CPU
895	<	sheepshaver_cpu * const cpu = current_cpu;
895	>	sheepshaver_cpu * const cpu = ppc_cpu;
896		const uint32 pc = cpu->pc();
897
898		// Fault in Mac ROM or RAM?
899	<	bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize));
899	>	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));
900		if (mac_fault) {
901
902		// "VM settings" during MacOS 8 installation
#	Line 714 | Line 916 | static sigsegv_return_t sigsegv_handler(
916		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
917		else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
918		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
919	+
920	+	// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
921	+	else if ((pc - DR_CACHE_BASE) < DR_CACHE_SIZE && (cpu->gpr(16) == 0xf3012002 || cpu->gpr(16) == 0xf3012000))
922	+	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
923	+	else if ((pc - DR_CACHE_BASE) < DR_CACHE_SIZE && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
924	+	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
925	+
926	+	// Ignore writes to the zero page
927	+	else if ((uint32)(addr - SheepMem::ZeroPage()) < (uint32)SheepMem::PageSize())
928	+	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
929
930		// Ignore all other faults, if requested
931		if (PrefsFindBool("ignoresegv"))
#	Line 726 | Line 938 | static sigsegv_return_t sigsegv_handler(
938		printf("SIGSEGV\n");
939		printf("  pc %p\n", fault_instruction);
940		printf("  ea %p\n", fault_address);
729	–	printf(" cpu %s\n", current_cpu == main_cpu ? "main" : "interrupts");
941		dump_registers();
942	<	current_cpu->dump_log();
942	>	ppc_cpu->dump_log();
943		enter_mon();
944		QuitEmulator();
945
#	Line 738 | Line 949 | static sigsegv_return_t sigsegv_handler(
949		void init_emul_ppc(void)
950		{
951		// Initialize main CPU emulator
952	<	main_cpu = new sheepshaver_cpu();
953	<	main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
954	<	main_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
952	>	ppc_cpu = new sheepshaver_cpu();
953	>	ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
954	>	ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
955		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
956
746	–	#if MULTICORE_CPU
747	–	// Initialize alternate CPU emulator to handle interrupts
748	–	interrupt_cpu = new sheepshaver_cpu();
749	–	#endif
750	–
957		// Install the handler for SIGSEGV
958		sigsegv_install_handler(sigsegv_handler);
959
#	Line 776 | Line 982 | void exit_emul_ppc(void)
982		printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
983		printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
984		(double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
985	+	printf("Total ppc interrupt count: %d (%2.1f %%)\n", ppc_interrupt_count,
986	+	(double(ppc_interrupt_count) * 100.0) / double(interrupt_count));
987
988		#define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
989		printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
#	Line 792 | Line 1000 | void exit_emul_ppc(void)
1000		printf("\n");
1001		#endif
1002
1003	<	delete main_cpu;
1004	<	#if MULTICORE_CPU
1005	<	delete interrupt_cpu;
1006	<	#endif
1003	>	delete ppc_cpu;
1004	>	}
1005	>
1006	>	#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
1007	>	// Initialize EmulOp trampolines
1008	>	void init_emul_op_trampolines(basic_dyngen & dg)
1009	>	{
1010	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
1011	>	func_t func;
1012	>
1013	>	// EmulOp
1014	>	emul_op_trampoline = dg.gen_start();
1015	>	func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
1016	>	dg.gen_invoke_CPU_T0(func);
1017	>	dg.gen_exec_return();
1018	>	dg.gen_end();
1019	>
1020	>	// NativeOp
1021	>	native_op_trampoline = dg.gen_start();
1022	>	func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_native_op).ptr();
1023	>	dg.gen_invoke_CPU_T0(func);
1024	>	dg.gen_exec_return();
1025	>	dg.gen_end();
1026	>
1027	>	D(bug("EmulOp trampoline:   %p\n", emul_op_trampoline));
1028	>	D(bug("NativeOp trampoline: %p\n", native_op_trampoline));
1029		}
1030	+	#endif
1031
1032		/*
1033		*  Emulation loop
#	Line 804 | Line 1035 | void exit_emul_ppc(void)
1035
1036		void emul_ppc(uint32 entry)
1037		{
807	–	current_cpu = main_cpu;
1038		#if 0
1039	<	current_cpu->start_log();
1039	>	ppc_cpu->start_log();
1040		#endif
1041		// start emulation loop and enable code translation or caching
1042	<	current_cpu->execute(entry);
1042	>	ppc_cpu->execute(entry);
1043		}
1044
1045		/*
1046		*  Handle PowerPC interrupt
1047		*/
1048
819	–	#if ASYNC_IRQ
820	–	void HandleInterrupt(void)
821	–	{
822	–	main_cpu->handle_interrupt();
823	–	}
824	–	#else
1049		void TriggerInterrupt(void)
1050		{
1051		#if 0
1052		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
1053		#else
1054		// Trigger interrupt to main cpu only
1055	<	if (main_cpu)
1056	<	main_cpu->trigger_interrupt();
1055	>	if (ppc_cpu)
1056	>	ppc_cpu->trigger_interrupt();
1057		#endif
1058		}
835	–	#endif
1059
1060		void sheepshaver_cpu::handle_interrupt(void)
1061		{
1062		// Do nothing if interrupts are disabled
1063	<	if (*(int32 *)XLM_IRQ_NEST > 0)
1063	>	if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
1064		return;
1065
1066	<	// Do nothing if there is no interrupt pending
1067	<	if (InterruptFlags == 0)
1068	<	return;
1066	>	// Current interrupt nest level
1067	>	static int interrupt_depth = 0;
1068	>	++interrupt_depth;
1069	>	#if EMUL_TIME_STATS
1070	>	interrupt_count++;
1071	>	#endif
1072
1073		// Disable MacOS stack sniffer
1074		WriteMacInt32(0x110, 0);
#	Line 851 | Line 1077 | void sheepshaver_cpu::handle_interrupt(v
1077		switch (ReadMacInt32(XLM_RUN_MODE)) {
1078		case MODE_68K:
1079		// 68k emulator active, trigger 68k interrupt level 1
854	–	assert(current_cpu == main_cpu);
1080		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
1081		set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
1082		break;
#	Line 859 | Line 1084 | void sheepshaver_cpu::handle_interrupt(v
1084		#if INTERRUPTS_IN_NATIVE_MODE
1085		case MODE_NATIVE:
1086		// 68k emulator inactive, in nanokernel?
1087	<	assert(current_cpu == main_cpu);
1088	<	if (gpr(1) != KernelDataAddr) {
1087	>	if (gpr(1) != KernelDataAddr && interrupt_depth == 1) {
1088	>	interrupt_context ctx(this, "PowerPC mode");
1089	>
1090		// Prepare for 68k interrupt level 1
1091		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
1092		WriteMacInt32(tswap32(kernel_data->v[0x658 >> 2]) + 0xdc,
#	Line 869 | Line 1095 | void sheepshaver_cpu::handle_interrupt(v
1095
1096		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
1097		DisableInterrupt();
872	–	cpu_push(interrupt_cpu);
1098		if (ROMType == ROMTYPE_NEWWORLD)
1099	<	current_cpu->interrupt(ROM_BASE + 0x312b1c);
1099	>	ppc_cpu->interrupt(ROM_BASE + 0x312b1c);
1100		else
1101	<	current_cpu->interrupt(ROM_BASE + 0x312a3c);
877	<	cpu_pop();
1101	>	ppc_cpu->interrupt(ROM_BASE + 0x312a3c);
1102		}
1103		break;
1104		#endif
#	Line 883 | Line 1107 | void sheepshaver_cpu::handle_interrupt(v
1107		case MODE_EMUL_OP:
1108		// 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
1109		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1110	+	interrupt_context ctx(this, "68k mode");
1111	+	#if EMUL_TIME_STATS
1112	+	const clock_t interrupt_start = clock();
1113	+	#endif
1114		#if 1
1115		// Execute full 68k interrupt routine
1116		M68kRegisters r;
#	Line 908 | Line 1136 | void sheepshaver_cpu::handle_interrupt(v
1136		}
1137		}
1138		#endif
1139	+	#if EMUL_TIME_STATS
1140	+	interrupt_time += (clock() - interrupt_start);
1141	+	#endif
1142		}
1143		break;
1144		#endif
1145		}
1146	+
1147	+	// We are done with this interrupt
1148	+	--interrupt_depth;
1149		}
1150
1151		static void get_resource(void);
#	Line 920 | Line 1154 | static void get_ind_resource(void);
1154		static void get_1_ind_resource(void);
1155		static void r_get_resource(void);
1156
1157	<	#define GPR(REG) current_cpu->gpr(REG)
1158	<
925	<	static void NativeOp(int selector)
1157	>	// Execute NATIVE_OP routine
1158	>	void sheepshaver_cpu::execute_native_op(uint32 selector)
1159		{
1160		#if EMUL_TIME_STATS
1161		native_exec_count++;
#	Line 940 | Line 1173 | static void NativeOp(int selector)
1173		VideoVBL();
1174		break;
1175		case NATIVE_VIDEO_DO_DRIVER_IO:
1176	<	GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
1177	<	(void *)GPR(5), GPR(6), GPR(7));
1176	>	gpr(3) = (int32)(int16)VideoDoDriverIO((void *)gpr(3), (void *)gpr(4),
1177	>	(void *)gpr(5), gpr(6), gpr(7));
1178		break;
1179		#ifdef WORDS_BIGENDIAN
1180		case NATIVE_ETHER_IRQ:
1181		EtherIRQ();
1182		break;
1183		case NATIVE_ETHER_INIT:
1184	<	GPR(3) = InitStreamModule((void *)GPR(3));
1184	>	gpr(3) = InitStreamModule((void *)gpr(3));
1185		break;
1186		case NATIVE_ETHER_TERM:
1187		TerminateStreamModule();
1188		break;
1189		case NATIVE_ETHER_OPEN:
1190	<	GPR(3) = ether_open((queue_t *)GPR(3), (void *)GPR(4), GPR(5), GPR(6), (void*)GPR(7));
1190	>	gpr(3) = ether_open((queue_t *)gpr(3), (void *)gpr(4), gpr(5), gpr(6), (void*)gpr(7));
1191		break;
1192		case NATIVE_ETHER_CLOSE:
1193	<	GPR(3) = ether_close((queue_t *)GPR(3), GPR(4), (void *)GPR(5));
1193	>	gpr(3) = ether_close((queue_t *)gpr(3), gpr(4), (void *)gpr(5));
1194		break;
1195		case NATIVE_ETHER_WPUT:
1196	<	GPR(3) = ether_wput((queue_t *)GPR(3), (mblk_t *)GPR(4));
1196	>	gpr(3) = ether_wput((queue_t *)gpr(3), (mblk_t *)gpr(4));
1197		break;
1198		case NATIVE_ETHER_RSRV:
1199	<	GPR(3) = ether_rsrv((queue_t *)GPR(3));
1199	>	gpr(3) = ether_rsrv((queue_t *)gpr(3));
1200		break;
1201		#else
1202		case NATIVE_ETHER_INIT:
1203		// FIXME: needs more complicated thunks
1204	<	GPR(3) = false;
1204	>	gpr(3) = false;
1205		break;
1206		#endif
1207	+	case NATIVE_SYNC_HOOK:
1208	+	gpr(3) = NQD_sync_hook(gpr(3));
1209	+	break;
1210	+	case NATIVE_BITBLT_HOOK:
1211	+	gpr(3) = NQD_bitblt_hook(gpr(3));
1212	+	break;
1213	+	case NATIVE_BITBLT:
1214	+	NQD_bitblt(gpr(3));
1215	+	break;
1216	+	case NATIVE_FILLRECT_HOOK:
1217	+	gpr(3) = NQD_fillrect_hook(gpr(3));
1218	+	break;
1219	+	case NATIVE_INVRECT:
1220	+	NQD_invrect(gpr(3));
1221	+	break;
1222	+	case NATIVE_FILLRECT:
1223	+	NQD_fillrect(gpr(3));
1224	+	break;
1225		case NATIVE_SERIAL_NOTHING:
1226		case NATIVE_SERIAL_OPEN:
1227		case NATIVE_SERIAL_PRIME_IN:
#	Line 988 | Line 1239 | static void NativeOp(int selector)
1239		SerialStatus,
1240		SerialClose
1241		};
1242	<	GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
1242	>	gpr(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](gpr(3), gpr(4));
1243		break;
1244		}
1245		case NATIVE_GET_RESOURCE:
#	Line 998 | Line 1249 | static void NativeOp(int selector)
1249		case NATIVE_R_GET_RESOURCE: {
1250		typedef void (*GetResourceCallback)(void);
1251		static const GetResourceCallback get_resource_callbacks[] = {
1252	<	get_resource,
1253	<	get_1_resource,
1254	<	get_ind_resource,
1255	<	get_1_ind_resource,
1256	<	r_get_resource
1252	>	::get_resource,
1253	>	::get_1_resource,
1254	>	::get_ind_resource,
1255	>	::get_1_ind_resource,
1256	>	::r_get_resource
1257		};
1258		get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1259		break;
1260		}
1010	–	case NATIVE_DISABLE_INTERRUPT:
1011	–	DisableInterrupt();
1012	–	break;
1013	–	case NATIVE_ENABLE_INTERRUPT:
1014	–	EnableInterrupt();
1015	–	break;
1261		case NATIVE_MAKE_EXECUTABLE:
1262	<	MakeExecutable(0, (void *)GPR(4), GPR(5));
1262	>	MakeExecutable(0, (void *)gpr(4), gpr(5));
1263		break;
1264		case NATIVE_CHECK_LOAD_INVOC:
1265	<	check_load_invoc(GPR(3), GPR(4), GPR(5));
1265	>	check_load_invoc(gpr(3), gpr(4), gpr(5));
1266		break;
1267		default:
1268		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
#	Line 1038 | Line 1283 | static void NativeOp(int selector)
1283
1284		void Execute68k(uint32 pc, M68kRegisters *r)
1285		{
1286	<	current_cpu->execute_68k(pc, r);
1286	>	ppc_cpu->execute_68k(pc, r);
1287		}
1288
1289		/*
#	Line 1061 | Line 1306 | void Execute68kTrap(uint16 trap, M68kReg
1306
1307		uint32 call_macos(uint32 tvect)
1308		{
1309	<	return current_cpu->execute_macos_code(tvect, 0, NULL);
1309	>	return ppc_cpu->execute_macos_code(tvect, 0, NULL);
1310		}
1311
1312		uint32 call_macos1(uint32 tvect, uint32 arg1)
1313		{
1314		const uint32 args[] = { arg1 };
1315	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1315	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1316		}
1317
1318		uint32 call_macos2(uint32 tvect, uint32 arg1, uint32 arg2)
1319		{
1320		const uint32 args[] = { arg1, arg2 };
1321	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1321	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1322		}
1323
1324		uint32 call_macos3(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3)
1325		{
1326		const uint32 args[] = { arg1, arg2, arg3 };
1327	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1327	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1328		}
1329
1330		uint32 call_macos4(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4)
1331		{
1332		const uint32 args[] = { arg1, arg2, arg3, arg4 };
1333	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1333	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1334		}
1335
1336		uint32 call_macos5(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5)
1337		{
1338		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5 };
1339	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1339	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1340		}
1341
1342		uint32 call_macos6(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5, uint32 arg6)
1343		{
1344		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6 };
1345	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1345	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1346		}
1347
1348		uint32 call_macos7(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5, uint32 arg6, uint32 arg7)
1349		{
1350		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1351	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1351	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1352		}
1353
1354		/*
#	Line 1112 | Line 1357 | uint32 call_macos7(uint32 tvect, uint32
1357
1358		void get_resource(void)
1359		{
1360	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1360	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1361		}
1362
1363		void get_1_resource(void)
1364		{
1365	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1365	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1366		}
1367
1368		void get_ind_resource(void)
1369		{
1370	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1370	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1371		}
1372
1373		void get_1_ind_resource(void)
1374		{
1375	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1375	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1376		}
1377
1378		void r_get_resource(void)
1379		{
1380	<	current_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1380	>	ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1381		}

Diff Legend

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