--- BasiliskII/src/emul_op.cpp 2005/01/30 21:42:13 1.32 +++ BasiliskII/src/emul_op.cpp 2006/04/30 21:16:48 1.35 @@ -236,9 +236,11 @@ void EmulOp(uint16 opcode, M68kRegisters // Install PutScrap() patch M68kRegisters r; - r.d[0] = 0xa9fe; - r.a[0] = PutScrapPatch; - Execute68kTrap(0xa647, &r); // SetToolTrap() + if (PutScrapPatch) { + r.d[0] = 0xa9fe; + r.a[0] = PutScrapPatch; + Execute68kTrap(0xa647, &r); // SetToolTrap() + } // Install GetScrap() patch if (GetScrapPatch) { @@ -353,7 +355,7 @@ void EmulOp(uint16 opcode, M68kRegisters break; case M68K_EMUL_OP_ETHER_READ_PACKET: - EtherReadPacket((uint8 **)&r->a[0], r->a[3], r->d[3], r->d[1]); + EtherReadPacket(r->a[0], r->a[3], r->d[3], r->d[1]); break; case M68K_EMUL_OP_SOUNDIN_OPEN: // Sound input driver functions @@ -555,6 +557,13 @@ void EmulOp(uint16 opcode, M68kRegisters r->d[0] = DebugUtil(r->d[0]); break; + case M68K_EMUL_OP_IDLE_TIME: // SynchIdleTime() patch + // Sleep if no events pending + if (ReadMacInt32(0x14c) == 0) + idle_wait(); + r->a[0] = ReadMacInt32(0x2b6); + break; + default: printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode); printf("d0 %08x d1 %08x d2 %08x d3 %08x\n"