Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-30 20:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Don't allow "recursive" NanoKernel interrupts

Browse Source
This commit is contained in:
gbeauche 2004-05-20 11:47:27 +00:00
parent ec6c98035b
commit 3a960764ea
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp
View File

@ -1100,6 +1100,10 @@ void sheepshaver_cpu::handle_interrupt(void)
if (InterruptFlags == 0)
return;
// Current interrupt nest level
static int interrupt_depth = 0;
++interrupt_depth;
// Disable MacOS stack sniffer
WriteMacInt32(0x110, 0);
@ -1116,7 +1120,7 @@ void sheepshaver_cpu::handle_interrupt(void)
case MODE_NATIVE:
// 68k emulator inactive, in nanokernel?
assert(current_cpu == main_cpu);
if (gpr(1) != KernelDataAddr) {
if (gpr(1) != KernelDataAddr && interrupt_depth == 1) {
interrupt_context ctx(this, "PowerPC mode");
// Prepare for 68k interrupt level 1
@ -1171,6 +1175,9 @@ void sheepshaver_cpu::handle_interrupt(void)
break;
#endif
}
// We are done with this interrupt
--interrupt_depth;
}
static void get_resource(void);