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.45 by gbeauche, 2004-06-22T14:18:35Z vs.
Revision 1.71 by gbeauche, 2006-07-09T12:15:48Z

#	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 42 | Line 42
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 82 | Line 89 | 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
89	–	// Enable interrupt routine safety checks?
90	–	#define SAFE_INTERRUPT_PPC 1
91	–
97		// Enable Execute68k() safety checks?
98		#define SAFE_EXEC_68K 1
99
#	Line 101 | Line 106 | const uint32 POWERPC_EXEC_RETURN = POWER
106		// Interrupts in native mode?
107		#define INTERRUPTS_IN_NATIVE_MODE 1
108
104	–	// Enable native EMUL_OPs to be run without a mode switch
105	–	#define ENABLE_NATIVE_EMUL_OP 1
106	–
109		// Pointer to Kernel Data
110	<	static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
110	>	static KernelData * kernel_data;
111
112		// SIGSEGV handler
113	<	static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
113	>	sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
114
115		#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
116		// Special trampolines for EmulOp and NativeOp
#	Line 138 | Line 140 | class sheepshaver_cpu
140		void init_decoder();
141		void execute_sheep(uint32 opcode);
142
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	–
143		public:
144
145		// Constructor
#	Line 187 | Line 166 | public:
166		// Execute MacOS/PPC code
167		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
168
169	+	#if PPC_ENABLE_JIT
170		// Compile one instruction
171		virtual int compile1(codegen_context_t & cg_context);
172	<
172	>	#endif
173		// Resource manager thunk
174		void get_resource(uint32 old_get_resource);
175
176		// Handle MacOS interrupt
177		void interrupt(uint32 entry);
198	–	void handle_interrupt();
178
179		// Make sure the SIGSEGV handler can access CPU registers
180		friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
181		};
182
204	–	// Memory allocator returning areas aligned on 16-byte boundaries
205	–	void *operator new(size_t size)
206	–	{
207	–	void *p;
208	–
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	–
183		sheepshaver_cpu::sheepshaver_cpu()
184		: powerpc_cpu(enable_jit_p())
185		{
#	Line 270 | Line 217 | typedef bit_field< 19, 19 > FN_field;
217		typedef bit_field< 20, 25 > NATIVE_OP_field;
218		typedef bit_field< 26, 31 > EMUL_OP_field;
219
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	–
220		// Execute EMUL_OP routine
221		void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
222		{
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	–
223		M68kRegisters r68;
224		WriteMacInt32(XLM_68K_R25, gpr(25));
225		WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
#	Line 329 | Line 228 | void sheepshaver_cpu::execute_emul_op(ui
228		for (int i = 0; i < 7; i++)
229		r68.a[i] = gpr(16 + i);
230		r68.a[7] = gpr(1);
231	<	uint32 saved_cr = get_cr() & CR_field<2>::mask();
231	>	uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8)
232		uint32 saved_xer = get_xer();
233		EmulOp(&r68, gpr(24), emul_op);
234		set_cr(saved_cr);
#	Line 373 | Line 272 | void sheepshaver_cpu::execute_sheep(uint
272		}
273
274		// Compile one instruction
275	+	#if PPC_ENABLE_JIT
276		int sheepshaver_cpu::compile1(codegen_context_t & cg_context)
277		{
378	–	#if PPC_ENABLE_JIT
278		const instr_info_t *ii = cg_context.instr_info;
279		if (ii->mnemo != PPC_I(SHEEP))
280		return COMPILE_FAILURE;
#	Line 437 | Line 336 | int sheepshaver_cpu::compile1(codegen_co
336		status = COMPILE_CODE_OK;
337		break;
338		}
339	+	#endif
340		case NATIVE_CHECK_LOAD_INVOC:
341		dg.gen_load_T0_GPR(3);
342		dg.gen_load_T1_GPR(4);
#	Line 445 | Line 345 | int sheepshaver_cpu::compile1(codegen_co
345		dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
346		status = COMPILE_CODE_OK;
347		break;
348	<	#endif
349	<	case NATIVE_DISABLE_INTERRUPT:
350	<	dg.gen_invoke(DisableInterrupt);
348	>	case NATIVE_NAMED_CHECK_LOAD_INVOC:
349	>	dg.gen_load_T0_GPR(3);
350	>	dg.gen_load_T1_GPR(4);
351	>	dg.gen_load_T2_GPR(5);
352	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))named_check_load_invoc);
353	>	status = COMPILE_CODE_OK;
354	>	break;
355	>	case NATIVE_NQD_SYNC_HOOK:
356	>	dg.gen_load_T0_GPR(3);
357	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_sync_hook);
358	>	dg.gen_store_T0_GPR(3);
359		status = COMPILE_CODE_OK;
360		break;
361	<	case NATIVE_ENABLE_INTERRUPT:
362	<	dg.gen_invoke(EnableInterrupt);
361	>	case NATIVE_NQD_BITBLT_HOOK:
362	>	dg.gen_load_T0_GPR(3);
363	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_bitblt_hook);
364	>	dg.gen_store_T0_GPR(3);
365		status = COMPILE_CODE_OK;
366		break;
367	<	case NATIVE_BITBLT:
367	>	case NATIVE_NQD_FILLRECT_HOOK:
368	>	dg.gen_load_T0_GPR(3);
369	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_fillrect_hook);
370	>	dg.gen_store_T0_GPR(3);
371	>	status = COMPILE_CODE_OK;
372	>	break;
373	>	case NATIVE_NQD_UNKNOWN_HOOK:
374	>	dg.gen_load_T0_GPR(3);
375	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_unknown_hook);
376	>	dg.gen_store_T0_GPR(3);
377	>	status = COMPILE_CODE_OK;
378	>	break;
379	>	case NATIVE_NQD_BITBLT:
380		dg.gen_load_T0_GPR(3);
381		dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
382		status = COMPILE_CODE_OK;
383		break;
384	<	case NATIVE_INVRECT:
384	>	case NATIVE_NQD_INVRECT:
385		dg.gen_load_T0_GPR(3);
386		dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
387		status = COMPILE_CODE_OK;
388		break;
389	<	case NATIVE_FILLRECT:
389	>	case NATIVE_NQD_FILLRECT:
390		dg.gen_load_T0_GPR(3);
391		dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
392		status = COMPILE_CODE_OK;
#	Line 475 | Line 397 | int sheepshaver_cpu::compile1(codegen_co
397		if (!FN_field::test(opcode))
398		cg_context.done_compile = false;
399		else {
400	<	dg.gen_load_A0_LR();
401	<	dg.gen_set_PC_A0();
400	>	dg.gen_load_T0_LR_aligned();
401	>	dg.gen_set_PC_T0();
402		cg_context.done_compile = true;
403		}
404		break;
#	Line 486 | Line 408 | int sheepshaver_cpu::compile1(codegen_co
408		if (!FN_field::test(opcode))
409		dg.gen_set_PC_im(cg_context.pc + 4);
410		else {
411	<	dg.gen_load_A0_LR();
412	<	dg.gen_set_PC_A0();
411	>	dg.gen_load_T0_LR_aligned();
412	>	dg.gen_set_PC_T0();
413		}
414		dg.gen_mov_32_T0_im(selector);
415		dg.gen_jmp(native_op_trampoline);
#	Line 510 | Line 432 | int sheepshaver_cpu::compile1(codegen_co
432
433		default: {      // EMUL_OP
434		uint32 emul_op = EMUL_OP_field::extract(opcode) - 3;
513	–	#if ENABLE_NATIVE_EMUL_OP
514	–	typedef void (*emul_op_func_t)(dyngen_cpu_base);
515	–	emul_op_func_t emul_op_func = 0;
516	–	switch (emul_op) {
517	–	case OP_MICROSECONDS:
518	–	emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_microseconds).ptr();
519	–	break;
520	–	case OP_IDLE_TIME:
521	–	emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_idle_time_1).ptr();
522	–	break;
523	–	case OP_IDLE_TIME_2:
524	–	emul_op_func = (emul_op_func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op_idle_time_2).ptr();
525	–	break;
526	–	}
527	–	if (emul_op_func) {
528	–	dg.gen_invoke_CPU(emul_op_func);
529	–	cg_context.done_compile = false;
530	–	status = COMPILE_CODE_OK;
531	–	break;
532	–	}
533	–	#endif
435		#if PPC_REENTRANT_JIT
436		// Try to execute EmulOp trampoline
437		dg.gen_set_PC_im(cg_context.pc + 4);
#	Line 550 | Line 451 | int sheepshaver_cpu::compile1(codegen_co
451		}
452		}
453		return status;
553	–	#endif
554	–	return COMPILE_FAILURE;
555	–	}
556	–
557	–	// CPU context to preserve on interrupt
558	–	sheepshaver_cpu::interrupt_context::interrupt_context(sheepshaver_cpu *_cpu, const char *_where)
559	–	{
560	–	#if SAFE_INTERRUPT_PPC >= 2
561	–	cpu = _cpu;
562	–	where = _where;
563	–
564	–	// Save interrupt context
565	–	memcpy(&gpr[0], &cpu->gpr(0), sizeof(gpr));
566	–	pc = cpu->pc();
567	–	lr = cpu->lr();
568	–	ctr = cpu->ctr();
569	–	cr = cpu->get_cr();
570	–	xer = cpu->get_xer();
571	–	#endif
454		}
573	–
574	–	sheepshaver_cpu::interrupt_context::~interrupt_context()
575	–	{
576	–	#if SAFE_INTERRUPT_PPC >= 2
577	–	// Check whether CPU context was preserved by interrupt
578	–	if (memcmp(&gpr[0], &cpu->gpr(0), sizeof(gpr)) != 0) {
579	–	printf("FATAL: %s: interrupt clobbers registers\n", where);
580	–	for (int i = 0; i < 32; i++)
581	–	if (gpr[i] != cpu->gpr(i))
582	–	printf(" r%d: %08x -> %08x\n", i, gpr[i], cpu->gpr(i));
583	–	}
584	–	if (pc != cpu->pc())
585	–	printf("FATAL: %s: interrupt clobbers PC\n", where);
586	–	if (lr != cpu->lr())
587	–	printf("FATAL: %s: interrupt clobbers LR\n", where);
588	–	if (ctr != cpu->ctr())
589	–	printf("FATAL: %s: interrupt clobbers CTR\n", where);
590	–	if (cr != cpu->get_cr())
591	–	printf("FATAL: %s: interrupt clobbers CR\n", where);
592	–	if (xer != cpu->get_xer())
593	–	printf("FATAL: %s: interrupt clobbers XER\n", where);
455		#endif
595	–	}
456
457		// Handle MacOS interrupt
458		void sheepshaver_cpu::interrupt(uint32 entry)
#	Line 602 | Line 462 | void sheepshaver_cpu::interrupt(uint32 e
462		const clock_t interrupt_start = clock();
463		#endif
464
605	–	#if SAFE_INTERRUPT_PPC
606	–	static int depth = 0;
607	–	if (depth != 0)
608	–	printf("FATAL: sheepshaver_cpu::interrupt() called more than once: %d\n", depth);
609	–	depth++;
610	–	#endif
611	–
465		// Save program counters and branch registers
466		uint32 saved_pc = pc();
467		uint32 saved_lr = lr();
#	Line 662 | Line 515 | void sheepshaver_cpu::interrupt(uint32 e
515		#if EMUL_TIME_STATS
516		interrupt_time += (clock() - interrupt_start);
517		#endif
665	–
666	–	#if SAFE_INTERRUPT_PPC
667	–	depth--;
668	–	#endif
518		}
519
520		// Execute 68k routine
#	Line 884 | Line 733 | static void dump_log(void)
733		*  Initialize CPU emulation
734		*/
735
736	<	static sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
736	>	sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
737		{
738		#if ENABLE_VOSF
739		// Handle screen fault
#	Line 896 | Line 745 | static sigsegv_return_t sigsegv_handler(
745		const uintptr addr = (uintptr)fault_address;
746		#if HAVE_SIGSEGV_SKIP_INSTRUCTION
747		// Ignore writes to ROM
748	<	if ((addr - ROM_BASE) < ROM_SIZE)
748	>	if ((addr - (uintptr)ROMBaseHost) < ROM_SIZE)
749		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
750
751		// Get program counter of target CPU
#	Line 943 | Line 792 | static sigsegv_return_t sigsegv_handler(
792		#error "FIXME: You don't have the capability to skip instruction within signal handlers"
793		#endif
794
795	<	printf("SIGSEGV\n");
796	<	printf("  pc %p\n", fault_instruction);
797	<	printf("  ea %p\n", fault_address);
795	>	fprintf(stderr, "SIGSEGV\n");
796	>	fprintf(stderr, "  pc %p\n", fault_instruction);
797	>	fprintf(stderr, "  ea %p\n", fault_address);
798		dump_registers();
799		ppc_cpu->dump_log();
800		enter_mon();
#	Line 956 | Line 805 | static sigsegv_return_t sigsegv_handler(
805
806		void init_emul_ppc(void)
807		{
808	+	// Get pointer to KernelData in host address space
809	+	kernel_data = (KernelData *)Mac2HostAddr(KERNEL_DATA_BASE);
810	+
811		// Initialize main CPU emulator
812		ppc_cpu = new sheepshaver_cpu();
813		ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
814		ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
815		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
816
965	–	// Install the handler for SIGSEGV
966	–	sigsegv_install_handler(sigsegv_handler);
967	–
817		#if ENABLE_MON
818		// Install "regs" command in cxmon
819		mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
#	Line 1009 | Line 858 | void exit_emul_ppc(void)
858		#endif
859
860		delete ppc_cpu;
861	+	ppc_cpu = NULL;
862		}
863
864		#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
#	Line 1056 | Line 906 | void emul_ppc(uint32 entry)
906
907		void TriggerInterrupt(void)
908		{
909	+	idle_resume();
910		#if 0
911		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
912		#else
#	Line 1065 | Line 916 | void TriggerInterrupt(void)
916		#endif
917		}
918
919	<	void sheepshaver_cpu::handle_interrupt(void)
919	>	void HandleInterrupt(powerpc_registers *r)
920		{
921	+	#ifdef USE_SDL_VIDEO
922	+	// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
923	+	SDL_PumpEvents();
924	+	#endif
925	+
926		// Do nothing if interrupts are disabled
927	<	if (*(int32 *)XLM_IRQ_NEST > 0)
927	>	if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
928		return;
929
930	<	// Current interrupt nest level
1075	<	static int interrupt_depth = 0;
1076	<	++interrupt_depth;
930	>	// Update interrupt count
931		#if EMUL_TIME_STATS
932		interrupt_count++;
933		#endif
934
1081	–	// Disable MacOS stack sniffer
1082	–	WriteMacInt32(0x110, 0);
1083	–
935		// Interrupt action depends on current run mode
936		switch (ReadMacInt32(XLM_RUN_MODE)) {
937		case MODE_68K:
938		// 68k emulator active, trigger 68k interrupt level 1
939		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
940	<	set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
940	>	r->cr.set(r->cr.get() | tswap32(kernel_data->v[0x674 >> 2]));
941		break;
942
943		#if INTERRUPTS_IN_NATIVE_MODE
944		case MODE_NATIVE:
945		// 68k emulator inactive, in nanokernel?
946	<	if (gpr(1) != KernelDataAddr && interrupt_depth == 1) {
1096	<	interrupt_context ctx(this, "PowerPC mode");
946	>	if (r->gpr[1] != KernelDataAddr) {
947
948		// Prepare for 68k interrupt level 1
949		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
#	Line 1115 | Line 965 | void sheepshaver_cpu::handle_interrupt(v
965		case MODE_EMUL_OP:
966		// 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
967		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1118	–	interrupt_context ctx(this, "68k mode");
968		#if EMUL_TIME_STATS
969		const clock_t interrupt_start = clock();
970		#endif
#	Line 1124 | Line 973 | void sheepshaver_cpu::handle_interrupt(v
973		M68kRegisters r;
974		uint32 old_r25 = ReadMacInt32(XLM_68K_R25);     // Save interrupt level
975		WriteMacInt32(XLM_68K_R25, 0x21);                       // Execute with interrupt level 1
976	<	static const uint8 proc[] = {
976	>	static const uint8 proc_template[] = {
977		0x3f, 0x3c, 0x00, 0x00,                 // move.w       #$0000,-(sp)    (fake format word)
978		0x48, 0x7a, 0x00, 0x0a,                 // pea          @1(pc)                  (return address)
979		0x40, 0xe7,                                             // move         sr,-(sp)                (saved SR)
#	Line 1132 | Line 981 | void sheepshaver_cpu::handle_interrupt(v
981		0x4e, 0xd0,                                             // jmp          (a0)
982		M68K_RTS >> 8, M68K_RTS & 0xff  // @1
983		};
984	<	Execute68k((uint32)proc, &r);
984	>	BUILD_SHEEPSHAVER_PROCEDURE(proc);
985	>	Execute68k(proc, &r);
986		WriteMacInt32(XLM_68K_R25, old_r25);            // Restore interrupt level
987		#else
988		// Only update cursor
#	Line 1151 | Line 1001 | void sheepshaver_cpu::handle_interrupt(v
1001		break;
1002		#endif
1003		}
1154	–
1155	–	// We are done with this interrupt
1156	–	--interrupt_depth;
1004		}
1005
1159	–	static void get_resource(void);
1160	–	static void get_1_resource(void);
1161	–	static void get_ind_resource(void);
1162	–	static void get_1_ind_resource(void);
1163	–	static void r_get_resource(void);
1164	–
1006		// Execute NATIVE_OP routine
1007		void sheepshaver_cpu::execute_native_op(uint32 selector)
1008		{
#	Line 1181 | Line 1022 | void sheepshaver_cpu::execute_native_op(
1022		VideoVBL();
1023		break;
1024		case NATIVE_VIDEO_DO_DRIVER_IO:
1025	<	gpr(3) = (int32)(int16)VideoDoDriverIO((void *)gpr(3), (void *)gpr(4),
1026	<	(void *)gpr(5), gpr(6), gpr(7));
1025	>	gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1026	>	break;
1027	>	case NATIVE_ETHER_AO_GET_HWADDR:
1028	>	AO_get_ethernet_address(gpr(3));
1029	>	break;
1030	>	case NATIVE_ETHER_AO_ADD_MULTI:
1031	>	AO_enable_multicast(gpr(3));
1032	>	break;
1033	>	case NATIVE_ETHER_AO_DEL_MULTI:
1034	>	AO_disable_multicast(gpr(3));
1035	>	break;
1036	>	case NATIVE_ETHER_AO_SEND_PACKET:
1037	>	AO_transmit_packet(gpr(3));
1038		break;
1187	–	#ifdef WORDS_BIGENDIAN
1039		case NATIVE_ETHER_IRQ:
1040		EtherIRQ();
1041		break;
#	Line 1206 | Line 1057 | void sheepshaver_cpu::execute_native_op(
1057		case NATIVE_ETHER_RSRV:
1058		gpr(3) = ether_rsrv((queue_t *)gpr(3));
1059		break;
1060	<	#else
1210	<	case NATIVE_ETHER_INIT:
1211	<	// FIXME: needs more complicated thunks
1212	<	gpr(3) = false;
1213	<	break;
1214	<	#endif
1215	<	case NATIVE_SYNC_HOOK:
1060	>	case NATIVE_NQD_SYNC_HOOK:
1061		gpr(3) = NQD_sync_hook(gpr(3));
1062		break;
1063	<	case NATIVE_BITBLT_HOOK:
1063	>	case NATIVE_NQD_UNKNOWN_HOOK:
1064	>	gpr(3) = NQD_unknown_hook(gpr(3));
1065	>	break;
1066	>	case NATIVE_NQD_BITBLT_HOOK:
1067		gpr(3) = NQD_bitblt_hook(gpr(3));
1068		break;
1069	<	case NATIVE_BITBLT:
1069	>	case NATIVE_NQD_BITBLT:
1070		NQD_bitblt(gpr(3));
1071		break;
1072	<	case NATIVE_FILLRECT_HOOK:
1072	>	case NATIVE_NQD_FILLRECT_HOOK:
1073		gpr(3) = NQD_fillrect_hook(gpr(3));
1074		break;
1075	<	case NATIVE_INVRECT:
1075	>	case NATIVE_NQD_INVRECT:
1076		NQD_invrect(gpr(3));
1077		break;
1078	<	case NATIVE_FILLRECT:
1078	>	case NATIVE_NQD_FILLRECT:
1079		NQD_fillrect(gpr(3));
1080		break;
1081		case NATIVE_SERIAL_NOTHING:
#	Line 1251 | Line 1099 | void sheepshaver_cpu::execute_native_op(
1099		break;
1100		}
1101		case NATIVE_GET_RESOURCE:
1102	+	get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1103	+	break;
1104		case NATIVE_GET_1_RESOURCE:
1105	+	get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1106	+	break;
1107		case NATIVE_GET_IND_RESOURCE:
1108	<	case NATIVE_GET_1_IND_RESOURCE:
1257	<	case NATIVE_R_GET_RESOURCE: {
1258	<	typedef void (*GetResourceCallback)(void);
1259	<	static const GetResourceCallback get_resource_callbacks[] = {
1260	<	::get_resource,
1261	<	::get_1_resource,
1262	<	::get_ind_resource,
1263	<	::get_1_ind_resource,
1264	<	::r_get_resource
1265	<	};
1266	<	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1108	>	get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1109		break;
1110	<	}
1111	<	case NATIVE_DISABLE_INTERRUPT:
1270	<	DisableInterrupt();
1110	>	case NATIVE_GET_1_IND_RESOURCE:
1111	>	get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1112		break;
1113	<	case NATIVE_ENABLE_INTERRUPT:
1114	<	EnableInterrupt();
1113	>	case NATIVE_R_GET_RESOURCE:
1114	>	get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1115		break;
1116		case NATIVE_MAKE_EXECUTABLE:
1117	<	MakeExecutable(0, (void *)gpr(4), gpr(5));
1117	>	MakeExecutable(0, gpr(4), gpr(5));
1118		break;
1119		case NATIVE_CHECK_LOAD_INVOC:
1120		check_load_invoc(gpr(3), gpr(4), gpr(5));
1121		break;
1122	+	case NATIVE_NAMED_CHECK_LOAD_INVOC:
1123	+	named_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);
1127		QuitEmulator();
#	Line 1364 | Line 1208 | uint32 call_macos7(uint32 tvect, uint32
1208		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1209		return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1210		}
1367	–
1368	–	/*
1369	–	*  Resource Manager thunks
1370	–	*/
1371	–
1372	–	void get_resource(void)
1373	–	{
1374	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1375	–	}
1376	–
1377	–	void get_1_resource(void)
1378	–	{
1379	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1380	–	}
1381	–
1382	–	void get_ind_resource(void)
1383	–	{
1384	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1385	–	}
1386	–
1387	–	void get_1_ind_resource(void)
1388	–	{
1389	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1390	–	}
1391	–
1392	–	void r_get_resource(void)
1393	–	{
1394	–	ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1395	–	}

Diff Legend

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