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.35 by gbeauche, 2004-04-22T22:54:47Z vs.
Revision 1.60 by gbeauche, 2005-03-17T23:40:01Z

#	Line 1 | Line 1
1		/*
2		*  sheepshaver_glue.cpp - Glue Kheperix CPU to SheepShaver CPU engine interface
3		*
4	<	*  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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	+	#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"
#	Line 51 | Line 59
59		#include "debug.h"
60
61		// Emulation time statistics
62	<	#define EMUL_TIME_STATS 1
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;
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;
#	Line 83 | Line 93 | extern "C" void check_load_invoc(uint32
93		// PowerPC EmulOp to exit from emulation looop
94		const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
95
86	–	// Enable multicore (main/interrupts) cpu emulation?
87	–	#define MULTICORE_CPU (ASYNC_IRQ ? 1 : 0)
88	–
96		// Enable Execute68k() safety checks?
97		#define SAFE_EXEC_68K 1
98
#	Line 99 | Line 106 | const uint32 POWERPC_EXEC_RETURN = POWER
106		#define INTERRUPTS_IN_NATIVE_MODE 1
107
108		// Pointer to Kernel Data
109	<	static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
109	>	static KernelData * kernel_data;
110
111		// SIGSEGV handler
112	<	static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
112	>	sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
113	>
114	>	#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
115	>	// Special trampolines for EmulOp and NativeOp
116	>	static uint8 *emul_op_trampoline;
117	>	static uint8 *native_op_trampoline;
118	>	#endif
119
120		// JIT Compiler enabled?
121		static inline bool enable_jit_p()
#	Line 137 | Line 150 | public:
150		uint32 get_xer() const          { return xer().get(); }
151		void set_xer(uint32 v)          { xer().set(v); }
152
153	+	// Execute NATIVE_OP routine
154	+	void execute_native_op(uint32 native_op);
155	+
156		// Execute EMUL_OP routine
157		void execute_emul_op(uint32 emul_op);
158
#	Line 149 | Line 165 | public:
165		// Execute MacOS/PPC code
166		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
167
168	+	#if PPC_ENABLE_JIT
169		// Compile one instruction
170	<	virtual bool compile1(codegen_context_t & cg_context);
171	<
170	>	virtual int compile1(codegen_context_t & cg_context);
171	>	#endif
172		// Resource manager thunk
173		void get_resource(uint32 old_get_resource);
174
175		// Handle MacOS interrupt
176		void interrupt(uint32 entry);
160	–	void handle_interrupt();
177
178		// Make sure the SIGSEGV handler can access CPU registers
179		friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
180	+
181	+	// Memory allocator returning areas aligned on 16-byte boundaries
182	+	void *operator new(size_t size);
183	+	void operator delete(void *p);
184		};
185
186		// Memory allocator returning areas aligned on 16-byte boundaries
187	<	void *operator new(size_t size)
187	>	void *sheepshaver_cpu::operator new(size_t size)
188		{
189		void *p;
190
#	Line 183 | Line 203 | void *operator new(size_t size)
203		return p;
204		}
205
206	<	void operator delete(void *p)
206	>	void sheepshaver_cpu::operator delete(void *p)
207		{
208		#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
209		#if defined(__GLIBC__)
#	Line 221 | Line 241 | void sheepshaver_cpu::init_decoder()
241		}
242		}
243
224	–	// Forward declaration for native opcode handler
225	–	static void NativeOp(int selector);
226	–
244		/*              NativeOp instruction format:
245		+------------+-------------------------+--+-----------+------------+
246		|      6     |                         |FN|    OP     |      2     |
#	Line 275 | Line 292 | void sheepshaver_cpu::execute_sheep(uint
292		break;
293
294		case 2:         // EXEC_NATIVE
295	<	NativeOp(NATIVE_OP_field::extract(opcode));
295	>	execute_native_op(NATIVE_OP_field::extract(opcode));
296		if (FN_field::test(opcode))
297		pc() = lr();
298		else
#	Line 290 | Line 307 | void sheepshaver_cpu::execute_sheep(uint
307		}
308
309		// Compile one instruction
293	–	bool sheepshaver_cpu::compile1(codegen_context_t & cg_context)
294	–	{
310		#if PPC_ENABLE_JIT
311	+	int sheepshaver_cpu::compile1(codegen_context_t & cg_context)
312	+	{
313		const instr_info_t *ii = cg_context.instr_info;
314		if (ii->mnemo != PPC_I(SHEEP))
315	<	return false;
315	>	return COMPILE_FAILURE;
316
317	<	bool compiled = false;
317	>	int status = COMPILE_FAILURE;
318		powerpc_dyngen & dg = cg_context.codegen;
319		uint32 opcode = cg_context.opcode;
320
321		switch (opcode & 0x3f) {
322		case 0:         // EMUL_RETURN
323		dg.gen_invoke(QuitEmulator);
324	<	compiled = true;
324	>	status = COMPILE_CODE_OK;
325		break;
326
327		case 1:         // EXEC_RETURN
328		dg.gen_spcflags_set(SPCFLAG_CPU_EXEC_RETURN);
329	<	compiled = true;
329	>	// Don't check for pending interrupts, we do know we have to
330	>	// get out of this block ASAP
331	>	dg.gen_exec_return();
332	>	status = COMPILE_EPILOGUE_OK;
333		break;
334
335		case 2: {       // EXEC_NATIVE
336		uint32 selector = NATIVE_OP_field::extract(opcode);
337		switch (selector) {
338	+	#if !PPC_REENTRANT_JIT
339	+	// Filter out functions that may invoke Execute68k() or
340	+	// CallMacOS(), this would break reentrancy as they could
341	+	// invalidate the translation cache and even overwrite
342	+	// continuation code when we are done with them.
343		case NATIVE_PATCH_NAME_REGISTRY:
344		dg.gen_invoke(DoPatchNameRegistry);
345	<	compiled = true;
345	>	status = COMPILE_CODE_OK;
346		break;
347		case NATIVE_VIDEO_INSTALL_ACCEL:
348		dg.gen_invoke(VideoInstallAccel);
349	<	compiled = true;
349	>	status = COMPILE_CODE_OK;
350		break;
351		case NATIVE_VIDEO_VBL:
352		dg.gen_invoke(VideoVBL);
353	<	compiled = true;
353	>	status = COMPILE_CODE_OK;
354		break;
355		case NATIVE_GET_RESOURCE:
356		case NATIVE_GET_1_RESOURCE:
#	Line 343 | Line 368 | bool sheepshaver_cpu::compile1(codegen_c
368		typedef void (*func_t)(dyngen_cpu_base, uint32);
369		func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::get_resource).ptr();
370		dg.gen_invoke_CPU_im(func, old_get_resource);
371	<	compiled = true;
371	>	status = COMPILE_CODE_OK;
372		break;
373		}
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;
374		case NATIVE_CHECK_LOAD_INVOC:
375		dg.gen_load_T0_GPR(3);
376		dg.gen_load_T1_GPR(4);
377		dg.gen_se_16_32_T1();
378		dg.gen_load_T2_GPR(5);
379		dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
380	<	compiled = true;
380	>	status = COMPILE_CODE_OK;
381		break;
382	+	#endif
383		case NATIVE_BITBLT:
384		dg.gen_load_T0_GPR(3);
385		dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
386	<	compiled = true;
386	>	status = COMPILE_CODE_OK;
387		break;
388		case NATIVE_INVRECT:
389		dg.gen_load_T0_GPR(3);
390		dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
391	<	compiled = true;
391	>	status = COMPILE_CODE_OK;
392		break;
393		case NATIVE_FILLRECT:
394		dg.gen_load_T0_GPR(3);
395		dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
396	<	compiled = true;
396	>	status = COMPILE_CODE_OK;
397		break;
398		}
399	<	if (FN_field::test(opcode)) {
400	<	if (compiled) {
399	>	// Could we fully translate this NativeOp?
400	>	if (status == COMPILE_CODE_OK) {
401	>	if (!FN_field::test(opcode))
402	>	cg_context.done_compile = false;
403	>	else {
404		dg.gen_load_A0_LR();
405		dg.gen_set_PC_A0();
406	+	cg_context.done_compile = true;
407		}
408	<	cg_context.done_compile = true;
408	>	break;
409		}
410	<	else
410	>	#if PPC_REENTRANT_JIT
411	>	// Try to execute NativeOp trampoline
412	>	if (!FN_field::test(opcode))
413	>	dg.gen_set_PC_im(cg_context.pc + 4);
414	>	else {
415	>	dg.gen_load_A0_LR();
416	>	dg.gen_set_PC_A0();
417	>	}
418	>	dg.gen_mov_32_T0_im(selector);
419	>	dg.gen_jmp(native_op_trampoline);
420	>	cg_context.done_compile = true;
421	>	status = COMPILE_EPILOGUE_OK;
422	>	break;
423	>	#endif
424	>	// Invoke NativeOp handler
425	>	if (!FN_field::test(opcode)) {
426	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
427	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_native_op).ptr();
428	>	dg.gen_invoke_CPU_im(func, selector);
429		cg_context.done_compile = false;
430	+	status = COMPILE_CODE_OK;
431	+	}
432	+	// Otherwise, let it generate a call to execute_sheep() which
433	+	// will cause necessary updates to the program counter
434		break;
435		}
436
437		default: {      // EMUL_OP
438	+	uint32 emul_op = EMUL_OP_field::extract(opcode) - 3;
439	+	#if PPC_REENTRANT_JIT
440	+	// Try to execute EmulOp trampoline
441	+	dg.gen_set_PC_im(cg_context.pc + 4);
442	+	dg.gen_mov_32_T0_im(emul_op);
443	+	dg.gen_jmp(emul_op_trampoline);
444	+	cg_context.done_compile = true;
445	+	status = COMPILE_EPILOGUE_OK;
446	+	break;
447	+	#endif
448	+	// Invoke EmulOp handler
449		typedef void (*func_t)(dyngen_cpu_base, uint32);
450		func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
451	<	dg.gen_invoke_CPU_im(func, EMUL_OP_field::extract(opcode) - 3);
451	>	dg.gen_invoke_CPU_im(func, emul_op);
452		cg_context.done_compile = false;
453	<	compiled = true;
453	>	status = COMPILE_CODE_OK;
454		break;
455		}
456		}
457	<	return compiled;
403	<	#endif
404	<	return false;
457	>	return status;
458		}
459	+	#endif
460
461		// Handle MacOS interrupt
462		void sheepshaver_cpu::interrupt(uint32 entry)
463		{
464		#if EMUL_TIME_STATS
465	<	interrupt_count++;
465	>	ppc_interrupt_count++;
466		const clock_t interrupt_start = clock();
467		#endif
468
415	–	#if !MULTICORE_CPU
469		// Save program counters and branch registers
470		uint32 saved_pc = pc();
471		uint32 saved_lr = lr();
472		uint32 saved_ctr= ctr();
473		uint32 saved_sp = gpr(1);
421	–	#endif
474
475		// Initialize stack pointer to SheepShaver alternate stack base
476		gpr(1) = SignalStackBase() - 64;
#	Line 458 | Line 510 | void sheepshaver_cpu::interrupt(uint32 e
510		// Enter nanokernel
511		execute(entry);
512
461	–	#if !MULTICORE_CPU
513		// Restore program counters and branch registers
514		pc() = saved_pc;
515		lr() = saved_lr;
516		ctr()= saved_ctr;
517		gpr(1) = saved_sp;
467	–	#endif
518
519		#if EMUL_TIME_STATS
520		interrupt_time += (clock() - interrupt_start);
#	Line 662 | Line 712 | inline void sheepshaver_cpu::get_resourc
712		*              SheepShaver CPU engine interface
713		**/
714
715	<	static sheepshaver_cpu *main_cpu = NULL;                // CPU emulator to handle usual control flow
716	<	static sheepshaver_cpu *interrupt_cpu = NULL;   // CPU emulator to handle interrupts
667	<	static sheepshaver_cpu *current_cpu = NULL;             // Current CPU emulator context
715	>	// PowerPC CPU emulator
716	>	static sheepshaver_cpu *ppc_cpu = NULL;
717
718		void FlushCodeCache(uintptr start, uintptr end)
719		{
720		D(bug("FlushCodeCache(%08x, %08x)\n", start, end));
721	<	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
681	<	current_cpu = new_cpu;
682	<	#endif
683	<	}
684	<
685	<	static inline void cpu_pop()
686	<	{
687	<	#if MULTICORE_CPU
688	<	current_cpu = main_cpu;
689	<	#endif
721	>	ppc_cpu->invalidate_cache_range(start, end);
722		}
723
724		// Dump PPC registers
725		static void dump_registers(void)
726		{
727	<	current_cpu->dump_registers();
727	>	ppc_cpu->dump_registers();
728		}
729
730		// Dump log
731		static void dump_log(void)
732		{
733	<	current_cpu->dump_log();
733	>	ppc_cpu->dump_log();
734		}
735
736		/*
737		*  Initialize CPU emulation
738		*/
739
740	<	static sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
740	>	sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
741		{
742		#if ENABLE_VOSF
743		// Handle screen fault
#	Line 717 | Line 749 | static sigsegv_return_t sigsegv_handler(
749		const uintptr addr = (uintptr)fault_address;
750		#if HAVE_SIGSEGV_SKIP_INSTRUCTION
751		// Ignore writes to ROM
752	<	if ((addr - ROM_BASE) < ROM_SIZE)
752	>	if ((addr - (uintptr)ROMBaseHost) < ROM_SIZE)
753		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
754
755		// Get program counter of target CPU
756	<	sheepshaver_cpu * const cpu = current_cpu;
756	>	sheepshaver_cpu * const cpu = ppc_cpu;
757		const uint32 pc = cpu->pc();
758
759		// Fault in Mac ROM or RAM?
760	<	bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize));
760	>	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));
761		if (mac_fault) {
762
763		// "VM settings" during MacOS 8 installation
#	Line 745 | Line 777 | static sigsegv_return_t sigsegv_handler(
777		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
778		else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
779		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
780	+
781	+	// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
782	+	else if ((pc - DR_CACHE_BASE) < DR_CACHE_SIZE && (cpu->gpr(16) == 0xf3012002 || cpu->gpr(16) == 0xf3012000))
783	+	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
784	+	else if ((pc - DR_CACHE_BASE) < DR_CACHE_SIZE && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
785	+	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
786
787		// Ignore writes to the zero page
788		else if ((uint32)(addr - SheepMem::ZeroPage()) < (uint32)SheepMem::PageSize())
#	Line 758 | Line 796 | static sigsegv_return_t sigsegv_handler(
796		#error "FIXME: You don't have the capability to skip instruction within signal handlers"
797		#endif
798
799	<	printf("SIGSEGV\n");
800	<	printf("  pc %p\n", fault_instruction);
801	<	printf("  ea %p\n", fault_address);
764	<	printf(" cpu %s\n", current_cpu == main_cpu ? "main" : "interrupts");
799	>	fprintf(stderr, "SIGSEGV\n");
800	>	fprintf(stderr, "  pc %p\n", fault_instruction);
801	>	fprintf(stderr, "  ea %p\n", fault_address);
802		dump_registers();
803	<	current_cpu->dump_log();
803	>	ppc_cpu->dump_log();
804		enter_mon();
805		QuitEmulator();
806
#	Line 772 | Line 809 | static sigsegv_return_t sigsegv_handler(
809
810		void init_emul_ppc(void)
811		{
812	+	// Get pointer to KernelData in host address space
813	+	kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE);
814	+
815		// Initialize main CPU emulator
816	<	main_cpu = new sheepshaver_cpu();
817	<	main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
818	<	main_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
816	>	ppc_cpu = new sheepshaver_cpu();
817	>	ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
818	>	ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
819		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
820
781	–	#if MULTICORE_CPU
782	–	// Initialize alternate CPU emulator to handle interrupts
783	–	interrupt_cpu = new sheepshaver_cpu();
784	–	#endif
785	–
786	–	// Install the handler for SIGSEGV
787	–	sigsegv_install_handler(sigsegv_handler);
788	–
821		#if ENABLE_MON
822		// Install "regs" command in cxmon
823		mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
#	Line 811 | Line 843 | void exit_emul_ppc(void)
843		printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
844		printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
845		(double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
846	+	printf("Total ppc interrupt count: %d (%2.1f %%)\n", ppc_interrupt_count,
847	+	(double(ppc_interrupt_count) * 100.0) / double(interrupt_count));
848
849		#define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
850		printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
#	Line 827 | Line 861 | void exit_emul_ppc(void)
861		printf("\n");
862		#endif
863
864	<	delete main_cpu;
831	<	#if MULTICORE_CPU
832	<	delete interrupt_cpu;
833	<	#endif
864	>	delete ppc_cpu;
865		}
866
867	+	#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
868	+	// Initialize EmulOp trampolines
869	+	void init_emul_op_trampolines(basic_dyngen & dg)
870	+	{
871	+	typedef void (*func_t)(dyngen_cpu_base, uint32);
872	+	func_t func;
873	+
874	+	// EmulOp
875	+	emul_op_trampoline = dg.gen_start();
876	+	func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
877	+	dg.gen_invoke_CPU_T0(func);
878	+	dg.gen_exec_return();
879	+	dg.gen_end();
880	+
881	+	// NativeOp
882	+	native_op_trampoline = dg.gen_start();
883	+	func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_native_op).ptr();
884	+	dg.gen_invoke_CPU_T0(func);
885	+	dg.gen_exec_return();
886	+	dg.gen_end();
887	+
888	+	D(bug("EmulOp trampoline:   %p\n", emul_op_trampoline));
889	+	D(bug("NativeOp trampoline: %p\n", native_op_trampoline));
890	+	}
891	+	#endif
892	+
893		/*
894		*  Emulation loop
895		*/
896
897		void emul_ppc(uint32 entry)
898		{
842	–	current_cpu = main_cpu;
899		#if 0
900	<	current_cpu->start_log();
900	>	ppc_cpu->start_log();
901		#endif
902		// start emulation loop and enable code translation or caching
903	<	current_cpu->execute(entry);
903	>	ppc_cpu->execute(entry);
904		}
905
906		/*
907		*  Handle PowerPC interrupt
908		*/
909
854	–	#if ASYNC_IRQ
855	–	void HandleInterrupt(void)
856	–	{
857	–	main_cpu->handle_interrupt();
858	–	}
859	–	#else
910		void TriggerInterrupt(void)
911		{
912		#if 0
913		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
914		#else
915		// Trigger interrupt to main cpu only
916	<	if (main_cpu)
917	<	main_cpu->trigger_interrupt();
916	>	if (ppc_cpu)
917	>	ppc_cpu->trigger_interrupt();
918		#endif
919		}
870	–	#endif
920
921	<	void sheepshaver_cpu::handle_interrupt(void)
921	>	void HandleInterrupt(powerpc_registers *r)
922		{
923	+	#ifdef USE_SDL_VIDEO
924	+	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
925	+	SDL_PumpEvents();
926	+	#endif
927	+
928		// Do nothing if interrupts are disabled
929	<	if (*(int32 *)XLM_IRQ_NEST > 0)
929	>	if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
930		return;
931
932	<	// Do nothing if there is no interrupt pending
932	>	// Do nothing if there is no pending interrupt
933		if (InterruptFlags == 0)
934		return;
935
936	<	// Disable MacOS stack sniffer
937	<	WriteMacInt32(0x110, 0);
936	>	// Current interrupt nest level
937	>	static int interrupt_depth = 0;
938	>	++interrupt_depth;
939	>	#if EMUL_TIME_STATS
940	>	interrupt_count++;
941	>	#endif
942
943		// Interrupt action depends on current run mode
944		switch (ReadMacInt32(XLM_RUN_MODE)) {
945		case MODE_68K:
946		// 68k emulator active, trigger 68k interrupt level 1
889	–	assert(current_cpu == main_cpu);
947		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
948	<	set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
948	>	r->cr.set(r->cr.get() | tswap32(kernel_data->v[0x674 >> 2]));
949		break;
950
951		#if INTERRUPTS_IN_NATIVE_MODE
952		case MODE_NATIVE:
953		// 68k emulator inactive, in nanokernel?
954	<	assert(current_cpu == main_cpu);
955	<	if (gpr(1) != KernelDataAddr) {
954	>	if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) {
955	>
956		// Prepare for 68k interrupt level 1
957		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
958		WriteMacInt32(tswap32(kernel_data->v[0x658 >> 2]) + 0xdc,
#	Line 904 | Line 961 | void sheepshaver_cpu::handle_interrupt(v
961
962		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
963		DisableInterrupt();
907	–	cpu_push(interrupt_cpu);
964		if (ROMType == ROMTYPE_NEWWORLD)
965	<	current_cpu->interrupt(ROM_BASE + 0x312b1c);
965	>	ppc_cpu->interrupt(ROM_BASE + 0x312b1c);
966		else
967	<	current_cpu->interrupt(ROM_BASE + 0x312a3c);
912	<	cpu_pop();
967	>	ppc_cpu->interrupt(ROM_BASE + 0x312a3c);
968		}
969		break;
970		#endif
#	Line 918 | Line 973 | void sheepshaver_cpu::handle_interrupt(v
973		case MODE_EMUL_OP:
974		// 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
975		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
976	+	#if EMUL_TIME_STATS
977	+	const clock_t interrupt_start = clock();
978	+	#endif
979		#if 1
980		// Execute full 68k interrupt routine
981		M68kRegisters r;
982		uint32 old_r25 = ReadMacInt32(XLM_68K_R25);     // Save interrupt level
983		WriteMacInt32(XLM_68K_R25, 0x21);                       // Execute with interrupt level 1
984	<	static const uint8 proc[] = {
984	>	static const uint8 proc_template[] = {
985		0x3f, 0x3c, 0x00, 0x00,                 // move.w       #$0000,-(sp)    (fake format word)
986		0x48, 0x7a, 0x00, 0x0a,                 // pea          @1(pc)                  (return address)
987		0x40, 0xe7,                                             // move         sr,-(sp)                (saved SR)
#	Line 931 | Line 989 | void sheepshaver_cpu::handle_interrupt(v
989		0x4e, 0xd0,                                             // jmp          (a0)
990		M68K_RTS >> 8, M68K_RTS & 0xff  // @1
991		};
992	<	Execute68k((uint32)proc, &r);
992	>	BUILD_SHEEPSHAVER_PROCEDURE(proc);
993	>	Execute68k(proc, &r);
994		WriteMacInt32(XLM_68K_R25, old_r25);            // Restore interrupt level
995		#else
996		// Only update cursor
#	Line 943 | Line 1002 | void sheepshaver_cpu::handle_interrupt(v
1002		}
1003		}
1004		#endif
1005	+	#if EMUL_TIME_STATS
1006	+	interrupt_time += (clock() - interrupt_start);
1007	+	#endif
1008		}
1009		break;
1010		#endif
1011		}
1012	+
1013	+	// We are done with this interrupt
1014	+	--interrupt_depth;
1015		}
1016
1017		static void get_resource(void);
#	Line 955 | Line 1020 | static void get_ind_resource(void);
1020		static void get_1_ind_resource(void);
1021		static void r_get_resource(void);
1022
1023	<	#define GPR(REG) current_cpu->gpr(REG)
1024	<
960	<	static void NativeOp(int selector)
1023	>	// Execute NATIVE_OP routine
1024	>	void sheepshaver_cpu::execute_native_op(uint32 selector)
1025		{
1026		#if EMUL_TIME_STATS
1027		native_exec_count++;
#	Line 975 | Line 1039 | static void NativeOp(int selector)
1039		VideoVBL();
1040		break;
1041		case NATIVE_VIDEO_DO_DRIVER_IO:
1042	<	GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
979	<	(void *)GPR(5), GPR(6), GPR(7));
1042	>	gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1043		break;
981	–	#ifdef WORDS_BIGENDIAN
1044		case NATIVE_ETHER_IRQ:
1045		EtherIRQ();
1046		break;
1047		case NATIVE_ETHER_INIT:
1048	<	GPR(3) = InitStreamModule((void *)GPR(3));
1048	>	gpr(3) = InitStreamModule((void *)gpr(3));
1049		break;
1050		case NATIVE_ETHER_TERM:
1051		TerminateStreamModule();
1052		break;
1053		case NATIVE_ETHER_OPEN:
1054	<	GPR(3) = ether_open((queue_t *)GPR(3), (void *)GPR(4), GPR(5), GPR(6), (void*)GPR(7));
1054	>	gpr(3) = ether_open((queue_t *)gpr(3), (void *)gpr(4), gpr(5), gpr(6), (void*)gpr(7));
1055		break;
1056		case NATIVE_ETHER_CLOSE:
1057	<	GPR(3) = ether_close((queue_t *)GPR(3), GPR(4), (void *)GPR(5));
1057	>	gpr(3) = ether_close((queue_t *)gpr(3), gpr(4), (void *)gpr(5));
1058		break;
1059		case NATIVE_ETHER_WPUT:
1060	<	GPR(3) = ether_wput((queue_t *)GPR(3), (mblk_t *)GPR(4));
1060	>	gpr(3) = ether_wput((queue_t *)gpr(3), (mblk_t *)gpr(4));
1061		break;
1062		case NATIVE_ETHER_RSRV:
1063	<	GPR(3) = ether_rsrv((queue_t *)GPR(3));
1063	>	gpr(3) = ether_rsrv((queue_t *)gpr(3));
1064		break;
1003	–	#else
1004	–	case NATIVE_ETHER_INIT:
1005	–	// FIXME: needs more complicated thunks
1006	–	GPR(3) = false;
1007	–	break;
1008	–	#endif
1065		case NATIVE_SYNC_HOOK:
1066	<	GPR(3) = NQD_sync_hook(GPR(3));
1066	>	gpr(3) = NQD_sync_hook(gpr(3));
1067		break;
1068		case NATIVE_BITBLT_HOOK:
1069	<	GPR(3) = NQD_bitblt_hook(GPR(3));
1069	>	gpr(3) = NQD_bitblt_hook(gpr(3));
1070		break;
1071		case NATIVE_BITBLT:
1072	<	NQD_bitblt(GPR(3));
1072	>	NQD_bitblt(gpr(3));
1073		break;
1074		case NATIVE_FILLRECT_HOOK:
1075	<	GPR(3) = NQD_fillrect_hook(GPR(3));
1075	>	gpr(3) = NQD_fillrect_hook(gpr(3));
1076		break;
1077		case NATIVE_INVRECT:
1078	<	NQD_invrect(GPR(3));
1078	>	NQD_invrect(gpr(3));
1079		break;
1080		case NATIVE_FILLRECT:
1081	<	NQD_fillrect(GPR(3));
1081	>	NQD_fillrect(gpr(3));
1082		break;
1083		case NATIVE_SERIAL_NOTHING:
1084		case NATIVE_SERIAL_OPEN:
#	Line 1041 | Line 1097 | static void NativeOp(int selector)
1097		SerialStatus,
1098		SerialClose
1099		};
1100	<	GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
1100	>	gpr(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](gpr(3), gpr(4));
1101		break;
1102		}
1103		case NATIVE_GET_RESOURCE:
#	Line 1051 | Line 1107 | static void NativeOp(int selector)
1107		case NATIVE_R_GET_RESOURCE: {
1108		typedef void (*GetResourceCallback)(void);
1109		static const GetResourceCallback get_resource_callbacks[] = {
1110	<	get_resource,
1111	<	get_1_resource,
1112	<	get_ind_resource,
1113	<	get_1_ind_resource,
1114	<	r_get_resource
1110	>	::get_resource,
1111	>	::get_1_resource,
1112	>	::get_ind_resource,
1113	>	::get_1_ind_resource,
1114	>	::r_get_resource
1115		};
1116		get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1117		break;
1118		}
1063	–	case NATIVE_DISABLE_INTERRUPT:
1064	–	DisableInterrupt();
1065	–	break;
1066	–	case NATIVE_ENABLE_INTERRUPT:
1067	–	EnableInterrupt();
1068	–	break;
1119		case NATIVE_MAKE_EXECUTABLE:
1120	<	MakeExecutable(0, (void *)GPR(4), GPR(5));
1120	>	MakeExecutable(0, gpr(4), gpr(5));
1121		break;
1122		case NATIVE_CHECK_LOAD_INVOC:
1123	<	check_load_invoc(GPR(3), GPR(4), GPR(5));
1123	>	check_load_invoc(gpr(3), gpr(4), gpr(5));
1124		break;
1125		default:
1126		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
#	Line 1091 | Line 1141 | static void NativeOp(int selector)
1141
1142		void Execute68k(uint32 pc, M68kRegisters *r)
1143		{
1144	<	current_cpu->execute_68k(pc, r);
1144	>	ppc_cpu->execute_68k(pc, r);
1145		}
1146
1147		/*
#	Line 1114 | Line 1164 | void Execute68kTrap(uint16 trap, M68kReg
1164
1165		uint32 call_macos(uint32 tvect)
1166		{
1167	<	return current_cpu->execute_macos_code(tvect, 0, NULL);
1167	>	return ppc_cpu->execute_macos_code(tvect, 0, NULL);
1168		}
1169
1170		uint32 call_macos1(uint32 tvect, uint32 arg1)
1171		{
1172		const uint32 args[] = { arg1 };
1173	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1173	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1174		}
1175
1176		uint32 call_macos2(uint32 tvect, uint32 arg1, uint32 arg2)
1177		{
1178		const uint32 args[] = { arg1, arg2 };
1179	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1179	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1180		}
1181
1182		uint32 call_macos3(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3)
1183		{
1184		const uint32 args[] = { arg1, arg2, arg3 };
1185	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1185	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1186		}
1187
1188		uint32 call_macos4(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4)
1189		{
1190		const uint32 args[] = { arg1, arg2, arg3, arg4 };
1191	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1191	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1192		}
1193
1194		uint32 call_macos5(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5)
1195		{
1196		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5 };
1197	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1197	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1198		}
1199
1200		uint32 call_macos6(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5, uint32 arg6)
1201		{
1202		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6 };
1203	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1203	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1204		}
1205
1206		uint32 call_macos7(uint32 tvect, uint32 arg1, uint32 arg2, uint32 arg3, uint32 arg4, uint32 arg5, uint32 arg6, uint32 arg7)
1207		{
1208		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1209	<	return current_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1209	>	return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1210		}
1211
1212		/*
#	Line 1165 | Line 1215 | uint32 call_macos7(uint32 tvect, uint32
1215
1216		void get_resource(void)
1217		{
1218	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1218	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1219		}
1220
1221		void get_1_resource(void)
1222		{
1223	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1223	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1224		}
1225
1226		void get_ind_resource(void)
1227		{
1228	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1228	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1229		}
1230
1231		void get_1_ind_resource(void)
1232		{
1233	<	current_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1233	>	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1234		}
1235
1236		void r_get_resource(void)
1237		{
1238	<	current_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1238	>	ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1239		}

Diff Legend

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