--- BasiliskII/src/emul_op.cpp	2001/02/02 20:52:57	1.23
+++ BasiliskII/src/emul_op.cpp	2010/02/21 12:00:01	1.37
@@ -1,7 +1,7 @@
 /*
  *  emul_op.cpp - 68k opcodes for ROM patches
  *
- *  Basilisk II (C) 1997-2001 Christian Bauer
+ *  Basilisk II (C) 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,16 +60,17 @@ 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};
+			const char *arg[4] = {"mon", "-m", "-r", NULL};
 			mon(3, arg);
 #endif
 			QuitEmulator();
@@ -235,9 +236,18 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			// Install PutScrap() patch
 			M68kRegisters r;
-			r.d[0] = 0xa9fe;
-			r.a[0] = PutScrapPatch;
-			Execute68kTrap(0xa647, &r);		// SetToolTrap()
+			if (PutScrapPatch) {
+				r.d[0] = 0xa9fe;
+				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) {
@@ -248,22 +258,6 @@ 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;
 		}
 
@@ -361,7 +355,7 @@ void EmulOp(uint16 opcode, M68kRegisters
 			break;
 
 		case M68K_EMUL_OP_ETHER_READ_PACKET:
-			EtherReadPacket((uint8 **)&r->a[0], r->a[3], r->d[3], r->d[1]);
+			EtherReadPacket(r->a[0], r->a[3], r->d[3], r->d[1]);
 			break;
 
 		case M68K_EMUL_OP_SOUNDIN_OPEN:		// Sound input driver functions
@@ -452,10 +446,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();
 
@@ -472,7 +469,6 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			if (InterruptFlags & INTFLAG_1HZ) {
 				ClearInterruptFlag(INTFLAG_1HZ);
-
 				if (HasMacStarted()) {
 					SonyInterrupt();
 					DiskInterrupt();
@@ -495,11 +491,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;
 
@@ -511,6 +512,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]);
@@ -548,18 +557,25 @@ void EmulOp(uint16 opcode, M68kRegisters
 			r->d[0] = DebugUtil(r->d[0]);
 			break;
 
+		case M68K_EMUL_OP_IDLE_TIME:	// SynchIdleTime() patch
+			// Sleep if no events pending
+			if (ReadMacInt32(0x14c) == 0)
+				idle_wait();
+			r->a[0] = ReadMacInt32(0x2b6);
+			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("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);
 #ifdef ENABLE_MON
-			char *arg[4] = {"mon", "-m", "-r", NULL};
+			const char *arg[4] = {"mon", "-m", "-r", NULL};
 			mon(3, arg);
 #endif
 			QuitEmulator();