[ViewVC] Diff of: cebix/SheepShaver/src/kpx_cpu/sheepshaver

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents):
Revision 1.59 by gbeauche, 2005-03-05T18:33:30Z vs.
Revision 1.71 by gbeauche, 2006-07-09T12:15:48Z

#	Line 89 \| 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;
#	Line 177 \| Line 178 \| public:
178
179		// Make sure the SIGSEGV handler can access CPU registers
180		friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
180	–
181	–	// Memory allocator returning areas aligned on 16-byte boundaries
182	–	void *operator new(size_t size);
183	–	void operator delete(void *p);
181		};
182
186	–	// Memory allocator returning areas aligned on 16-byte boundaries
187	–	void *sheepshaver_cpu::operator new(size_t size)
188	–	{
189	–	void *p;
190	–
191	–	#if defined(HAVE_POSIX_MEMALIGN)
192	–	if (posix_memalign(&p, 16, size) != 0)
193	–	throw std::bad_alloc();
194	–	#elif defined(HAVE_MEMALIGN)
195	–	p = memalign(16, size);
196	–	#elif defined(HAVE_VALLOC)
197	–	p = valloc(size); // page-aligned!
198	–	#else
199	–	/* XXX: handle padding ourselves */
200	–	p = malloc(size);
201	–	#endif
202	–
203	–	return p;
204	–	}
205	–
206	–	void sheepshaver_cpu::operator delete(void *p)
207	–	{
208	–	#if defined(HAVE_MEMALIGN) \|\| defined(HAVE_VALLOC)
209	–	#if defined(__GLIBC__)
210	–	// this is known to work only with GNU libc
211	–	free(p);
212	–	#endif
213	–	#else
214	–	free(p);
215	–	#endif
216	–	}
217	–
183		sheepshaver_cpu::sheepshaver_cpu()
184		: powerpc_cpu(enable_jit_p())
185		{
#	Line 263 \| 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 371 \| 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 379 \| 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_BITBLT:
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_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_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 401 \| 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 412 \| 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 796 \| Line 792 \| sigsegv_return_t sigsegv_handler(sigsegv
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 862 \| 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 909 \| 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 929 \| Line 927 \| void HandleInterrupt(powerpc_registers *
927		if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
928		return;
929
930	<	// Do nothing if there is no pending interrupt
933	<	if (InterruptFlags == 0)
934	<	return;
935	<
936	<	// Current interrupt nest level
937	<	static int interrupt_depth = 0;
938	<	++interrupt_depth;
930	>	// Update interrupt count
931		#if EMUL_TIME_STATS
932		interrupt_count++;
933		#endif
#	Line 951 \| Line 943 \| void HandleInterrupt(powerpc_registers *
943		#if INTERRUPTS_IN_NATIVE_MODE
944		case MODE_NATIVE:
945		// 68k emulator inactive, in nanokernel?
946	<	if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) {
946	>	if (r->gpr[1] != KernelDataAddr) {
947
948		// Prepare for 68k interrupt level 1
949		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
#	Line 1009 \| Line 1001 \| void HandleInterrupt(powerpc_registers *
1001		break;
1002		#endif
1003		}
1012	–
1013	–	// We are done with this interrupt
1014	–	--interrupt_depth;
1004		}
1005
1017	–	static void get_resource(void);
1018	–	static void get_1_resource(void);
1019	–	static void get_ind_resource(void);
1020	–	static void get_1_ind_resource(void);
1021	–	static void r_get_resource(void);
1022	–
1006		// Execute NATIVE_OP routine
1007		void sheepshaver_cpu::execute_native_op(uint32 selector)
1008		{
#	Line 1041 \| Line 1024 \| void sheepshaver_cpu::execute_native_op(
1024		case NATIVE_VIDEO_DO_DRIVER_IO:
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;
1039		case NATIVE_ETHER_IRQ:
1040		EtherIRQ();
1041		break;
#	Line 1062 \| 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	<	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 1101 \| 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	+	get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1109	+	break;
1110		case NATIVE_GET_1_IND_RESOURCE:
1111	<	case NATIVE_R_GET_RESOURCE: {
1112	<	typedef void (*GetResourceCallback)(void);
1113	<	static const GetResourceCallback get_resource_callbacks[] = {
1114	<	::get_resource,
1111	<	::get_1_resource,
1112	<	::get_ind_resource,
1113	<	::get_1_ind_resource,
1114	<	::r_get_resource
1115	<	};
1116	<	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1111	>	get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1112	>	break;
1113	>	case NATIVE_R_GET_RESOURCE:
1114	>	get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1115		break;
1118	–	}
1116		case NATIVE_MAKE_EXECUTABLE:
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 1208 \| 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		}
1211	–
1212	–	/*
1213	–	* Resource Manager thunks
1214	–	*/
1215	–
1216	–	void get_resource(void)
1217	–	{
1218	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1219	–	}
1220	–
1221	–	void get_1_resource(void)
1222	–	{
1223	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1224	–	}
1225	–
1226	–	void get_ind_resource(void)
1227	–	{
1228	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1229	–	}
1230	–
1231	–	void get_1_ind_resource(void)
1232	–	{
1233	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1234	–	}
1235	–
1236	–	void r_get_resource(void)
1237	–	{
1238	–	ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1239	–	}

Diff Legend

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

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents): Revision 1.59 by gbeauche, 2005-03-05T18:33:30Z vs. Revision 1.71 by gbeauche, 2006-07-09T12:15:48Z

Diff Legend

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents):
Revision 1.59 by gbeauche, 2005-03-05T18:33:30Z vs.
Revision 1.71 by gbeauche, 2006-07-09T12:15:48Z