--- BasiliskII/src/emul_op.cpp 1999/10/26 16:28:26 1.9 +++ BasiliskII/src/emul_op.cpp 2001/02/02 20:52:57 1.23 @@ -1,7 +1,7 @@ /* * emul_op.cpp - 68k opcodes for ROM patches * - * Basilisk II (C) 1997-1999 Christian Bauer + * Basilisk II (C) 1997-2001 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,7 +42,7 @@ #include "extfs.h" #include "emul_op.h" -#if ENABLE_MON +#ifdef ENABLE_MON #include "mon.h" #endif @@ -68,9 +68,9 @@ void EmulOp(uint16 opcode, M68kRegisters 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); -#if ENABLE_MON - char *arg[2] = {"rmon", NULL}; - mon(1, arg); +#ifdef ENABLE_MON + char *arg[4] = {"mon", "-m", "-r", NULL}; + mon(3, arg); #endif QuitEmulator(); break; @@ -84,9 +84,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); @@ -195,8 +196,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 @@ -247,6 +248,22 @@ void EmulOp(uint16 opcode, M68kRegisters WriteMacInt8(asc_regs + 0x800, 0x0f); // Set ASC version number WriteMacInt32(0xcc0, asc_regs); // Set ASCBase } + +#if (REAL_ADDRESSING || DIRECT_ADDRESSING) && defined(USE_SCRATCHMEM_SUBTERFUGE) + extern uint8 *ScratchMem; + + // Set VIA base address to scratch memory area + D(bug("Patch VIA base address [0x%x] to ScratchMem\n", ReadMacInt32(0x1d4))); + WriteMacInt32(0x1d4, Host2MacAddr(ScratchMem)); + + // Set SCCRd base address to scratch memory area + D(bug("Patch SCCRd base address [0x%x] to ScratchMem\n", ReadMacInt32(0x1d8))); + WriteMacInt32(0x1d8, Host2MacAddr(ScratchMem)); + + // Set SCCWr base address to scratch memory area + D(bug("Patch SCCWr base address [0x%x] to ScratchMem\n", ReadMacInt32(0x1dc))); + WriteMacInt32(0x1dc, Host2MacAddr(ScratchMem)); +#endif break; } @@ -347,6 +364,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 @@ -410,35 +447,9 @@ 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): unimplemented 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); if (HasMacStarted()) { @@ -447,9 +458,6 @@ void EmulOp(uint16 opcode, M68kRegisters ADBInterrupt(); TimerInterrupt(); VideoInterrupt(); - SonyInterrupt(); - DiskInterrupt(); - CDROMInterrupt(); // Call DoVBLTask(0) if (ROMVersion == ROM_VERSION_32) { @@ -461,18 +469,38 @@ 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_NMI) { + ClearInterruptFlag(INTFLAG_NMI); + if (HasMacStarted()) { + TriggerNMI(); + } + } break; case M68K_EMUL_OP_PUT_SCRAP: { // PutScrap() patch @@ -511,8 +539,13 @@ void EmulOp(uint16 opcode, M68kRegisters break; #endif - case M68K_EMUL_OP_BLOCK_MOVE: // BlockMove() replacement - memmove(Mac2HostAddr(r->a[1]), Mac2HostAddr(r->a[0]), r->d[0]); + 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: @@ -525,9 +558,9 @@ void EmulOp(uint16 opcode, M68kRegisters 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); -#if ENABLE_MON - char *arg[2] = {"rmon", NULL}; - mon(1, arg); +#ifdef ENABLE_MON + char *arg[4] = {"mon", "-m", "-r", NULL}; + mon(3, arg); #endif QuitEmulator(); break;