--- BasiliskII/src/emul_op.cpp	2000/07/25 17:02:23	1.18
+++ BasiliskII/src/emul_op.cpp	2004/11/15 23:27:43	1.31
@@ -1,7 +1,7 @@
 /*
  *  emul_op.cpp - 68k opcodes for ROM patches
  *
- *  Basilisk II (C) 1997-2000 Christian Bauer
+ *  Basilisk II (C) 1997-2004 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
@@ -68,9 +68,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);
+			VideoQuitFullScreen();
 #ifdef ENABLE_MON
-			char *arg[2] = {"rmon", NULL};
-			mon(1, arg);
+			char *arg[4] = {"mon", "-m", "-r", NULL};
+			mon(3, arg);
 #endif
 			QuitEmulator();
 			break;
@@ -239,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;
@@ -436,10 +444,13 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			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();
 
@@ -456,7 +467,6 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			if (InterruptFlags & INTFLAG_1HZ) {
 				ClearInterruptFlag(INTFLAG_1HZ);
-
 				if (HasMacStarted()) {
 					SonyInterrupt();
 					DiskInterrupt();
@@ -478,6 +488,18 @@ void EmulOp(uint16 opcode, M68kRegisters
 				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
@@ -488,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]);
@@ -516,12 +546,17 @@ 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:
-			printf("FATAL: EMUL_OP called with bogus opcode %04x\n", opcode);
+			printf("FATAL: EMUL_OP called with bogus opcode %08x\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"
@@ -531,8 +566,8 @@ 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);
 #ifdef ENABLE_MON
-			char *arg[2] = {"rmon", NULL};
-			mon(1, arg);
+			char *arg[4] = {"mon", "-m", "-r", NULL};
+			mon(3, arg);
 #endif
 			QuitEmulator();
 			break;