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.53 by gbeauche, 2004-11-22T22:04:38Z vs.
Revision 1.77 by asvitkine, 2012-06-16T02:16:40Z

#	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-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 58 | Line 58
58		#define DEBUG 0
59		#include "debug.h"
60
61	+	extern "C" {
62	+	#include "dis-asm.h"
63	+	}
64	+
65		// Emulation time statistics
66		#ifndef EMUL_TIME_STATS
67		#define EMUL_TIME_STATS 0
#	Line 89 | Line 93 | extern uintptr SignalStackBase();
93
94		// From rsrc_patches.cpp
95		extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
96	+	extern "C" void named_check_load_invoc(uint32 type, uint32 name, uint32 h);
97
98		// PowerPC EmulOp to exit from emulation looop
99		const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
100
96	–	// Enable interrupt routine safety checks?
97	–	#define SAFE_INTERRUPT_PPC 1
98	–
101		// Enable Execute68k() safety checks?
102		#define SAFE_EXEC_68K 1
103
#	Line 120 | Line 122 | static uint8 *emul_op_trampoline;
122		static uint8 *native_op_trampoline;
123		#endif
124
123	–	// JIT Compiler enabled?
124	–	static inline bool enable_jit_p()
125	–	{
126	–	return PrefsFindBool("jit");
127	–	}
128	–
125
126		/**
127		*              PowerPC emulator glue with special 'sheep' opcodes
#	Line 142 | Line 138 | class sheepshaver_cpu
138		void init_decoder();
139		void execute_sheep(uint32 opcode);
140
145	–	// CPU context to preserve on interrupt
146	–	class interrupt_context {
147	–	uint32 gpr[32];
148	–	uint32 pc;
149	–	uint32 lr;
150	–	uint32 ctr;
151	–	uint32 cr;
152	–	uint32 xer;
153	–	sheepshaver_cpu *cpu;
154	–	const char *where;
155	–	public:
156	–	interrupt_context(sheepshaver_cpu *_cpu, const char *_where);
157	–	~interrupt_context();
158	–	};
159	–
141		public:
142
143		// Constructor
#	Line 192 | Line 173 | public:
173
174		// Handle MacOS interrupt
175		void interrupt(uint32 entry);
195	–	void handle_interrupt();
176
177		// Make sure the SIGSEGV handler can access CPU registers
178	<	friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
178	>	friend sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip);
179		};
180
201	–	// Memory allocator returning areas aligned on 16-byte boundaries
202	–	void *operator new(size_t size)
203	–	{
204	–	void *p;
205	–
206	–	#if defined(HAVE_POSIX_MEMALIGN)
207	–	if (posix_memalign(&p, 16, size) != 0)
208	–	throw std::bad_alloc();
209	–	#elif defined(HAVE_MEMALIGN)
210	–	p = memalign(16, size);
211	–	#elif defined(HAVE_VALLOC)
212	–	p = valloc(size); // page-aligned!
213	–	#else
214	–	/* XXX: handle padding ourselves */
215	–	p = malloc(size);
216	–	#endif
217	–
218	–	return p;
219	–	}
220	–
221	–	void operator delete(void *p)
222	–	{
223	–	#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
224	–	#if defined(__GLIBC__)
225	–	// this is known to work only with GNU libc
226	–	free(p);
227	–	#endif
228	–	#else
229	–	free(p);
230	–	#endif
231	–	}
232	–
181		sheepshaver_cpu::sheepshaver_cpu()
234	–	: powerpc_cpu(enable_jit_p())
182		{
183		init_decoder();
184	+
185	+	#if PPC_ENABLE_JIT
186	+	if (PrefsFindBool("jit"))
187	+	enable_jit();
188	+	#endif
189		}
190
191		void sheepshaver_cpu::init_decoder()
#	Line 241 | Line 193 | void sheepshaver_cpu::init_decoder()
193		static const instr_info_t sheep_ii_table[] = {
194		{ "sheep",
195		(execute_pmf)&sheepshaver_cpu::execute_sheep,
244	–	NULL,
196		PPC_I(SHEEP),
197		D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
198		}
#	Line 278 | Line 229 | void sheepshaver_cpu::execute_emul_op(ui
229		for (int i = 0; i < 7; i++)
230		r68.a[i] = gpr(16 + i);
231		r68.a[7] = gpr(1);
232	<	uint32 saved_cr = get_cr() & CR_field<2>::mask();
232	>	uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8)
233		uint32 saved_xer = get_xer();
234		EmulOp(&r68, gpr(24), emul_op);
235		set_cr(saved_cr);
#	Line 386 | Line 337 | int sheepshaver_cpu::compile1(codegen_co
337		status = COMPILE_CODE_OK;
338		break;
339		}
340	+	#endif
341		case NATIVE_CHECK_LOAD_INVOC:
342		dg.gen_load_T0_GPR(3);
343		dg.gen_load_T1_GPR(4);
#	Line 394 | Line 346 | int sheepshaver_cpu::compile1(codegen_co
346		dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
347		status = COMPILE_CODE_OK;
348		break;
349	<	#endif
350	<	case NATIVE_BITBLT:
349	>	case NATIVE_NAMED_CHECK_LOAD_INVOC:
350	>	dg.gen_load_T0_GPR(3);
351	>	dg.gen_load_T1_GPR(4);
352	>	dg.gen_load_T2_GPR(5);
353	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))named_check_load_invoc);
354	>	status = COMPILE_CODE_OK;
355	>	break;
356	>	case NATIVE_NQD_SYNC_HOOK:
357	>	dg.gen_load_T0_GPR(3);
358	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_sync_hook);
359	>	dg.gen_store_T0_GPR(3);
360	>	status = COMPILE_CODE_OK;
361	>	break;
362	>	case NATIVE_NQD_BITBLT_HOOK:
363	>	dg.gen_load_T0_GPR(3);
364	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_bitblt_hook);
365	>	dg.gen_store_T0_GPR(3);
366	>	status = COMPILE_CODE_OK;
367	>	break;
368	>	case NATIVE_NQD_FILLRECT_HOOK:
369	>	dg.gen_load_T0_GPR(3);
370	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_fillrect_hook);
371	>	dg.gen_store_T0_GPR(3);
372	>	status = COMPILE_CODE_OK;
373	>	break;
374	>	case NATIVE_NQD_UNKNOWN_HOOK:
375	>	dg.gen_load_T0_GPR(3);
376	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_unknown_hook);
377	>	dg.gen_store_T0_GPR(3);
378	>	status = COMPILE_CODE_OK;
379	>	break;
380	>	case NATIVE_NQD_BITBLT:
381		dg.gen_load_T0_GPR(3);
382		dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
383		status = COMPILE_CODE_OK;
384		break;
385	<	case NATIVE_INVRECT:
385	>	case NATIVE_NQD_INVRECT:
386		dg.gen_load_T0_GPR(3);
387		dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
388		status = COMPILE_CODE_OK;
389		break;
390	<	case NATIVE_FILLRECT:
390	>	case NATIVE_NQD_FILLRECT:
391		dg.gen_load_T0_GPR(3);
392		dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
393		status = COMPILE_CODE_OK;
#	Line 416 | Line 398 | int sheepshaver_cpu::compile1(codegen_co
398		if (!FN_field::test(opcode))
399		cg_context.done_compile = false;
400		else {
401	<	dg.gen_load_A0_LR();
402	<	dg.gen_set_PC_A0();
401	>	dg.gen_load_T0_LR_aligned();
402	>	dg.gen_set_PC_T0();
403		cg_context.done_compile = true;
404		}
405		break;
#	Line 427 | Line 409 | int sheepshaver_cpu::compile1(codegen_co
409		if (!FN_field::test(opcode))
410		dg.gen_set_PC_im(cg_context.pc + 4);
411		else {
412	<	dg.gen_load_A0_LR();
413	<	dg.gen_set_PC_A0();
412	>	dg.gen_load_T0_LR_aligned();
413	>	dg.gen_set_PC_T0();
414		}
415		dg.gen_mov_32_T0_im(selector);
416		dg.gen_jmp(native_op_trampoline);
#	Line 473 | Line 455 | int sheepshaver_cpu::compile1(codegen_co
455		}
456		#endif
457
476	–	// CPU context to preserve on interrupt
477	–	sheepshaver_cpu::interrupt_context::interrupt_context(sheepshaver_cpu *_cpu, const char *_where)
478	–	{
479	–	#if SAFE_INTERRUPT_PPC >= 2
480	–	cpu = _cpu;
481	–	where = _where;
482	–
483	–	// Save interrupt context
484	–	memcpy(&gpr[0], &cpu->gpr(0), sizeof(gpr));
485	–	pc = cpu->pc();
486	–	lr = cpu->lr();
487	–	ctr = cpu->ctr();
488	–	cr = cpu->get_cr();
489	–	xer = cpu->get_xer();
490	–	#endif
491	–	}
492	–
493	–	sheepshaver_cpu::interrupt_context::~interrupt_context()
494	–	{
495	–	#if SAFE_INTERRUPT_PPC >= 2
496	–	// Check whether CPU context was preserved by interrupt
497	–	if (memcmp(&gpr[0], &cpu->gpr(0), sizeof(gpr)) != 0) {
498	–	printf("FATAL: %s: interrupt clobbers registers\n", where);
499	–	for (int i = 0; i < 32; i++)
500	–	if (gpr[i] != cpu->gpr(i))
501	–	printf(" r%d: %08x -> %08x\n", i, gpr[i], cpu->gpr(i));
502	–	}
503	–	if (pc != cpu->pc())
504	–	printf("FATAL: %s: interrupt clobbers PC\n", where);
505	–	if (lr != cpu->lr())
506	–	printf("FATAL: %s: interrupt clobbers LR\n", where);
507	–	if (ctr != cpu->ctr())
508	–	printf("FATAL: %s: interrupt clobbers CTR\n", where);
509	–	if (cr != cpu->get_cr())
510	–	printf("FATAL: %s: interrupt clobbers CR\n", where);
511	–	if (xer != cpu->get_xer())
512	–	printf("FATAL: %s: interrupt clobbers XER\n", where);
513	–	#endif
514	–	}
515	–
458		// Handle MacOS interrupt
459		void sheepshaver_cpu::interrupt(uint32 entry)
460		{
#	Line 521 | Line 463 | void sheepshaver_cpu::interrupt(uint32 e
463		const clock_t interrupt_start = clock();
464		#endif
465
524	–	#if SAFE_INTERRUPT_PPC
525	–	static int depth = 0;
526	–	if (depth != 0)
527	–	printf("FATAL: sheepshaver_cpu::interrupt() called more than once: %d\n", depth);
528	–	depth++;
529	–	#endif
530	–
466		// Save program counters and branch registers
467		uint32 saved_pc = pc();
468		uint32 saved_lr = lr();
#	Line 581 | Line 516 | void sheepshaver_cpu::interrupt(uint32 e
516		#if EMUL_TIME_STATS
517		interrupt_time += (clock() - interrupt_start);
518		#endif
584	–
585	–	#if SAFE_INTERRUPT_PPC
586	–	depth--;
587	–	#endif
519		}
520
521		// Execute 68k routine
#	Line 799 | Line 730 | static void dump_log(void)
730		ppc_cpu->dump_log();
731		}
732
733	<	/*
734	<	*  Initialize CPU emulation
735	<	*/
733	>	static int read_mem(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info)
734	>	{
735	>	Mac2Host_memcpy(myaddr, memaddr, length);
736	>	return 0;
737	>	}
738	>
739	>	static void dump_disassembly(const uint32 pc, const int prefix_count, const int suffix_count)
740	>	{
741	>	struct disassemble_info info;
742	>	INIT_DISASSEMBLE_INFO(info, stderr, fprintf);
743	>	info.read_memory_func = read_mem;
744	>
745	>	const int count = prefix_count + suffix_count + 1;
746	>	const uint32 base_addr = pc - prefix_count * 4;
747	>	for (int i = 0; i < count; i++) {
748	>	const bfd_vma addr = base_addr + i * 4;
749	>	fprintf(stderr, "%s0x%8llx:  ", addr == pc ? " >" : "  ", addr);
750	>	print_insn_ppc(addr, &info);
751	>	fprintf(stderr, "\n");
752	>	}
753	>	}
754
755	<	sigsegv_return_t sigsegv_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
755	>	sigsegv_return_t sigsegv_handler(sigsegv_info_t *sip)
756		{
757		#if ENABLE_VOSF
758		// Handle screen fault
759	<	extern bool Screen_fault_handler(sigsegv_address_t, sigsegv_address_t);
760	<	if (Screen_fault_handler(fault_address, fault_instruction))
759	>	extern bool Screen_fault_handler(sigsegv_info_t *sip);
760	>	if (Screen_fault_handler(sip))
761		return SIGSEGV_RETURN_SUCCESS;
762		#endif
763
764	<	const uintptr addr = (uintptr)fault_address;
764	>	const uintptr addr = (uintptr)sigsegv_get_fault_address(sip);
765		#if HAVE_SIGSEGV_SKIP_INSTRUCTION
766		// Ignore writes to ROM
767		if ((addr - (uintptr)ROMBaseHost) < ROM_SIZE)
#	Line 823 | Line 772 | sigsegv_return_t sigsegv_handler(sigsegv
772		const uint32 pc = cpu->pc();
773
774		// Fault in Mac ROM or RAM?
775	<	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));
775	>	bool mac_fault = (pc >= ROMBase) && (pc < (ROMBase + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize)) || (pc >= DR_CACHE_BASE && pc < (DR_CACHE_BASE + DR_CACHE_SIZE));
776		if (mac_fault) {
777
778		// "VM settings" during MacOS 8 installation
779	<	if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
779	>	if (pc == ROMBase + 0x488160 && cpu->gpr(20) == 0xf8000000)
780		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
781
782		// MacOS 8.5 installation
783	<	else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
783	>	else if (pc == ROMBase + 0x488140 && cpu->gpr(16) == 0xf8000000)
784		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
785
786		// MacOS 8 serial drivers on startup
787	<	else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
787	>	else if (pc == ROMBase + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
788		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
789
790		// MacOS 8.1 serial drivers on startup
791	<	else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
791	>	else if (pc == ROMBase + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
792		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
793	<	else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
793	>	else if (pc == ROMBase + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
794		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
795
796		// MacOS 8.6 serial drivers on startup (with DR Cache and OldWorld ROM)
#	Line 862 | Line 811 | sigsegv_return_t sigsegv_handler(sigsegv
811		#error "FIXME: You don't have the capability to skip instruction within signal handlers"
812		#endif
813
814	<	printf("SIGSEGV\n");
815	<	printf("  pc %p\n", fault_instruction);
816	<	printf("  ea %p\n", fault_address);
814	>	fprintf(stderr, "SIGSEGV\n");
815	>	fprintf(stderr, "  pc %p\n", sigsegv_get_fault_instruction_address(sip));
816	>	fprintf(stderr, "  ea %p\n", sigsegv_get_fault_address(sip));
817		dump_registers();
818		ppc_cpu->dump_log();
819	+	dump_disassembly(pc, 8, 8);
820	+
821		enter_mon();
822		QuitEmulator();
823
824		return SIGSEGV_RETURN_FAILURE;
825		}
826
827	+	/*
828	+	*  Initialize CPU emulation
829	+	*/
830	+
831		void init_emul_ppc(void)
832		{
833		// Get pointer to KernelData in host address space
#	Line 880 | Line 835 | void init_emul_ppc(void)
835
836		// Initialize main CPU emulator
837		ppc_cpu = new sheepshaver_cpu();
838	<	ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
838	>	ppc_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROMBase + 0x30d000));
839		ppc_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
840		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
841
#	Line 928 | Line 883 | void exit_emul_ppc(void)
883		#endif
884
885		delete ppc_cpu;
886	+	ppc_cpu = NULL;
887		}
888
889		#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
#	Line 975 | Line 931 | void emul_ppc(uint32 entry)
931
932		void TriggerInterrupt(void)
933		{
934	+	idle_resume();
935		#if 0
936		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
937		#else
#	Line 984 | Line 941 | void TriggerInterrupt(void)
941		#endif
942		}
943
944	<	void sheepshaver_cpu::handle_interrupt(void)
944	>	void HandleInterrupt(powerpc_registers *r)
945		{
946		#ifdef USE_SDL_VIDEO
947		// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
#	Line 995 | Line 952 | void sheepshaver_cpu::handle_interrupt(v
952		if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
953		return;
954
955	<	// Current interrupt nest level
999	<	static int interrupt_depth = 0;
1000	<	++interrupt_depth;
955	>	// Update interrupt count
956		#if EMUL_TIME_STATS
957		interrupt_count++;
958		#endif
959
1005	–	// Disable MacOS stack sniffer
1006	–	WriteMacInt32(0x110, 0);
1007	–
960		// Interrupt action depends on current run mode
961		switch (ReadMacInt32(XLM_RUN_MODE)) {
962		case MODE_68K:
963		// 68k emulator active, trigger 68k interrupt level 1
964		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
965	<	set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
965	>	r->cr.set(r->cr.get() | tswap32(kernel_data->v[0x674 >> 2]));
966		break;
967
968		#if INTERRUPTS_IN_NATIVE_MODE
969		case MODE_NATIVE:
970		// 68k emulator inactive, in nanokernel?
971	<	if (gpr(1) != KernelDataAddr && interrupt_depth == 1) {
1020	<	interrupt_context ctx(this, "PowerPC mode");
971	>	if (r->gpr[1] != KernelDataAddr) {
972
973		// Prepare for 68k interrupt level 1
974		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
#	Line 1028 | Line 979 | void sheepshaver_cpu::handle_interrupt(v
979		// Execute nanokernel interrupt routine (this will activate the 68k emulator)
980		DisableInterrupt();
981		if (ROMType == ROMTYPE_NEWWORLD)
982	<	ppc_cpu->interrupt(ROM_BASE + 0x312b1c);
982	>	ppc_cpu->interrupt(ROMBase + 0x312b1c);
983		else
984	<	ppc_cpu->interrupt(ROM_BASE + 0x312a3c);
984	>	ppc_cpu->interrupt(ROMBase + 0x312a3c);
985		}
986		break;
987		#endif
#	Line 1039 | Line 990 | void sheepshaver_cpu::handle_interrupt(v
990		case MODE_EMUL_OP:
991		// 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
992		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1042	–	interrupt_context ctx(this, "68k mode");
993		#if EMUL_TIME_STATS
994		const clock_t interrupt_start = clock();
995		#endif
#	Line 1076 | Line 1026 | void sheepshaver_cpu::handle_interrupt(v
1026		break;
1027		#endif
1028		}
1079	–
1080	–	// We are done with this interrupt
1081	–	--interrupt_depth;
1029		}
1030
1084	–	static void get_resource(void);
1085	–	static void get_1_resource(void);
1086	–	static void get_ind_resource(void);
1087	–	static void get_1_ind_resource(void);
1088	–	static void r_get_resource(void);
1089	–
1031		// Execute NATIVE_OP routine
1032		void sheepshaver_cpu::execute_native_op(uint32 selector)
1033		{
#	Line 1108 | Line 1049 | void sheepshaver_cpu::execute_native_op(
1049		case NATIVE_VIDEO_DO_DRIVER_IO:
1050		gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1051		break;
1052	<	#ifdef WORDS_BIGENDIAN
1052	>	case NATIVE_ETHER_AO_GET_HWADDR:
1053	>	AO_get_ethernet_address(gpr(3));
1054	>	break;
1055	>	case NATIVE_ETHER_AO_ADD_MULTI:
1056	>	AO_enable_multicast(gpr(3));
1057	>	break;
1058	>	case NATIVE_ETHER_AO_DEL_MULTI:
1059	>	AO_disable_multicast(gpr(3));
1060	>	break;
1061	>	case NATIVE_ETHER_AO_SEND_PACKET:
1062	>	AO_transmit_packet(gpr(3));
1063	>	break;
1064		case NATIVE_ETHER_IRQ:
1065		EtherIRQ();
1066		break;
#	Line 1130 | Line 1082 | void sheepshaver_cpu::execute_native_op(
1082		case NATIVE_ETHER_RSRV:
1083		gpr(3) = ether_rsrv((queue_t *)gpr(3));
1084		break;
1085	<	#else
1134	<	case NATIVE_ETHER_INIT:
1135	<	// FIXME: needs more complicated thunks
1136	<	gpr(3) = false;
1137	<	break;
1138	<	#endif
1139	<	case NATIVE_SYNC_HOOK:
1085	>	case NATIVE_NQD_SYNC_HOOK:
1086		gpr(3) = NQD_sync_hook(gpr(3));
1087		break;
1088	<	case NATIVE_BITBLT_HOOK:
1088	>	case NATIVE_NQD_UNKNOWN_HOOK:
1089	>	gpr(3) = NQD_unknown_hook(gpr(3));
1090	>	break;
1091	>	case NATIVE_NQD_BITBLT_HOOK:
1092		gpr(3) = NQD_bitblt_hook(gpr(3));
1093		break;
1094	<	case NATIVE_BITBLT:
1094	>	case NATIVE_NQD_BITBLT:
1095		NQD_bitblt(gpr(3));
1096		break;
1097	<	case NATIVE_FILLRECT_HOOK:
1097	>	case NATIVE_NQD_FILLRECT_HOOK:
1098		gpr(3) = NQD_fillrect_hook(gpr(3));
1099		break;
1100	<	case NATIVE_INVRECT:
1100	>	case NATIVE_NQD_INVRECT:
1101		NQD_invrect(gpr(3));
1102		break;
1103	<	case NATIVE_FILLRECT:
1103	>	case NATIVE_NQD_FILLRECT:
1104		NQD_fillrect(gpr(3));
1105		break;
1106		case NATIVE_SERIAL_NOTHING:
#	Line 1175 | Line 1124 | void sheepshaver_cpu::execute_native_op(
1124		break;
1125		}
1126		case NATIVE_GET_RESOURCE:
1127	+	get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1128	+	break;
1129		case NATIVE_GET_1_RESOURCE:
1130	+	get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1131	+	break;
1132		case NATIVE_GET_IND_RESOURCE:
1133	+	get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1134	+	break;
1135		case NATIVE_GET_1_IND_RESOURCE:
1136	<	case NATIVE_R_GET_RESOURCE: {
1137	<	typedef void (*GetResourceCallback)(void);
1138	<	static const GetResourceCallback get_resource_callbacks[] = {
1139	<	::get_resource,
1185	<	::get_1_resource,
1186	<	::get_ind_resource,
1187	<	::get_1_ind_resource,
1188	<	::r_get_resource
1189	<	};
1190	<	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1136	>	get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1137	>	break;
1138	>	case NATIVE_R_GET_RESOURCE:
1139	>	get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1140		break;
1192	–	}
1141		case NATIVE_MAKE_EXECUTABLE:
1142		MakeExecutable(0, gpr(4), gpr(5));
1143		break;
1144		case NATIVE_CHECK_LOAD_INVOC:
1145		check_load_invoc(gpr(3), gpr(4), gpr(5));
1146		break;
1147	+	case NATIVE_NAMED_CHECK_LOAD_INVOC:
1148	+	named_check_load_invoc(gpr(3), gpr(4), gpr(5));
1149	+	break;
1150		default:
1151		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1152		QuitEmulator();
#	Line 1282 | Line 1233 | uint32 call_macos7(uint32 tvect, uint32
1233		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1234		return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1235		}
1285	–
1286	–	/*
1287	–	*  Resource Manager thunks
1288	–	*/
1289	–
1290	–	void get_resource(void)
1291	–	{
1292	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1293	–	}
1294	–
1295	–	void get_1_resource(void)
1296	–	{
1297	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1298	–	}
1299	–
1300	–	void get_ind_resource(void)
1301	–	{
1302	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1303	–	}
1304	–
1305	–	void get_1_ind_resource(void)
1306	–	{
1307	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1308	–	}
1309	–
1310	–	void r_get_resource(void)
1311	–	{
1312	–	ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1313	–	}

Diff Legend

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