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.8 by gbeauche, 2003-10-19T21:37:43Z vs.
Revision 1.26 by gbeauche, 2004-01-24T11:28:06Z

#	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 28 | Line 28
28		#include "macos_util.h"
29		#include "block-alloc.hpp"
30		#include "sigsegv.h"
31	–	#include "spcflags.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
#	Line 44 | Line 46
46		#include "mon_disass.h"
47		#endif
48
49	<	#define DEBUG 1
49	>	#define DEBUG 0
50		#include "debug.h"
51
52	+	// Emulation time statistics
53	+	#define EMUL_TIME_STATS 1
54	+
55	+	#if EMUL_TIME_STATS
56	+	static clock_t emul_start_time;
57	+	static uint32 interrupt_count = 0;
58	+	static clock_t interrupt_time = 0;
59	+	static uint32 exec68k_count = 0;
60	+	static clock_t exec68k_time = 0;
61	+	static uint32 native_exec_count = 0;
62	+	static clock_t native_exec_time = 0;
63	+	static uint32 macos_exec_count = 0;
64	+	static clock_t macos_exec_time = 0;
65	+	#endif
66	+
67		static void enter_mon(void)
68		{
69		// Start up mon in real-mode
#	Line 56 | Line 73 | static void enter_mon(void)
73		#endif
74		}
75
76	+	// From main_*.cpp
77	+	extern uintptr SignalStackBase();
78	+
79	+	// From rsrc_patches.cpp
80	+	extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
81	+
82	+	// PowerPC EmulOp to exit from emulation looop
83	+	const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
84	+
85		// Enable multicore (main/interrupts) cpu emulation?
86	<	#define MULTICORE_CPU 0
86	>	#define MULTICORE_CPU (ASYNC_IRQ ? 1 : 0)
87
88		// Enable Execute68k() safety checks?
89		#define SAFE_EXEC_68K 1
#	Line 74 | Line 100 | static void enter_mon(void)
100		// Pointer to Kernel Data
101		static KernelData * const kernel_data = (KernelData *)KERNEL_DATA_BASE;
102
103	+	// SIGSEGV handler
104	+	static sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
105	+
106	+	// JIT Compiler enabled?
107	+	static inline bool enable_jit_p()
108	+	{
109	+	return PrefsFindBool("jit");
110	+	}
111	+
112
113		/**
114		*              PowerPC emulator glue with special 'sheep' opcodes
115		**/
116
117	<	struct sheepshaver_exec_return { };
117	>	enum {
118	>	PPC_I(SHEEP) = PPC_I(MAX),
119	>	PPC_I(SHEEP_MAX)
120	>	};
121
122		class sheepshaver_cpu
123		: public powerpc_cpu
#	Line 89 | Line 127 | class sheepshaver_cpu
127
128		public:
129
130	<	sheepshaver_cpu()
131	<	: powerpc_cpu()
94	<	{ init_decoder(); }
130	>	// Constructor
131	>	sheepshaver_cpu();
132
133	<	// Condition Register accessors
133	>	// CR & XER accessors
134		uint32 get_cr() const           { return cr().get(); }
135		void set_cr(uint32 v)           { cr().set(v); }
136	+	uint32 get_xer() const          { return xer().get(); }
137	+	void set_xer(uint32 v)          { xer().set(v); }
138
139	<	// Execution loop
140	<	void execute(uint32 pc);
139	>	// Execute EMUL_OP routine
140	>	void execute_emul_op(uint32 emul_op);
141
142		// Execute 68k routine
143		void execute_68k(uint32 entry, M68kRegisters *r);
#	Line 109 | Line 148 | public:
148		// Execute MacOS/PPC code
149		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
150
151	+	// Compile one instruction
152	+	virtual bool compile1(codegen_context_t & cg_context);
153	+
154		// Resource manager thunk
155		void get_resource(uint32 old_get_resource);
156
157		// Handle MacOS interrupt
158		void interrupt(uint32 entry);
159	<
118	<	// spcflags for interrupts handling
119	<	static uint32 spcflags;
159	>	void handle_interrupt();
160
161		// Lazy memory allocator (one item at a time)
162		void *operator new(size_t size)
#	Line 126 | Line 166 | public:
166		// FIXME: really make surre array allocation fail at link time?
167		void *operator new[](size_t);
168		void operator delete[](void *p);
169	+
170	+	// Make sure the SIGSEGV handler can access CPU registers
171	+	friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
172		};
173
131	–	uint32 sheepshaver_cpu::spcflags = 0;
174		lazy_allocator< sheepshaver_cpu > allocator_helper< sheepshaver_cpu, lazy_allocator >::allocator;
175
176	+	sheepshaver_cpu::sheepshaver_cpu()
177	+	: powerpc_cpu(enable_jit_p())
178	+	{
179	+	init_decoder();
180	+	}
181	+
182		void sheepshaver_cpu::init_decoder()
183		{
184		#ifndef PPC_NO_STATIC_II_INDEX_TABLE
#	Line 142 | Line 190 | void sheepshaver_cpu::init_decoder()
190
191		static const instr_info_t sheep_ii_table[] = {
192		{ "sheep",
193	<	(execute_fn)&sheepshaver_cpu::execute_sheep,
193	>	(execute_pmf)&sheepshaver_cpu::execute_sheep,
194		NULL,
195	+	PPC_I(SHEEP),
196		D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
197		}
198		};
#	Line 171 | Line 220 | typedef bit_field< 20, 20 > FN_field;
220		typedef bit_field< 21, 25 > NATIVE_OP_field;
221		typedef bit_field< 26, 31 > EMUL_OP_field;
222
223	+	// Execute EMUL_OP routine
224	+	void sheepshaver_cpu::execute_emul_op(uint32 emul_op)
225	+	{
226	+	M68kRegisters r68;
227	+	WriteMacInt32(XLM_68K_R25, gpr(25));
228	+	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
229	+	for (int i = 0; i < 8; i++)
230	+	r68.d[i] = gpr(8 + i);
231	+	for (int i = 0; i < 7; i++)
232	+	r68.a[i] = gpr(16 + i);
233	+	r68.a[7] = gpr(1);
234	+	uint32 saved_cr = get_cr() & CR_field<2>::mask();
235	+	uint32 saved_xer = get_xer();
236	+	EmulOp(&r68, gpr(24), emul_op);
237	+	set_cr(saved_cr);
238	+	set_xer(saved_xer);
239	+	for (int i = 0; i < 8; i++)
240	+	gpr(8 + i) = r68.d[i];
241	+	for (int i = 0; i < 7; i++)
242	+	gpr(16 + i) = r68.a[i];
243	+	gpr(1) = r68.a[7];
244	+	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
245	+	}
246	+
247		// Execute SheepShaver instruction
248		void sheepshaver_cpu::execute_sheep(uint32 opcode)
249		{
#	Line 183 | Line 256 | void sheepshaver_cpu::execute_sheep(uint
256		break;
257
258		case 1:         // EXEC_RETURN
259	<	throw sheepshaver_exec_return();
259	>	spcflags().set(SPCFLAG_CPU_EXEC_RETURN);
260		break;
261
262		case 2:         // EXEC_NATIVE
#	Line 194 | Line 267 | void sheepshaver_cpu::execute_sheep(uint
267		pc() += 4;
268		break;
269
270	<	default: {      // EMUL_OP
271	<	M68kRegisters r68;
199	<	WriteMacInt32(XLM_68K_R25, gpr(25));
200	<	WriteMacInt32(XLM_RUN_MODE, MODE_EMUL_OP);
201	<	for (int i = 0; i < 8; i++)
202	<	r68.d[i] = gpr(8 + i);
203	<	for (int i = 0; i < 7; i++)
204	<	r68.a[i] = gpr(16 + i);
205	<	r68.a[7] = gpr(1);
206	<	EmulOp(&r68, gpr(24), EMUL_OP_field::extract(opcode) - 3);
207	<	for (int i = 0; i < 8; i++)
208	<	gpr(8 + i) = r68.d[i];
209	<	for (int i = 0; i < 7; i++)
210	<	gpr(16 + i) = r68.a[i];
211	<	gpr(1) = r68.a[7];
212	<	WriteMacInt32(XLM_RUN_MODE, MODE_68K);
270	>	default:        // EMUL_OP
271	>	execute_emul_op(EMUL_OP_field::extract(opcode) - 3);
272		pc() += 4;
273		break;
274		}
216	–	}
275		}
276
277	<	// Checks for pending interrupts
278	<	struct execute_nothing {
279	<	static inline void execute(powerpc_cpu *) { }
280	<	};
277	>	// Compile one instruction
278	>	bool sheepshaver_cpu::compile1(codegen_context_t & cg_context)
279	>	{
280	>	#if PPC_ENABLE_JIT
281	>	const instr_info_t *ii = cg_context.instr_info;
282	>	if (ii->mnemo != PPC_I(SHEEP))
283	>	return false;
284	>
285	>	bool compiled = false;
286	>	powerpc_dyngen & dg = cg_context.codegen;
287	>	uint32 opcode = cg_context.opcode;
288
289	<	struct execute_spcflags_check {
290	<	static inline void execute(powerpc_cpu *cpu) {
291	<	#if !ASYNC_IRQ
292	<	if (SPCFLAGS_TEST(SPCFLAG_ALL_BUT_EXEC_RETURN)) {
293	<	if (SPCFLAGS_TEST( SPCFLAG_ENTER_MON )) {
294	<	SPCFLAGS_CLEAR( SPCFLAG_ENTER_MON );
295	<	enter_mon();
296	<	}
297	<	if (SPCFLAGS_TEST( SPCFLAG_DOINT )) {
298	<	SPCFLAGS_CLEAR( SPCFLAG_DOINT );
299	<	HandleInterrupt();
300	<	}
301	<	if (SPCFLAGS_TEST( SPCFLAG_INT )) {
302	<	SPCFLAGS_CLEAR( SPCFLAG_INT );
303	<	SPCFLAGS_SET( SPCFLAG_DOINT );
289	>	switch (opcode & 0x3f) {
290	>	case 0:         // EMUL_RETURN
291	>	dg.gen_invoke(QuitEmulator);
292	>	compiled = true;
293	>	break;
294	>
295	>	case 1:         // EXEC_RETURN
296	>	dg.gen_spcflags_set(SPCFLAG_CPU_EXEC_RETURN);
297	>	compiled = true;
298	>	break;
299	>
300	>	case 2: {       // EXEC_NATIVE
301	>	uint32 selector = NATIVE_OP_field::extract(opcode);
302	>	switch (selector) {
303	>	case NATIVE_PATCH_NAME_REGISTRY:
304	>	dg.gen_invoke(DoPatchNameRegistry);
305	>	compiled = true;
306	>	break;
307	>	case NATIVE_VIDEO_INSTALL_ACCEL:
308	>	dg.gen_invoke(VideoInstallAccel);
309	>	compiled = true;
310	>	break;
311	>	case NATIVE_VIDEO_VBL:
312	>	dg.gen_invoke(VideoVBL);
313	>	compiled = true;
314	>	break;
315	>	case NATIVE_GET_RESOURCE:
316	>	case NATIVE_GET_1_RESOURCE:
317	>	case NATIVE_GET_IND_RESOURCE:
318	>	case NATIVE_GET_1_IND_RESOURCE:
319	>	case NATIVE_R_GET_RESOURCE: {
320	>	static const uint32 get_resource_ptr[] = {
321	>	XLM_GET_RESOURCE,
322	>	XLM_GET_1_RESOURCE,
323	>	XLM_GET_IND_RESOURCE,
324	>	XLM_GET_1_IND_RESOURCE,
325	>	XLM_R_GET_RESOURCE
326	>	};
327	>	uint32 old_get_resource = ReadMacInt32(get_resource_ptr[selector - NATIVE_GET_RESOURCE]);
328	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
329	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::get_resource).ptr();
330	>	dg.gen_invoke_CPU_im(func, old_get_resource);
331	>	compiled = true;
332	>	break;
333	>	}
334	>	case NATIVE_DISABLE_INTERRUPT:
335	>	dg.gen_invoke(DisableInterrupt);
336	>	compiled = true;
337	>	break;
338	>	case NATIVE_ENABLE_INTERRUPT:
339	>	dg.gen_invoke(EnableInterrupt);
340	>	compiled = true;
341	>	break;
342	>	case NATIVE_CHECK_LOAD_INVOC:
343	>	dg.gen_load_T0_GPR(3);
344	>	dg.gen_load_T1_GPR(4);
345	>	dg.gen_se_16_32_T1();
346	>	dg.gen_load_T2_GPR(5);
347	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
348	>	compiled = true;
349	>	break;
350	>	}
351	>	if (FN_field::test(opcode)) {
352	>	if (compiled) {
353	>	dg.gen_load_A0_LR();
354	>	dg.gen_set_PC_A0();
355		}
356	+	cg_context.done_compile = true;
357		}
358	<	#endif
358	>	else
359	>	cg_context.done_compile = false;
360	>	break;
361		}
243	–	};
362
363	<	// Execution loop
364	<	void sheepshaver_cpu::execute(uint32 entry)
365	<	{
366	<	try {
367	<	pc() = entry;
368	<	powerpc_cpu::do_execute<execute_nothing, execute_spcflags_check>();
369	<	}
252	<	catch (sheepshaver_exec_return const &) {
253	<	// Nothing, simply return
363	>	default: {      // EMUL_OP
364	>	typedef void (*func_t)(dyngen_cpu_base, uint32);
365	>	func_t func = (func_t)nv_mem_fun(&sheepshaver_cpu::execute_emul_op).ptr();
366	>	dg.gen_invoke_CPU_im(func, EMUL_OP_field::extract(opcode) - 3);
367	>	cg_context.done_compile = false;
368	>	compiled = true;
369	>	break;
370		}
255	–	catch (...) {
256	–	printf("ERROR: execute() received an unknown exception!\n");
257	–	QuitEmulator();
371		}
372	+	return compiled;
373	+	#endif
374	+	return false;
375		}
376
377		// Handle MacOS interrupt
378		void sheepshaver_cpu::interrupt(uint32 entry)
379		{
380	+	#if EMUL_TIME_STATS
381	+	interrupt_count++;
382	+	const clock_t interrupt_start = clock();
383	+	#endif
384	+
385		#if !MULTICORE_CPU
386		// Save program counters and branch registers
387		uint32 saved_pc = pc();
#	Line 270 | Line 391 | void sheepshaver_cpu::interrupt(uint32 e
391		#endif
392
393		// Initialize stack pointer to SheepShaver alternate stack base
394	<	gpr(1) = SheepStack1Base - 64;
394	>	gpr(1) = SignalStackBase() - 64;
395
396		// Build trampoline to return from interrupt
397	<	uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
397	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
398
399		// Prepare registers for nanokernel interrupt routine
400		kernel_data->v[0x004 >> 2] = htonl(gpr(1));
#	Line 292 | Line 413 | void sheepshaver_cpu::interrupt(uint32 e
413		gpr(1)  = KernelDataAddr;
414		gpr(7)  = ntohl(kernel_data->v[0x660 >> 2]);
415		gpr(8)  = 0;
416	<	gpr(10) = (uint32)trampoline;
417	<	gpr(12) = (uint32)trampoline;
416	>	gpr(10) = trampoline.addr();
417	>	gpr(12) = trampoline.addr();
418		gpr(13) = get_cr();
419
420		// rlwimi. r7,r7,8,0,0
#	Line 314 | Line 435 | void sheepshaver_cpu::interrupt(uint32 e
435		ctr()= saved_ctr;
436		gpr(1) = saved_sp;
437		#endif
438	+
439	+	#if EMUL_TIME_STATS
440	+	interrupt_time += (clock() - interrupt_start);
441	+	#endif
442		}
443
444		// Execute 68k routine
445		void sheepshaver_cpu::execute_68k(uint32 entry, M68kRegisters *r)
446		{
447	+	#if EMUL_TIME_STATS
448	+	exec68k_count++;
449	+	const clock_t exec68k_start = clock();
450	+	#endif
451	+
452		#if SAFE_EXEC_68K
453		if (ReadMacInt32(XLM_RUN_MODE) != MODE_EMUL_OP)
454		printf("FATAL: Execute68k() not called from EMUL_OP mode\n");
#	Line 401 | Line 531 | void sheepshaver_cpu::execute_68k(uint32
531		lr() = saved_lr;
532		ctr()= saved_ctr;
533		set_cr(saved_cr);
534	+
535	+	#if EMUL_TIME_STATS
536	+	exec68k_time += (clock() - exec68k_start);
537	+	#endif
538		}
539
540		// Call MacOS PPC code
541		uint32 sheepshaver_cpu::execute_macos_code(uint32 tvect, int nargs, uint32 const *args)
542		{
543	+	#if EMUL_TIME_STATS
544	+	macos_exec_count++;
545	+	const clock_t macos_exec_start = clock();
546	+	#endif
547	+
548		// Save program counters and branch registers
549		uint32 saved_pc = pc();
550		uint32 saved_lr = lr();
551		uint32 saved_ctr= ctr();
552
553		// Build trampoline with EXEC_RETURN
554	<	uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
555	<	lr() = (uint32)trampoline;
554	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
555	>	lr() = trampoline.addr();
556
557		gpr(1) -= 64;                                                           // Create stack frame
558		uint32 proc = ReadMacInt32(tvect);                      // Get routine address
#	Line 444 | Line 583 | uint32 sheepshaver_cpu::execute_macos_co
583		lr() = saved_lr;
584		ctr()= saved_ctr;
585
586	+	#if EMUL_TIME_STATS
587	+	macos_exec_time += (clock() - macos_exec_start);
588	+	#endif
589	+
590		return retval;
591		}
592
#	Line 453 | Line 596 | inline void sheepshaver_cpu::execute_ppc
596		// Save branch registers
597		uint32 saved_lr = lr();
598
599	<	const uint32 trampoline[] = { htonl(POWERPC_EMUL_OP | 1) };
600	<	lr() = (uint32)trampoline;
599	>	SheepVar32 trampoline = POWERPC_EXEC_RETURN;
600	>	WriteMacInt32(trampoline.addr(), POWERPC_EXEC_RETURN);
601	>	lr() = trampoline.addr();
602
603		execute(entry);
604
#	Line 463 | Line 607 | inline void sheepshaver_cpu::execute_ppc
607		}
608
609		// Resource Manager thunk
466	–	extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
467	–
610		inline void sheepshaver_cpu::get_resource(uint32 old_get_resource)
611		{
612		uint32 type = gpr(3);
#	Line 548 | Line 690 | static sigsegv_return_t sigsegv_handler(
690		if ((addr - ROM_BASE) < ROM_SIZE)
691		return SIGSEGV_RETURN_SKIP_INSTRUCTION;
692
693	<	// Ignore all other faults, if requested
694	<	if (PrefsFindBool("ignoresegv"))
695	<	return SIGSEGV_RETURN_FAILURE;
693	>	// Get program counter of target CPU
694	>	sheepshaver_cpu * const cpu = current_cpu;
695	>	const uint32 pc = cpu->pc();
696	>
697	>	// Fault in Mac ROM or RAM?
698	>	bool mac_fault = (pc >= ROM_BASE) && (pc < (ROM_BASE + ROM_AREA_SIZE)) || (pc >= RAMBase) && (pc < (RAMBase + RAMSize));
699	>	if (mac_fault) {
700	>
701	>	// "VM settings" during MacOS 8 installation
702	>	if (pc == ROM_BASE + 0x488160 && cpu->gpr(20) == 0xf8000000)
703	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
704	>
705	>	// MacOS 8.5 installation
706	>	else if (pc == ROM_BASE + 0x488140 && cpu->gpr(16) == 0xf8000000)
707	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
708	>
709	>	// MacOS 8 serial drivers on startup
710	>	else if (pc == ROM_BASE + 0x48e080 && (cpu->gpr(8) == 0xf3012002 || cpu->gpr(8) == 0xf3012000))
711	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
712	>
713	>	// MacOS 8.1 serial drivers on startup
714	>	else if (pc == ROM_BASE + 0x48c5e0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
715	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
716	>	else if (pc == ROM_BASE + 0x4a10a0 && (cpu->gpr(20) == 0xf3012002 || cpu->gpr(20) == 0xf3012000))
717	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
718	>
719	>	// Ignore all other faults, if requested
720	>	if (PrefsFindBool("ignoresegv"))
721	>	return SIGSEGV_RETURN_SKIP_INSTRUCTION;
722	>	}
723		#else
724		#error "FIXME: You don't have the capability to skip instruction within signal handlers"
725		#endif
#	Line 572 | Line 741 | void init_emul_ppc(void)
741		// Initialize main CPU emulator
742		main_cpu = new sheepshaver_cpu();
743		main_cpu->set_register(powerpc_registers::GPR(3), any_register((uint32)ROM_BASE + 0x30d000));
744	+	main_cpu->set_register(powerpc_registers::GPR(4), any_register(KernelDataAddr + 0x1000));
745		WriteMacInt32(XLM_RUN_MODE, MODE_68K);
746
747		#if MULTICORE_CPU
#	Line 587 | Line 757 | void init_emul_ppc(void)
757		mon_add_command("regs", dump_registers, "regs                     Dump PowerPC registers\n");
758		mon_add_command("log", dump_log, "log                      Dump PowerPC emulation log\n");
759		#endif
760	+
761	+	#if EMUL_TIME_STATS
762	+	emul_start_time = clock();
763	+	#endif
764	+	}
765	+
766	+	/*
767	+	*  Deinitialize emulation
768	+	*/
769	+
770	+	void exit_emul_ppc(void)
771	+	{
772	+	#if EMUL_TIME_STATS
773	+	clock_t emul_end_time = clock();
774	+
775	+	printf("### Statistics for SheepShaver emulation parts\n");
776	+	const clock_t emul_time = emul_end_time - emul_start_time;
777	+	printf("Total emulation time : %.1f sec\n", double(emul_time) / double(CLOCKS_PER_SEC));
778	+	printf("Total interrupt count: %d (%2.1f Hz)\n", interrupt_count,
779	+	(double(interrupt_count) * CLOCKS_PER_SEC) / double(emul_time));
780	+
781	+	#define PRINT_STATS(LABEL, VAR_PREFIX) do {                                                             \
782	+	printf("Total " LABEL " count : %d\n", VAR_PREFIX##_count);             \
783	+	printf("Total " LABEL " time  : %.1f sec (%.1f%%)\n",                   \
784	+	double(VAR_PREFIX##_time) / double(CLOCKS_PER_SEC),          \
785	+	100.0 * double(VAR_PREFIX##_time) / double(emul_time));      \
786	+	} while (0)
787	+
788	+	PRINT_STATS("Execute68k[Trap] execution", exec68k);
789	+	PRINT_STATS("NativeOp execution", native_exec);
790	+	PRINT_STATS("MacOS routine execution", macos_exec);
791	+
792	+	#undef PRINT_STATS
793	+	printf("\n");
794	+	#endif
795	+
796	+	delete main_cpu;
797	+	#if MULTICORE_CPU
798	+	delete interrupt_cpu;
799	+	#endif
800		}
801
802		/*
#	Line 596 | Line 806 | void init_emul_ppc(void)
806		void emul_ppc(uint32 entry)
807		{
808		current_cpu = main_cpu;
809	+	#if 0
810		current_cpu->start_log();
811	+	#endif
812	+	// start emulation loop and enable code translation or caching
813		current_cpu->execute(entry);
814		}
815
#	Line 604 | Line 817 | void emul_ppc(uint32 entry)
817		*  Handle PowerPC interrupt
818		*/
819
820	<	// Atomic operations
821	<	extern int atomic_add(int *var, int v);
822	<	extern int atomic_and(int *var, int v);
823	<	extern int atomic_or(int *var, int v);
824	<
825	<	#if !ASYNC_IRQ
820	>	#if ASYNC_IRQ
821	>	void HandleInterrupt(void)
822	>	{
823	>	main_cpu->handle_interrupt();
824	>	}
825	>	#else
826		void TriggerInterrupt(void)
827		{
828		#if 0
829		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
830		#else
831	<	SPCFLAGS_SET( SPCFLAG_INT );
831	>	// Trigger interrupt to main cpu only
832	>	if (main_cpu)
833	>	main_cpu->trigger_interrupt();
834		#endif
835		}
836		#endif
837
838	<	void HandleInterrupt(void)
838	>	void sheepshaver_cpu::handle_interrupt(void)
839		{
840		// Do nothing if interrupts are disabled
841	<	if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
841	>	if (*(int32 *)XLM_IRQ_NEST > 0)
842		return;
843
844		// Do nothing if there is no interrupt pending
#	Line 639 | Line 854 | void HandleInterrupt(void)
854		// 68k emulator active, trigger 68k interrupt level 1
855		assert(current_cpu == main_cpu);
856		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
857	<	main_cpu->set_cr(main_cpu->get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
857	>	set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
858		break;
859
860		#if INTERRUPTS_IN_NATIVE_MODE
861		case MODE_NATIVE:
862		// 68k emulator inactive, in nanokernel?
863		assert(current_cpu == main_cpu);
864	<	if (main_cpu->gpr(1) != KernelDataAddr) {
864	>	if (gpr(1) != KernelDataAddr) {
865		// Prepare for 68k interrupt level 1
866		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
867		WriteMacInt32(tswap32(kernel_data->v[0x658 >> 2]) + 0xdc,
#	Line 690 | Line 905 | void HandleInterrupt(void)
905		if (InterruptFlags & INTFLAG_VIA) {
906		ClearInterruptFlag(INTFLAG_VIA);
907		ADBInterrupt();
908	<	ExecutePPC(VideoVBL);
908	>	ExecuteNative(NATIVE_VIDEO_VBL);
909		}
910		}
911		#endif
#	Line 700 | Line 915 | void HandleInterrupt(void)
915		}
916		}
917
703	–	/*
704	–	*  Execute NATIVE_OP opcode (called by PowerPC emulator)
705	–	*/
706	–
707	–	#define POWERPC_NATIVE_OP_INIT(LR, OP) \
708	–	tswap32(POWERPC_EMUL_OP | ((LR) << 11) | (((uint32)OP) << 6) | 2)
709	–
710	–	// FIXME: Make sure 32-bit relocations are used
711	–	const uint32 NativeOpTable[NATIVE_OP_MAX] = {
712	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_PATCH_NAME_REGISTRY),
713	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_INSTALL_ACCEL),
714	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_VBL),
715	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_VIDEO_DO_DRIVER_IO),
716	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_IRQ),
717	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_INIT),
718	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_TERM),
719	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_OPEN),
720	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_CLOSE),
721	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_WPUT),
722	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_ETHER_RSRV),
723	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_NOTHING),
724	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_OPEN),
725	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_IN),
726	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_PRIME_OUT),
727	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CONTROL),
728	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_STATUS),
729	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_SERIAL_CLOSE),
730	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_RESOURCE),
731	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_RESOURCE),
732	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_IND_RESOURCE),
733	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_GET_1_IND_RESOURCE),
734	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_R_GET_RESOURCE),
735	–	POWERPC_NATIVE_OP_INIT(0, NATIVE_DISABLE_INTERRUPT),
736	–	POWERPC_NATIVE_OP_INIT(0, NATIVE_ENABLE_INTERRUPT),
737	–	POWERPC_NATIVE_OP_INIT(1, NATIVE_MAKE_EXECUTABLE),
738	–	};
739	–
918		static void get_resource(void);
919		static void get_1_resource(void);
920		static void get_ind_resource(void);
#	Line 747 | Line 925 | static void r_get_resource(void);
925
926		static void NativeOp(int selector)
927		{
928	+	#if EMUL_TIME_STATS
929	+	native_exec_count++;
930	+	const clock_t native_exec_start = clock();
931	+	#endif
932	+
933		switch (selector) {
934		case NATIVE_PATCH_NAME_REGISTRY:
935		DoPatchNameRegistry();
#	Line 761 | Line 944 | static void NativeOp(int selector)
944		GPR(3) = (int32)(int16)VideoDoDriverIO((void *)GPR(3), (void *)GPR(4),
945		(void *)GPR(5), GPR(6), GPR(7));
946		break;
947	<	case NATIVE_GET_RESOURCE:
948	<	get_resource();
947	>	#ifdef WORDS_BIGENDIAN
948	>	case NATIVE_ETHER_IRQ:
949	>	EtherIRQ();
950		break;
951	<	case NATIVE_GET_1_RESOURCE:
952	<	get_1_resource();
951	>	case NATIVE_ETHER_INIT:
952	>	GPR(3) = InitStreamModule((void *)GPR(3));
953		break;
954	<	case NATIVE_GET_IND_RESOURCE:
955	<	get_ind_resource();
954	>	case NATIVE_ETHER_TERM:
955	>	TerminateStreamModule();
956		break;
957	<	case NATIVE_GET_1_IND_RESOURCE:
958	<	get_1_ind_resource();
957	>	case NATIVE_ETHER_OPEN:
958	>	GPR(3) = ether_open((queue_t *)GPR(3), (void *)GPR(4), GPR(5), GPR(6), (void*)GPR(7));
959	>	break;
960	>	case NATIVE_ETHER_CLOSE:
961	>	GPR(3) = ether_close((queue_t *)GPR(3), GPR(4), (void *)GPR(5));
962	>	break;
963	>	case NATIVE_ETHER_WPUT:
964	>	GPR(3) = ether_wput((queue_t *)GPR(3), (mblk_t *)GPR(4));
965		break;
966	<	case NATIVE_R_GET_RESOURCE:
967	<	r_get_resource();
966	>	case NATIVE_ETHER_RSRV:
967	>	GPR(3) = ether_rsrv((queue_t *)GPR(3));
968		break;
969	+	#else
970	+	case NATIVE_ETHER_INIT:
971	+	// FIXME: needs more complicated thunks
972	+	GPR(3) = false;
973	+	break;
974	+	#endif
975		case NATIVE_SERIAL_NOTHING:
976		case NATIVE_SERIAL_OPEN:
977		case NATIVE_SERIAL_PRIME_IN:
#	Line 796 | Line 992 | static void NativeOp(int selector)
992		GPR(3) = serial_callbacks[selector - NATIVE_SERIAL_NOTHING](GPR(3), GPR(4));
993		break;
994		}
995	+	case NATIVE_GET_RESOURCE:
996	+	case NATIVE_GET_1_RESOURCE:
997	+	case NATIVE_GET_IND_RESOURCE:
998	+	case NATIVE_GET_1_IND_RESOURCE:
999	+	case NATIVE_R_GET_RESOURCE: {
1000	+	typedef void (*GetResourceCallback)(void);
1001	+	static const GetResourceCallback get_resource_callbacks[] = {
1002	+	get_resource,
1003	+	get_1_resource,
1004	+	get_ind_resource,
1005	+	get_1_ind_resource,
1006	+	r_get_resource
1007	+	};
1008	+	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1009	+	break;
1010	+	}
1011		case NATIVE_DISABLE_INTERRUPT:
1012		DisableInterrupt();
1013		break;
#	Line 805 | Line 1017 | static void NativeOp(int selector)
1017		case NATIVE_MAKE_EXECUTABLE:
1018		MakeExecutable(0, (void *)GPR(4), GPR(5));
1019		break;
1020	+	case NATIVE_CHECK_LOAD_INVOC:
1021	+	check_load_invoc(GPR(3), GPR(4), GPR(5));
1022	+	break;
1023		default:
1024		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1025		QuitEmulator();
1026		break;
1027		}
813	–	}
1028
1029	<	/*
1030	<	*  Execute native subroutine (LR must contain return address)
1031	<	*/
818	<
819	<	void ExecuteNative(int selector)
820	<	{
821	<	uint32 tvect[2];
822	<	tvect[0] = tswap32(POWERPC_NATIVE_OP_FUNC(selector));
823	<	tvect[1] = 0; // Fake TVECT
824	<	RoutineDescriptor desc = BUILD_PPC_ROUTINE_DESCRIPTOR(0, tvect);
825	<	M68kRegisters r;
826	<	Execute68k((uint32)&desc, &r);
1029	>	#if EMUL_TIME_STATS
1030	>	native_exec_time += (clock() - native_exec_start);
1031	>	#endif
1032		}
1033
1034		/*
#	Line 844 | Line 1049 | void Execute68k(uint32 pc, M68kRegisters
1049
1050		void Execute68kTrap(uint16 trap, M68kRegisters *r)
1051		{
1052	<	uint16 proc[2];
1053	<	proc[0] = htons(trap);
1054	<	proc[1] = htons(M68K_RTS);
1055	<	Execute68k((uint32)proc, r);
1052	>	SheepVar proc_var(4);
1053	>	uint32 proc = proc_var.addr();
1054	>	WriteMacInt16(proc, trap);
1055	>	WriteMacInt16(proc + 2, M68K_RTS);
1056	>	Execute68k(proc, r);
1057		}
1058
1059		/*
#	Line 902 | Line 1108 | uint32 call_macos7(uint32 tvect, uint32
1108		}
1109
1110		/*
905	–	*  Atomic operations
906	–	*/
907	–
908	–	int atomic_add(int *var, int v)
909	–	{
910	–	int ret = *var;
911	–	*var += v;
912	–	return ret;
913	–	}
914	–
915	–	int atomic_and(int *var, int v)
916	–	{
917	–	int ret = *var;
918	–	*var &= v;
919	–	return ret;
920	–	}
921	–
922	–	int atomic_or(int *var, int v)
923	–	{
924	–	int ret = *var;
925	–	*var |= v;
926	–	return ret;
927	–	}
928	–
929	–	/*
1111		*  Resource Manager thunks
1112		*/
1113

Diff Legend

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