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.13 by gbeauche, 2003-11-02T14:48:17Z vs.
Revision 1.34 by gbeauche, 2004-04-22T21:45:18Z

#	Line 1 | Line 1
1		/*
2		*  sheepshaver_glue.cpp - Glue Kheperix CPU to SheepShaver CPU engine interface
3		*
4	<	*  SheepShaver (C) 1997-2002 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2004 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 30 | Line 30
30		#include "sigsegv.h"
31		#include "cpu/ppc/ppc-cpu.hpp"
32		#include "cpu/ppc/ppc-operations.hpp"
33	+	#include "cpu/ppc/ppc-instructions.hpp"
34	+	#include "thunks.h"
35
36		// Used for NativeOp trampolines
37		#include "video.h"
38		#include "name_registry.h"
39		#include "serial.h"
40	+	#include "ether.h"
41
42		#include <stdio.h>
43	+	#include <stdlib.h>
44
45		#if ENABLE_MON
46		#include "mon.h"
#	Line 46 | Line 50
50		#define DEBUG 0
51		#include "debug.h"
52
53	+	// Emulation time statistics
54	+	#define EMUL_TIME_STATS 1
55	+
56	+	#if EMUL_TIME_STATS
57	+	static clock_t emul_start_time;
58	+	static uint32 interrupt_count = 0;
59	+	static clock_t interrupt_time = 0;
60	+	static uint32 exec68k_count = 0;
61	+	static clock_t exec68k_time = 0;
62	+	static uint32 native_exec_count = 0;
63	+	static clock_t native_exec_time = 0;
64	+	static uint32 macos_exec_count = 0;
65	+	static clock_t macos_exec_time = 0;
66	+	#endif
67	+
68		static void enter_mon(void)
69		{
70		// Start up mon in real-mode
#	Line 55 | Line 74 | static void enter_mon(void)
74		#endif
75		}
76
77	+	// From main_*.cpp
78	+	extern uintptr SignalStackBase();
79	+
80	+	// From rsrc_patches.cpp
81	+	extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
82	+
83	+	// PowerPC EmulOp to exit from emulation looop
84	+	const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
85	+
86		// Enable multicore (main/interrupts) cpu emulation?
87		#define MULTICORE_CPU (ASYNC_IRQ ? 1 : 0)
88
#	Line 73 | Line 101 | static void enter_mon(void)
101		// Pointer to Kernel Data
102		static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
103
104	+	// SIGSEGV handler
105	+	static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
106	+
107	+	// JIT Compiler enabled?
108	+	static inline bool enable_jit_p()
109	+	{
110	+	return PrefsFindBool("jit");
111	+	}
112	+
113
114		/**
115		*              PowerPC emulator glue with special 'sheep' opcodes
116		**/
117
118	+	enum {
119	+	PPC_I(SHEEP) = PPC_I(MAX),
120	+	PPC_I(SHEEP_MAX)
121	+	};
122	+
123		class sheepshaver_cpu
124		: public powerpc_cpu
125		{
#	Line 89 | Line 131 | public:
131		// Constructor
132		sheepshaver_cpu();
133
134	<	// Condition Register accessors
134	>	// CR & XER accessors
135		uint32 get_cr() const           { return cr().get(); }
136		void set_cr(uint32 v)           { cr().set(v); }
137	+	uint32 get_xer() const          { return xer().get(); }
138	+	void set_xer(uint32 v)          { xer().set(v); }
139
140	<	// Execution loop
141	<	void execute(uint32 entry, bool enable_cache = false);
140	>	// Execute EMUL_OP routine
141	>	void execute_emul_op(uint32 emul_op);
142
143		// Execute 68k routine
144		void execute_68k(uint32 entry, M68kRegisters *r);
#	Line 105 | Line 149 | public:
149		// Execute MacOS/PPC code
150		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
151
152	+	// Compile one instruction
153	+	virtual bool compile1(codegen_context_t & cg_context);
154	+
155		// Resource manager thunk
156		void get_resource(uint32 old_get_resource);
157
#	Line 112 | Line 159 | public:
159		void interrupt(uint32 entry);
160		void handle_interrupt();
161
162	<	// Lazy memory allocator (one item at a time)
163	<	void *operator new(size_t size)
117	<	{ return allocator_helper< sheepshaver_cpu, lazy_allocator >::allocate(); }
118	<	void operator delete(void *p)
119	<	{ allocator_helper< sheepshaver_cpu, lazy_allocator >::deallocate(p); }
120	<	// FIXME: really make surre array allocation fail at link time?
121	<	void *operator new[](size_t);
122	<	void operator delete[](void *p);
162	>	// Make sure the SIGSEGV handler can access CPU registers
163	>	friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
164		};
165
166	<	lazy_allocator< sheepshaver_cpu > allocator_helper< sheepshaver_cpu, lazy_allocator >::allocator;
166	>	// Memory allocator returning areas aligned on 16-byte boundaries
167	>	void *operator new(size_t size)
168	>	{
169	>	void *p;
170	>
171	>	#if defined(HAVE_POSIX_MEMALIGN)
172	>	if (posix_memalign(&p, 16, size) != 0)
173	>	throw std::bad_alloc();
174	>	#elif defined(HAVE_MEMALIGN)
175	>	p = memalign(16, size);
176	>	#elif defined(HAVE_VALLOC)
177	>	p = valloc(size); // page-aligned!
178	>	#else
179	>	/* XXX: handle padding ourselves */
180	>	p = malloc(size);
181	>	#endif
182	>
183	>	return p;
184	>	}
185	>
186	>	void operator delete(void *p)
187	>	{
188	>	#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
189	>	#if defined(__GLIBC__)
190	>	// this is known to work only with GNU libc
191	>	free(p);
192	>	#endif
193	>	#else
194	>	free(p);
195	>	#endif
196	>	}
197
198		sheepshaver_cpu::sheepshaver_cpu()
199	<	: powerpc_cpu()
199	>	: powerpc_cpu(enable_jit_p())
200		{
201		init_decoder();
202		}
203
204		void sheepshaver_cpu::init_decoder()
205		{
135	–	#ifndef PPC_NO_STATIC_II_INDEX_TABLE
136	–	static bool initialized = false;
137	–	if (initialized)
138	–	return;
139	–	initialized = true;
140	–	#endif
141	–
206		static const instr_info_t sheep_ii_table[] = {
207		{ "sheep",
208		(execute_pmf)&sheepshaver_cpu::execute_sheep,
209		NULL,
210	+	PPC_I(SHEEP),
211		D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
212		}
213		};
#	Line 170 | Line 235 | typedef bit_field< 20, 20 > FN_field;
235		typedef bit_field< 21, 25 > NATIVE_OP_field;
236		typedef bit_field< 26, 31 > EMUL_OP_field;
237
238	+	// Execute EMUL_OP routine
239	+	void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
240	+	{
241	+	M68kRegisters r68;
242	+	WriteMacInt32(XLM_68K_R25, gpr(25));
243	+	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
244	+	for (int i = 0; i < 8; i++)
245	+	r68.d[i] = gpr(8 + i);
246	+	for (int i = 0; i < 7; i++)
247	+	r68.a[i] = gpr(16 + i);
248	+	r68.a[7] = gpr(1);
249	+	uint32 saved_cr = get_cr() & CR_field<2>::mask();
250	+	uint32 saved_xer = get_xer();
251	+	EmulOp(&r68, gpr(24), emul_op);
252	+	set_cr(saved_cr);
253	+	set_xer(saved_xer);
254	+	for (int i = 0; i < 8; i++)
255	+	gpr(8 + i) = r68.d[i];
256	+	for (int i = 0; i < 7; i++)
257	+	gpr(16 + i) = r68.a[i];
258	+	gpr(1) = r68.a[7];
259	+	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
260	+	}
261	+
262		// Execute SheepShaver instruction
263		void sheepshaver_cpu::execute_sheep(uint32 opcode)
264		{
#	Line 193 | Line 282 | void sheepshaver_cpu::execute_sheep(uint
282		pc() += 4;
283		break;
284
285	<	default: {      // EMUL_OP
286	<	M68kRegisters r68;
198	<	WriteMacInt32(XLM_68K_R25, gpr(25));
199	<	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
200	<	for (int i = 0; i < 8; i++)
201	<	r68.d[i] = gpr(8 + i);
202	<	for (int i = 0; i < 7; i++)
203	<	r68.a[i] = gpr(16 + i);
204	<	r68.a[7] = gpr(1);
205	<	EmulOp(&r68, gpr(24), EMUL_OP_field::extract(opcode) - 3);
206	<	for (int i = 0; i < 8; i++)
207	<	gpr(8 + i) = r68.d[i];
208	<	for (int i = 0; i < 7; i++)
209	<	gpr(16 + i) = r68.a[i];
210	<	gpr(1) = r68.a[7];
211	<	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
285	>	default:        // EMUL_OP
286	>	execute_emul_op(EMUL_OP_field::extract(opcode) - 3);
287		pc() += 4;
288		break;
289		}
215	–	}
290		}
291
292	<	// Execution loop
293	<	void sheepshaver_cpu::execute(uint32 entry, bool enable_cache)
292	>	// Compile one instruction
293	>	bool sheepshaver_cpu::compile1(codegen_context_t & cg_context)
294		{
295	<	powerpc_cpu::execute(entry, enable_cache);
295	>	#if PPC_ENABLE_JIT
296	>	const instr_info_t *ii = cg_context.instr_info;
297	>	if (ii->mnemo != PPC_I(SHEEP))
298	>	return false;
299	>
300	>	bool compiled = false;
301	>	powerpc_dyngen & dg = cg_context.codegen;
302	>	uint32 opcode = cg_context.opcode;
303	>
304	>	switch (opcode & 0x3f) {
305	>	case 0:         // EMUL_RETURN
306	>	dg.gen_invoke(QuitEmulator);
307	>	compiled = true;
308	>	break;
309	>
310	>	case 1:         // EXEC_RETURN
311	>	dg.gen_spcflags_set(SPCFLAG_CPU_EXEC_RETURN);
312	>	compiled = true;
313	>	break;
314	>
315	>	case 2: {       // EXEC_NATIVE
316	>	uint32 selector = NATIVE_OP_field::extract(opcode);
317	>	switch (selector) {
318	>	case NATIVE_PATCH_NAME_REGISTRY:
319	>	dg.gen_invoke(DoPatchNameRegistry);
320	>	compiled = true;
321	>	break;
322	>	case NATIVE_VIDEO_INSTALL_ACCEL:
323	>	dg.gen_invoke(VideoInstallAccel);
324	>	compiled = true;
325	>	break;
326	>	case NATIVE_VIDEO_VBL:
327	>	dg.gen_invoke(VideoVBL);
328	>	compiled = true;
329	>	break;
330	>	case NATIVE_GET_RESOURCE:
331	>	case NATIVE_GET_1_RESOURCE:
332	>	case NATIVE_GET_IND_RESOURCE:
333	>	case NATIVE_GET_1_IND_RESOURCE:
334	>	case NATIVE_R_GET_RESOURCE: {
335	>	static const uint32 get_resource_ptr[] = {
336	>	XLM_GET_RESOURCE,
337	>	XLM_GET_1_RESOURCE,
338	>	XLM_GET_IND_RESOURCE,
339	>	XLM_GET_1_IND_RESOURCE,
340	>	XLM_R_GET_RESOURCE
341	>	};
342	>	uint32 old_get_resource = ReadMacInt32(get_resource_ptr[selector - NATIVE_GET_RESOURCE]);
343	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
344	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::get_resource).ptr();
345	>	dg.gen_invoke_CPU_im(func, old_get_resource);
346	>	compiled = true;
347	>	break;
348	>	}
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;
357	>	case NATIVE_CHECK_LOAD_INVOC:
358	>	dg.gen_load_T0_GPR(3);
359	>	dg.gen_load_T1_GPR(4);
360	>	dg.gen_se_16_32_T1();
361	>	dg.gen_load_T2_GPR(5);
362	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
363	>	compiled = true;
364	>	break;
365	>	}
366	>	if (FN_field::test(opcode)) {
367	>	if (compiled) {
368	>	dg.gen_load_A0_LR();
369	>	dg.gen_set_PC_A0();
370	>	}
371	>	cg_context.done_compile = true;
372	>	}
373	>	else
374	>	cg_context.done_compile = false;
375	>	break;
376	>	}
377	>
378	>	default: {      // EMUL_OP
379	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
380	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
381	>	dg.gen_invoke_CPU_im(func, EMUL_OP_field::extract(opcode) - 3);
382	>	cg_context.done_compile = false;
383	>	compiled = true;
384	>	break;
385	>	}
386	>	}
387	>	return compiled;
388	>	#endif
389	>	return false;
390		}
391
392		// Handle MacOS interrupt
393		void sheepshaver_cpu::interrupt(uint32 entry)
394		{
395	+	#if EMUL_TIME_STATS
396	+	interrupt_count++;
397	+	const clock_t interrupt_start = clock();
398	+	#endif
399	+
400		#if !MULTICORE_CPU
401		// Save program counters and branch registers
402		uint32 saved_pc = pc();
#	Line 233 | Line 406 | void sheepshaver_cpu::interrupt(uint32 e
406		#endif
407
408		// Initialize stack pointer to SheepShaver alternate stack base
409	<	gpr(1) = SheepStack1Base - 64;
409	>	gpr(1) = SignalStackBase() - 64;
410
411		// Build trampoline to return from interrupt
412	<	uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
412	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
413
414		// Prepare registers for nanokernel interrupt routine
415		kernel_data->v[0x004 >> 2] = htonl(gpr(1));
#	Line 255 | Line 428 | void sheepshaver_cpu::interrupt(uint32 e
428		gpr(1)  = KernelDataAddr;
429		gpr(7)  = ntohl(kernel_data->v[0x660 >> 2]);
430		gpr(8)  = 0;
431	<	gpr(10) = (uint32)trampoline;
432	<	gpr(12) = (uint32)trampoline;
431	>	gpr(10) = trampoline.addr();
432	>	gpr(12) = trampoline.addr();
433		gpr(13) = get_cr();
434
435		// rlwimi. r7,r7,8,0,0
#	Line 277 | Line 450 | void sheepshaver_cpu::interrupt(uint32 e
450		ctr()= saved_ctr;
451		gpr(1) = saved_sp;
452		#endif
453	+
454	+	#if EMUL_TIME_STATS
455	+	interrupt_time += (clock() - interrupt_start);
456	+	#endif
457		}
458
459		// Execute 68k routine
460		void sheepshaver_cpu::execute_68k(uint32 entry, M68kRegisters *r)
461		{
462	+	#if EMUL_TIME_STATS
463	+	exec68k_count++;
464	+	const clock_t exec68k_start = clock();
465	+	#endif
466	+
467		#if SAFE_EXEC_68K
468		if (ReadMacInt32(XLM_RUN_MODE) != MODE_EMUL_OP)
469		printf("FATAL: Execute68k() not called from EMUL_OP mode\n");
#	Line 364 | Line 546 | void sheepshaver_cpu::execute_68k(uint32
546		lr() = saved_lr;
547		ctr()= saved_ctr;
548		set_cr(saved_cr);
549	+
550	+	#if EMUL_TIME_STATS
551	+	exec68k_time += (clock() - exec68k_start);
552	+	#endif
553		}
554
555		// Call MacOS PPC code
556		uint32 sheepshaver_cpu::execute_macos_code(uint32 tvect, int nargs, uint32 const *args)
557		{
558	+	#if EMUL_TIME_STATS
559	+	macos_exec_count++;
560	+	const clock_t macos_exec_start = clock();
561	+	#endif
562	+
563		// Save program counters and branch registers
564		uint32 saved_pc = pc();
565		uint32 saved_lr = lr();
566		uint32 saved_ctr= ctr();
567
568		// Build trampoline with EXEC_RETURN
569	<	uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
570	<	lr() = (uint32)trampoline;
569	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
570	>	lr() = trampoline.addr();
571
572		gpr(1) -= 64;                                                           // Create stack frame
573		uint32 proc = ReadMacInt32(tvect);                      // Get routine address
#	Line 407 | Line 598 | uint32 sheepshaver_cpu::execute_macos_co
598		lr() = saved_lr;
599		ctr()= saved_ctr;
600
601	+	#if EMUL_TIME_STATS
602	+	macos_exec_time += (clock() - macos_exec_start);
603	+	#endif
604	+
605		return retval;
606		}
607
#	Line 416 | Line 611 | inline void sheepshaver_cpu::execute_ppc
611		// Save branch registers
612		uint32 saved_lr = lr();
613
614	<	const uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
615	<	lr() = (uint32)trampoline;
614	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
615	>	WriteMacInt32(trampoline.addr(), POWERPC_EXEC_RETURN);
616	>	lr() = trampoline.addr();
617
618		execute(entry);
619
#	Line 426 | Line 622 | inline void sheepshaver_cpu::execute_ppc
622		}
623
624		// Resource Manager thunk
429	–	extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
430	–
625		inline void sheepshaver_cpu::get_resource(uint32 old_get_resource)
626		{
627		uint32 type = gpr(3);
#	Line 511 | Line 705 | static sigsegv_return_t sigsegv_handler(
705		if ((addr - ROM_BASE) < ROM_SIZE)
706		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
707
708	<	// Ignore all other faults, if requested
709	<	if (PrefsFindBool("ignoresegv"))
710	<	return SIGSEGV_RETURN_FAILURE;
708	>	// Get program counter of target CPU
709	>	sheepshaver_cpu * const cpu = current_cpu;
710	>	const uint32 pc = cpu->pc();
711	>
712	>	// Fault in Mac ROM or RAM?
713	>	bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize));
714	>	if (mac_fault) {
715	>
716	>	// "VM settings" during MacOS 8 installation
717	>	if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
718	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
719	>
720	>	// MacOS 8.5 installation
721	>	else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
722	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
723	>
724	>	// MacOS 8 serial drivers on startup
725	>	else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
726	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
727	>
728	>	// MacOS 8.1 serial drivers on startup
729	>	else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
730	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
731	>	else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
732	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
733	>
734	>	// Ignore writes to the zero page
735	>	else if ((uint32)(addr - SheepMem::ZeroPage()) < (uint32)SheepMem::PageSize())
736	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
737	>
738	>	// Ignore all other faults, if requested
739	>	if (PrefsFindBool("ignoresegv"))
740	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
741	>	}
742		#else
743		#error "FIXME: You don't have the capability to skip instruction within signal handlers"
744		#endif
#	Line 535 | Line 760 | void init_emul_ppc(void)
760		// Initialize main CPU emulator
761		main_cpu = new sheepshaver_cpu();
762		main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
763	+	main_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
764		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
765
766		#if MULTICORE_CPU
#	Line 550 | Line 776 | void init_emul_ppc(void)
776		mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
777		mon_add_command("log", dump_log, "log                      Dump PowerPC emulation log\n");
778		#endif
779	+
780	+	#if EMUL_TIME_STATS
781	+	emul_start_time = clock();
782	+	#endif
783	+	}
784	+
785	+	/*
786	+	*  Deinitialize emulation
787	+	*/
788	+
789	+	void exit_emul_ppc(void)
790	+	{
791	+	#if EMUL_TIME_STATS
792	+	clock_t emul_end_time = clock();
793	+
794	+	printf("### Statistics for SheepShaver emulation parts\n");
795	+	const clock_t emul_time = emul_end_time - emul_start_time;
796	+	printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
797	+	printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
798	+	(double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
799	+
800	+	#define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
801	+	printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
802	+	printf("Total " LABEL " time  : %.1f sec (%.1f%%)\n",                   \
803	+	double(VAR_PREFIX##_time) / double(CLOCKS_PER_SEC),          \
804	+	100.0 * double(VAR_PREFIX##_time) / double(emul_time));      \
805	+	} while (0)
806	+
807	+	PRINT_STATS("Execute68k[Trap] execution", exec68k);
808	+	PRINT_STATS("NativeOp execution", native_exec);
809	+	PRINT_STATS("MacOS routine execution", macos_exec);
810	+
811	+	#undef PRINT_STATS
812	+	printf("\n");
813	+	#endif
814	+
815	+	delete main_cpu;
816	+	#if MULTICORE_CPU
817	+	delete interrupt_cpu;
818	+	#endif
819		}
820
821		/*
#	Line 559 | Line 825 | void init_emul_ppc(void)
825		void emul_ppc(uint32 entry)
826		{
827		current_cpu = main_cpu;
828	<	#if DEBUG
828	>	#if 0
829		current_cpu->start_log();
830		#endif
831		// start emulation loop and enable code translation or caching
832	<	current_cpu->execute(entry, true);
832	>	current_cpu->execute(entry);
833		}
834
835		/*
#	Line 591 | Line 857 | void TriggerInterrupt(void)
857		void sheepshaver_cpu::handle_interrupt(void)
858		{
859		// Do nothing if interrupts are disabled
860	<	if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
860	>	if (*(int32 *)XLM_IRQ_NEST > 0)
861		return;
862
863		// Do nothing if there is no interrupt pending
#	Line 658 | Line 924 | void sheepshaver_cpu::handle_interrupt(v
924		if (InterruptFlags & INTFLAG_VIA) {
925		ClearInterruptFlag(INTFLAG_VIA);
926		ADBInterrupt();
927	<	ExecutePPC(VideoVBL);
927	>	ExecuteNative(NATIVE_VIDEO_VBL);
928		}
929		}
930		#endif
#	Line 668 | Line 934 | void sheepshaver_cpu::handle_interrupt(v
934		}
935		}
936
671	–	/*
672	–	*  Execute NATIVE_OP opcode (called by PowerPC emulator)
673	–	*/
674	–
675	–	#define POWERPC_NATIVE_OP_INIT(LR, OP) \
676	–	tswap32(POWERPC_EMUL_OP | ((LR) << 11) | (((uint32)OP) << 6) | 2)
677	–
678	–	// FIXME: Make sure 32-bit relocations are used
679	–	const uint32 NativeOpTable[NATIVE_OP_MAX] = {
680	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_PATCH_NAME_REGISTRY),
681	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_INSTALL_ACCEL),
682	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_VBL),
683	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_DO_DRIVER_IO),
684	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_IRQ),
685	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_INIT),
686	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_TERM),
687	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_OPEN),
688	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_CLOSE),
689	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_WPUT),
690	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_RSRV),
691	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_NOTHING),
692	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_OPEN),
693	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_IN),
694	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_OUT),
695	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CONTROL),
696	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_STATUS),
697	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CLOSE),
698	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_RESOURCE),
699	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_RESOURCE),
700	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_IND_RESOURCE),
701	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_IND_RESOURCE),
702	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_R_GET_RESOURCE),
703	–	POWERPC_NATIVE_OP_INIT(0, NATIVE_DISABLE_INTERRUPT),
704	–	POWERPC_NATIVE_OP_INIT(0, NATIVE_ENABLE_INTERRUPT),
705	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_MAKE_EXECUTABLE),
706	–	};
707	–
937		static void get_resource(void);
938		static void get_1_resource(void);
939		static void get_ind_resource(void);
#	Line 715 | Line 944 | static void r_get_resource(void);
944
945		static void NativeOp(int selector)
946		{
947	+	#if EMUL_TIME_STATS
948	+	native_exec_count++;
949	+	const clock_t native_exec_start = clock();
950	+	#endif
951	+
952		switch (selector) {
953		case NATIVE_PATCH_NAME_REGISTRY:
954		DoPatchNameRegistry();
#	Line 729 | Line 963 | static void NativeOp(int selector)
963		GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
964		(void *)GPR(5), GPR(6), GPR(7));
965		break;
966	<	case NATIVE_GET_RESOURCE:
967	<	get_resource();
966	>	#ifdef WORDS_BIGENDIAN
967	>	case NATIVE_ETHER_IRQ:
968	>	EtherIRQ();
969		break;
970	<	case NATIVE_GET_1_RESOURCE:
971	<	get_1_resource();
970	>	case NATIVE_ETHER_INIT:
971	>	GPR(3) = InitStreamModule((void *)GPR(3));
972		break;
973	<	case NATIVE_GET_IND_RESOURCE:
974	<	get_ind_resource();
973	>	case NATIVE_ETHER_TERM:
974	>	TerminateStreamModule();
975		break;
976	<	case NATIVE_GET_1_IND_RESOURCE:
977	<	get_1_ind_resource();
976	>	case NATIVE_ETHER_OPEN:
977	>	GPR(3) = ether_open((queue_t *)GPR(3), (void *)GPR(4), GPR(5), GPR(6), (void*)GPR(7));
978	>	break;
979	>	case NATIVE_ETHER_CLOSE:
980	>	GPR(3) = ether_close((queue_t *)GPR(3), GPR(4), (void *)GPR(5));
981	>	break;
982	>	case NATIVE_ETHER_WPUT:
983	>	GPR(3) = ether_wput((queue_t *)GPR(3), (mblk_t *)GPR(4));
984	>	break;
985	>	case NATIVE_ETHER_RSRV:
986	>	GPR(3) = ether_rsrv((queue_t *)GPR(3));
987	>	break;
988	>	#else
989	>	case NATIVE_ETHER_INIT:
990	>	// FIXME: needs more complicated thunks
991	>	GPR(3) = false;
992	>	break;
993	>	#endif
994	>	case NATIVE_SYNC_HOOK:
995	>	GPR(3) = NQD_sync_hook(GPR(3));
996	>	break;
997	>	case NATIVE_BITBLT_HOOK:
998	>	GPR(3) = NQD_bitblt_hook(GPR(3));
999	>	break;
1000	>	case NATIVE_BITBLT:
1001	>	NQD_bitblt(GPR(3));
1002		break;
1003	<	case NATIVE_R_GET_RESOURCE:
1004	<	r_get_resource();
1003	>	case NATIVE_FILLRECT_HOOK:
1004	>	GPR(3) = NQD_fillrect_hook(GPR(3));
1005	>	break;
1006	>	case NATIVE_INVRECT:
1007	>	NQD_invrect(GPR(3));
1008	>	break;
1009	>	case NATIVE_FILLRECT:
1010	>	NQD_fillrect(GPR(3));
1011		break;
1012		case NATIVE_SERIAL_NOTHING:
1013		case NATIVE_SERIAL_OPEN:
#	Line 764 | Line 1029 | static void NativeOp(int selector)
1029		GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
1030		break;
1031		}
1032	+	case NATIVE_GET_RESOURCE:
1033	+	case NATIVE_GET_1_RESOURCE:
1034	+	case NATIVE_GET_IND_RESOURCE:
1035	+	case NATIVE_GET_1_IND_RESOURCE:
1036	+	case NATIVE_R_GET_RESOURCE: {
1037	+	typedef void (*GetResourceCallback)(void);
1038	+	static const GetResourceCallback get_resource_callbacks[] = {
1039	+	get_resource,
1040	+	get_1_resource,
1041	+	get_ind_resource,
1042	+	get_1_ind_resource,
1043	+	r_get_resource
1044	+	};
1045	+	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1046	+	break;
1047	+	}
1048		case NATIVE_DISABLE_INTERRUPT:
1049		DisableInterrupt();
1050		break;
#	Line 773 | Line 1054 | static void NativeOp(int selector)
1054		case NATIVE_MAKE_EXECUTABLE:
1055		MakeExecutable(0, (void *)GPR(4), GPR(5));
1056		break;
1057	+	case NATIVE_CHECK_LOAD_INVOC:
1058	+	check_load_invoc(GPR(3), GPR(4), GPR(5));
1059	+	break;
1060		default:
1061		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1062		QuitEmulator();
1063		break;
1064		}
781	–	}
782	–
783	–	/*
784	–	*  Execute native subroutine (LR must contain return address)
785	–	*/
1065
1066	<	void ExecuteNative(int selector)
1067	<	{
1068	<	uint32 tvect[2];
790	<	tvect[0] = tswap32(POWERPC_NATIVE_OP_FUNC(selector));
791	<	tvect[1] = 0; // Fake TVECT
792	<	RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
793	<	M68kRegisters r;
794	<	Execute68k((uint32)&desc, &r);
1066	>	#if EMUL_TIME_STATS
1067	>	native_exec_time += (clock() - native_exec_start);
1068	>	#endif
1069		}
1070
1071		/*
#	Line 812 | Line 1086 | void Execute68k(uint32 pc, M68kRegisters
1086
1087		void Execute68kTrap(uint16 trap, M68kRegisters *r)
1088		{
1089	<	uint16 proc[2];
1090	<	proc[0] = htons(trap);
1091	<	proc[1] = htons(M68K_RTS);
1092	<	Execute68k((uint32)proc, r);
1089	>	SheepVar proc_var(4);
1090	>	uint32 proc = proc_var.addr();
1091	>	WriteMacInt16(proc, trap);
1092	>	WriteMacInt16(proc + 2, M68K_RTS);
1093	>	Execute68k(proc, r);
1094		}
1095
1096		/*

Diff Legend

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