--- SheepShaver/src/emul_op.cpp	2003/12/04 17:26:35	1.5
+++ SheepShaver/src/emul_op.cpp	2004/01/10 08:46:56	1.7
@@ -267,10 +267,10 @@ void EmulOp(M68kRegisters *r, uint32 pc,
 #endif
 
 			// Patch DebugStr()
-			static const uint8 proc[] = {
-				M68K_EMUL_OP_DEBUG_STR >> 8, M68K_EMUL_OP_DEBUG_STR & 0xff,
-				0x4e, 0x74,			// rtd	#4
-				0x00, 0x04
+			static const uint16 proc[] = {
+				PW(M68K_EMUL_OP_DEBUG_STR),
+				PW(0x4e74),			// rtd	#4
+				PW(0x0004)
 			};
 			WriteMacInt32(0x1dfc, (uint32)proc);
 			break;
@@ -307,11 +307,7 @@ void EmulOp(M68kRegisters *r, uint32 pc,
 #if !PRECISE_TIMING
 					TimerInterrupt();
 #endif
-#if EMULATED_PPC
 					ExecuteNative(NATIVE_VIDEO_VBL);
-#else
-					ExecutePPC(VideoVBL);
-#endif
 
 					static int tick_counter = 0;
 					if (++tick_counter >= 60) {
@@ -329,11 +325,7 @@ void EmulOp(M68kRegisters *r, uint32 pc,
 				}
 				if (InterruptFlags & INTFLAG_ETHER) {
 					ClearInterruptFlag(INTFLAG_ETHER);
-#if EMULATED_PPC
 					ExecuteNative(NATIVE_ETHER_IRQ);
-#else
-					ExecutePPC(EtherIRQ);
-#endif
 				}
 				if (InterruptFlags & INTFLAG_TIMER) {
 					ClearInterruptFlag(INTFLAG_TIMER);