--- BasiliskII/src/emul_op.cpp	2000/09/25 17:54:00	1.20
+++ BasiliskII/src/emul_op.cpp	2001/07/11 19:26:13	1.27
@@ -1,7 +1,7 @@
 /*
  *  emul_op.cpp - 68k opcodes for ROM patches
  *
- *  Basilisk II (C) 1997-2000 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
@@ -60,14 +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);
+			VideoQuitFullScreen();
 #ifdef ENABLE_MON
 			char *arg[4] = {"mon", "-m", "-r", NULL};
 			mon(3, arg);
@@ -439,7 +440,6 @@ void EmulOp(uint16 opcode, M68kRegisters
 				if (HasMacStarted()) {
 
 					// Mac has started, execute all 60Hz interrupt functions
-					ADBInterrupt();
 					TimerInterrupt();
 					VideoInterrupt();
 
@@ -456,7 +456,6 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			if (InterruptFlags & INTFLAG_1HZ) {
 				ClearInterruptFlag(INTFLAG_1HZ);
-
 				if (HasMacStarted()) {
 					SonyInterrupt();
 					DiskInterrupt();
@@ -479,11 +478,16 @@ void EmulOp(uint16 opcode, M68kRegisters
 				AudioInterrupt();
 			}
 
+			if (InterruptFlags & INTFLAG_ADB) {
+				ClearInterruptFlag(INTFLAG_ADB);
+				if (HasMacStarted())
+					ADBInterrupt();
+			}
+
 			if (InterruptFlags & INTFLAG_NMI) {
 				ClearInterruptFlag(INTFLAG_NMI);
-				if (HasMacStarted()) {
+				if (HasMacStarted())
 					TriggerNMI();
-				}
 			}
 			break;
 
@@ -523,8 +527,8 @@ 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:
@@ -534,10 +538,10 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 		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],