--- BasiliskII/src/emul_op.cpp	2001/07/03 15:59:45	1.25
+++ BasiliskII/src/emul_op.cpp	2005/03/19 17:43:03	1.33
@@ -1,7 +1,7 @@
 /*
  *  emul_op.cpp - 68k opcodes for ROM patches
  *
- *  Basilisk II (C) 1997-2001 Christian Bauer
+ *  Basilisk II (C) 1997-2005 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,10 +60,10 @@ 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],
@@ -240,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;
@@ -346,7 +353,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
@@ -437,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();
 
@@ -457,7 +467,6 @@ void EmulOp(uint16 opcode, M68kRegisters
 
 			if (InterruptFlags & INTFLAG_1HZ) {
 				ClearInterruptFlag(INTFLAG_1HZ);
-
 				if (HasMacStarted()) {
 					SonyInterrupt();
 					DiskInterrupt();
@@ -480,11 +489,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;
 
@@ -496,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]);
@@ -535,10 +557,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],