--- BasiliskII/src/emul_op.cpp 1999/10/19 17:41:13 1.4 +++ BasiliskII/src/emul_op.cpp 2005/01/30 21:42:13 1.32 @@ -1,7 +1,7 @@ /* * emul_op.cpp - 68k opcodes for ROM patches * - * Basilisk II (C) 1997-1999 Christian Bauer + * Basilisk II (C) 1997-2005 Christian Bauer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,6 +42,10 @@ #include "extfs.h" #include "emul_op.h" +#ifdef ENABLE_MON +#include "mon.h" +#endif + #define DEBUG 0 #include "debug.h" @@ -56,14 +60,19 @@ void EmulOp(uint16 opcode, M68kRegisters switch (opcode) { case M68K_EMUL_BREAK: { // Breakpoint printf("*** Breakpoint\n"); - printf("d0 %08lx d1 %08lx d2 %08lx d3 %08lx\n" - "d4 %08lx d5 %08lx d6 %08lx d7 %08lx\n" - "a0 %08lx a1 %08lx a2 %08lx a3 %08lx\n" - "a4 %08lx a5 %08lx a6 %08lx a7 %08lx\n" + printf("d0 %08x d1 %08x d2 %08x d3 %08x\n" + "d4 %08x d5 %08x d6 %08x d7 %08x\n" + "a0 %08x a1 %08x a2 %08x a3 %08x\n" + "a4 %08x a5 %08x a6 %08x a7 %08x\n" "sr %04x\n", r->d[0], r->d[1], r->d[2], r->d[3], r->d[4], r->d[5], r->d[6], r->d[7], r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7], r->sr); + VideoQuitFullScreen(); +#ifdef ENABLE_MON + char *arg[4] = {"mon", "-m", "-r", NULL}; + mon(3, arg); +#endif QuitEmulator(); break; } @@ -76,9 +85,10 @@ void EmulOp(uint16 opcode, M68kRegisters D(bug("*** RESET ***\n")); TimerReset(); EtherReset(); + AudioReset(); // Create BootGlobs at top of memory - memset((void *)(RAMBaseHost + RAMSize - 4096), 0, 4096); + Mac_memset(RAMBaseMac + RAMSize - 4096, 0, 4096); uint32 boot_globs = RAMBaseMac + RAMSize - 0x1c; WriteMacInt32(boot_globs + 0x00, RAMBaseMac); // First RAM bank WriteMacInt32(boot_globs + 0x04, RAMSize); @@ -187,8 +197,8 @@ void EmulOp(uint16 opcode, M68kRegisters break; case M68K_EMUL_OP_FIX_BOOTSTACK: // Set boot stack to 3/4 of RAM (7.5) - D(bug("Fix boot stack\n")); r->a[1] = RAMBaseMac + RAMSize * 3 / 4; + D(bug("Fix boot stack %08x\n", r->a[1])); break; case M68K_EMUL_OP_FIX_MEMSIZE: { // Set correct logical and physical memory size @@ -230,6 +240,13 @@ void EmulOp(uint16 opcode, M68kRegisters r.a[0] = PutScrapPatch; Execute68kTrap(0xa647, &r); // SetToolTrap() + // Install GetScrap() patch + if (GetScrapPatch) { + r.d[0] = 0xa9fd; + r.a[0] = GetScrapPatch; + Execute68kTrap(0xa647, &r); // SetToolTrap() + } + // Setup fake ASC registers if (ROMVersion == ROM_VERSION_32) { r.d[0] = 0x1000; @@ -296,15 +313,15 @@ void EmulOp(uint16 opcode, M68kRegisters break; case M68K_EMUL_OP_VIDEO_OPEN: // Video driver functions - r->d[0] = VideoOpen(r->a[0], r->a[1]); + r->d[0] = VideoDriverOpen(r->a[0], r->a[1]); break; case M68K_EMUL_OP_VIDEO_CONTROL: - r->d[0] = VideoControl(r->a[0], r->a[1]); + r->d[0] = VideoDriverControl(r->a[0], r->a[1]); break; case M68K_EMUL_OP_VIDEO_STATUS: - r->d[0] = VideoStatus(r->a[0], r->a[1]); + r->d[0] = VideoDriverStatus(r->a[0], r->a[1]); break; case M68K_EMUL_OP_SERIAL_OPEN: // Serial driver functions @@ -339,6 +356,26 @@ void EmulOp(uint16 opcode, M68kRegisters EtherReadPacket((uint8 **)&r->a[0], r->a[3], r->d[3], r->d[1]); break; + case M68K_EMUL_OP_SOUNDIN_OPEN: // Sound input driver functions + r->d[0] = SoundInOpen(r->a[0], r->a[1]); + break; + + case M68K_EMUL_OP_SOUNDIN_PRIME: + r->d[0] = SoundInPrime(r->a[0], r->a[1]); + break; + + case M68K_EMUL_OP_SOUNDIN_CONTROL: + r->d[0] = SoundInControl(r->a[0], r->a[1]); + break; + + case M68K_EMUL_OP_SOUNDIN_STATUS: + r->d[0] = SoundInStatus(r->a[0], r->a[1]); + break; + + case M68K_EMUL_OP_SOUNDIN_CLOSE: + r->d[0] = SoundInClose(r->a[0], r->a[1]); + break; + case M68K_EMUL_OP_SCSI_DISPATCH: { // SCSIDispatch() replacement uint32 ret = ReadMacInt32(r->a[7]); // Get return address uint16 sel = ReadMacInt16(r->a[7] + 4); // Get selector @@ -402,46 +439,20 @@ void EmulOp(uint16 opcode, M68kRegisters break; } - case M68K_EMUL_OP_MEMORY_DISPATCH: { // MemoryDispatch() replacement routine - int16 sel = r->d[0]; - D(bug("MemoryDispatch(%d)\n", sel)); - switch (sel) { - case -6: // GetLogicalRAMSize - r->d[0] = RAMSize; - break; - case -3: - r->d[0] = 0x1000; - break; - case 0: // HoldMemory - case 1: // UnholdMemory - case 2: // LockMemory - case 3: // UnlockMemory - case 4: // LockMemoryContiguous - case 6: // ProtectMemory - case 7: // UnprotectMemory - r->d[0] = 0; - break; - default: - printf("FATAL: MemoryDispatch(%d): illegal selector\n", sel); - r->d[0] = (uint32)-502; - break; - } - break; - } - case M68K_EMUL_OP_IRQ: // Level 1 interrupt r->d[0] = 0; + if (InterruptFlags & INTFLAG_60HZ) { ClearInterruptFlag(INTFLAG_60HZ); + + // Increment Ticks variable + WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1); + if (HasMacStarted()) { // Mac has started, execute all 60Hz interrupt functions - ADBInterrupt(); TimerInterrupt(); VideoInterrupt(); - SonyInterrupt(); - DiskInterrupt(); - CDROMInterrupt(); // Call DoVBLTask(0) if (ROMVersion == ROM_VERSION_32) { @@ -453,18 +464,42 @@ void EmulOp(uint16 opcode, M68kRegisters r->d[0] = 1; // Flag: 68k interrupt routine executes VBLTasks etc. } } + + if (InterruptFlags & INTFLAG_1HZ) { + ClearInterruptFlag(INTFLAG_1HZ); + if (HasMacStarted()) { + SonyInterrupt(); + DiskInterrupt(); + CDROMInterrupt(); + } + } + if (InterruptFlags & INTFLAG_SERIAL) { ClearInterruptFlag(INTFLAG_SERIAL); SerialInterrupt(); } + if (InterruptFlags & INTFLAG_ETHER) { ClearInterruptFlag(INTFLAG_ETHER); EtherInterrupt(); } + if (InterruptFlags & INTFLAG_AUDIO) { ClearInterruptFlag(INTFLAG_AUDIO); AudioInterrupt(); } + + if (InterruptFlags & INTFLAG_ADB) { + ClearInterruptFlag(INTFLAG_ADB); + if (HasMacStarted()) + ADBInterrupt(); + } + + if (InterruptFlags & INTFLAG_NMI) { + ClearInterruptFlag(INTFLAG_NMI); + if (HasMacStarted()) + TriggerNMI(); + } break; case M68K_EMUL_OP_PUT_SCRAP: { // PutScrap() patch @@ -475,6 +510,14 @@ void EmulOp(uint16 opcode, M68kRegisters break; } + case M68K_EMUL_OP_GET_SCRAP: { // GetScrap() patch + void **scrap_handle = (void **)Mac2HostAddr(ReadMacInt32(r->a[7] + 4)); + uint32 type = ReadMacInt32(r->a[7] + 8); + int32 length = ReadMacInt32(r->a[7] + 12); + GetScrap(scrap_handle, type, length); + break; + } + case M68K_EMUL_OP_CHECKLOAD: { // vCheckLoad() patch (resource loader) uint32 type = r->d[1]; int16 id = ReadMacInt16(r->a[2]); @@ -493,6 +536,7 @@ void EmulOp(uint16 opcode, M68kRegisters r->d[0] = AudioDispatch(r->a[3], r->a[4]); break; +#if SUPPORTS_EXTFS case M68K_EMUL_OP_EXTFS_COMM: // External file system routines WriteMacInt16(r->a[7] + 14, ExtFSComm(ReadMacInt16(r->a[7] + 12), ReadMacInt32(r->a[7] + 8), ReadMacInt32(r->a[7] + 4))); break; @@ -500,17 +544,31 @@ void EmulOp(uint16 opcode, M68kRegisters case M68K_EMUL_OP_EXTFS_HFS: WriteMacInt16(r->a[7] + 20, ExtFSHFS(ReadMacInt32(r->a[7] + 16), ReadMacInt16(r->a[7] + 14), ReadMacInt32(r->a[7] + 10), ReadMacInt32(r->a[7] + 6), ReadMacInt16(r->a[7] + 4))); break; +#endif + + case M68K_EMUL_OP_BLOCK_MOVE: // BlockMove() cache flushing + FlushCodeCache(Mac2HostAddr(r->a[0]), r->a[1]); + break; + + case M68K_EMUL_OP_DEBUGUTIL: + // printf("DebugUtil d0=%08lx a5=%08lx\n", r->d[0], r->a[5]); + r->d[0] = DebugUtil(r->d[0]); + break; default: printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode); - printf("d0 %08lx d1 %08lx d2 %08lx d3 %08lx\n" - "d4 %08lx d5 %08lx d6 %08lx d7 %08lx\n" - "a0 %08lx a1 %08lx a2 %08lx a3 %08lx\n" - "a4 %08lx a5 %08lx a6 %08lx a7 %08lx\n" + printf("d0 %08x d1 %08x d2 %08x d3 %08x\n" + "d4 %08x d5 %08x d6 %08x d7 %08x\n" + "a0 %08x a1 %08x a2 %08x a3 %08x\n" + "a4 %08x a5 %08x a6 %08x a7 %08x\n" "sr %04x\n", r->d[0], r->d[1], r->d[2], r->d[3], r->d[4], r->d[5], r->d[6], r->d[7], r->a[0], r->a[1], r->a[2], r->a[3], r->a[4], r->a[5], r->a[6], r->a[7], r->sr); +#ifdef ENABLE_MON + char *arg[4] = {"mon", "-m", "-r", NULL}; + mon(3, arg); +#endif QuitEmulator(); break; }