--- BasiliskII/src/emul_op.cpp 1999/10/25 08:07:45 1.8 +++ BasiliskII/src/emul_op.cpp 1999/10/31 23:18:32 1.11 @@ -69,9 +69,7 @@ void EmulOp(uint16 opcode, M68kRegisters 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]; - arg[0] = "rmon"; - arg[1] = NULL; + char *arg[2] = {"rmon", NULL}; mon(1, arg); #endif QuitEmulator(); @@ -412,33 +410,6 @@ 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) { @@ -527,6 +498,10 @@ 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); +#endif QuitEmulator(); break; }