--- BasiliskII/src/emul_op.cpp	1999/10/26 16:28:26	1.9
+++ BasiliskII/src/emul_op.cpp	2000/07/22 16:07:16	1.17
@@ -1,7 +1,7 @@
 /*
  *  emul_op.cpp - 68k opcodes for ROM patches
  *
- *  Basilisk II (C) 1997-1999 Christian Bauer
+ *  Basilisk II (C) 1997-2000 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
 
@@ -60,15 +60,15 @@ 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);
-#if ENABLE_MON
+#ifdef ENABLE_MON
 			char *arg[2] = {"rmon", NULL};
 			mon(1, arg);
 #endif
@@ -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
@@ -410,35 +411,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 +422,6 @@ void EmulOp(uint16 opcode, M68kRegisters
 					ADBInterrupt();
 					TimerInterrupt();
 					VideoInterrupt();
-					SonyInterrupt();
-					DiskInterrupt();
-					CDROMInterrupt();
 
 					// Call DoVBLTask(0)
 					if (ROMVersion == ROM_VERSION_32) {
@@ -461,14 +433,27 @@ 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();
@@ -516,16 +501,16 @@ void EmulOp(uint16 opcode, M68kRegisters
 			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("FATAL: EMUL_OP called with bogus opcode %04x\n", opcode);
+			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);
-#if ENABLE_MON
+#ifdef ENABLE_MON
 			char *arg[2] = {"rmon", NULL};
 			mon(1, arg);
 #endif