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.62 by gbeauche, 2005-06-30T07:34:17Z vs.
Revision 1.64 by gbeauche, 2005-06-30T10:17:58Z

#	Line 915 | Line 915 | void emul_ppc(uint32 entry)
915
916		void TriggerInterrupt(void)
917		{
918	+	idle_resume();
919		#if 0
920		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
921		#else
#	Line 935 | Line 936 | void HandleInterrupt(powerpc_registers *
936		if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
937		return;
938
939	<	// Do nothing if there is no pending interrupt
939	<	if (InterruptFlags == 0)
940	<	return;
941	<
942	<	// Current interrupt nest level
943	<	static int interrupt_depth = 0;
944	<	++interrupt_depth;
939	>	// Update interrupt count
940		#if EMUL_TIME_STATS
941		interrupt_count++;
942		#endif
#	Line 957 | Line 952 | void HandleInterrupt(powerpc_registers *
952		#if INTERRUPTS_IN_NATIVE_MODE
953		case MODE_NATIVE:
954		// 68k emulator inactive, in nanokernel?
955	<	if (r->gpr[1] != KernelDataAddr && interrupt_depth == 1) {
955	>	if (r->gpr[1] != KernelDataAddr) {
956
957		// Prepare for 68k interrupt level 1
958		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
#	Line 1015 | Line 1010 | void HandleInterrupt(powerpc_registers *
1010		break;
1011		#endif
1012		}
1018	–
1019	–	// We are done with this interrupt
1020	–	--interrupt_depth;
1013		}
1014
1015		static void get_resource(void);

Diff Legend

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