X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Ffame%2Ffamec_opcodes.h;h=c690b45c640c36608a9066c873c673ab29bf0b99;hb=d01fa2044c98b23dfb72188a7486e567ab2d3dda;hp=215dbd605a3ed1023ff51bc40b4e62540020de84;hpb=80db44425aa5b46185fb9a64520f4b6f5d494ba5;p=picodrive.git

diff --git a/cpu/fame/famec_opcodes.h b/cpu/fame/famec_opcodes.h
index 215dbd6..c690b45 100644
--- a/cpu/fame/famec_opcodes.h
+++ b/cpu/fame/famec_opcodes.h
@@ -1,4 +1,10 @@
 
+#ifdef PICODRIVE_HACK
+#define NOT_POLLING g_m68kcontext->not_polling = 1;
+#else
+#define NOT_POLLING
+#endif
+
 // ORI
 OPCODE(0x0000)
 {
@@ -638,9 +644,7 @@ OPCODE(0x007C)
 	}
 	else
 	{
-		u32 newPC = (u32)(PC) - BasePC;
-		SET_PC(newPC-2);
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 #ifdef USE_CYCLONE_TIMING
 		RET(0)
 #else
@@ -1298,9 +1302,7 @@ OPCODE(0x027C)
 	}
 	else
 	{
-		u32 newPC = (u32)(PC) - BasePC;
-		SET_PC(newPC-2);
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(20)
@@ -1950,10 +1952,8 @@ OPCODE(0x0A7C)
 	}
 	else
 	{
-		u32 newPC = (u32)(PC) - BasePC;
-		SET_PC(newPC-2);
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
-		RET(4)
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
+		RET(0)
 	}
 RET(20)
 }
@@ -3832,7 +3832,7 @@ OPCODE(0x083A)
 
 	FETCH_BYTE(src);
 	src = 1 << (src & 7);
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -3849,7 +3849,7 @@ OPCODE(0x083B)
 
 	FETCH_BYTE(src);
 	src = 1 << (src & 7);
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -4578,7 +4578,7 @@ OPCODE(0x013A)
 
 	src = DREGu8((Opcode >> 9) & 7);
 	src = 1 << (src & 7);
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -4595,7 +4595,7 @@ OPCODE(0x013B)
 
 	src = DREGu8((Opcode >> 9) & 7);
 	src = 1 << (src & 7);
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -5213,7 +5213,11 @@ OPCODE(0x0108)
 	READ_BYTE_F(adr + 2, src)
 	DREGu16((Opcode >> 9) & 7) = (res << 8) | src;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(24)
+#endif
 }
 
 // MOVEPLaD
@@ -5237,7 +5241,11 @@ OPCODE(0x0148)
 	READ_BYTE_F(adr, src)
 	DREG((Opcode >> 9) & 7) = res | src;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(24)
+#else
 RET(32)
+#endif
 }
 
 // MOVEPWDa
@@ -5253,7 +5261,11 @@ OPCODE(0x0188)
 	WRITE_BYTE_F(adr + 0, res >> 8)
 	WRITE_BYTE_F(adr + 2, res >> 0)
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(24)
+#endif
 }
 
 // MOVEPLDa
@@ -5274,7 +5286,11 @@ OPCODE(0x01C8)
 	adr += 2;
 	WRITE_BYTE_F(adr, res >> 0)
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(24)
+#else
 RET(32)
+#endif
 }
 
 // MOVEB
@@ -5460,6 +5476,7 @@ OPCODE(0x1F00)
 RET(8)
 }
 
+#if 0
 // MOVEB
 OPCODE(0x1008)
 {
@@ -5692,6 +5709,7 @@ OPCODE(0x1F08)
 */
 RET(8)
 }
+#endif
 
 // MOVEB
 OPCODE(0x1010)
@@ -7104,7 +7122,7 @@ OPCODE(0x103A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7123,7 +7141,7 @@ OPCODE(0x10BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7143,7 +7161,7 @@ OPCODE(0x10FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7164,7 +7182,7 @@ OPCODE(0x113A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7185,7 +7203,7 @@ OPCODE(0x117A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7206,7 +7224,7 @@ OPCODE(0x11BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7227,7 +7245,7 @@ OPCODE(0x11FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7247,7 +7265,7 @@ OPCODE(0x13FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7267,7 +7285,7 @@ OPCODE(0x1EFA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7288,7 +7306,7 @@ OPCODE(0x1F3A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7309,7 +7327,7 @@ OPCODE(0x103B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7328,7 +7346,7 @@ OPCODE(0x10BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7348,7 +7366,7 @@ OPCODE(0x10FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7369,7 +7387,7 @@ OPCODE(0x113B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7390,7 +7408,7 @@ OPCODE(0x117B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7411,7 +7429,7 @@ OPCODE(0x11BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7432,7 +7450,7 @@ OPCODE(0x11FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7452,7 +7470,7 @@ OPCODE(0x13FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7472,7 +7490,7 @@ OPCODE(0x1EFB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -7493,7 +7511,7 @@ OPCODE(0x1F3B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = (uptr)(PC) - BasePC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, res)
@@ -8279,7 +8297,7 @@ OPCODE(0x2F00)
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
 	PRE_IO
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(12)
 }
@@ -8462,7 +8480,7 @@ OPCODE(0x2F08)
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
 	PRE_IO
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(12)
 }
@@ -8657,7 +8675,7 @@ OPCODE(0x2F10)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(20)
 }
@@ -8862,7 +8880,7 @@ OPCODE(0x2F18)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(20)
 }
@@ -9067,7 +9085,7 @@ OPCODE(0x2F20)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(22)
 }
@@ -9272,7 +9290,7 @@ OPCODE(0x2F28)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(24)
 }
@@ -9477,7 +9495,7 @@ OPCODE(0x2F30)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(26)
 }
@@ -9672,7 +9690,7 @@ OPCODE(0x2F38)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(24)
 }
@@ -9867,7 +9885,7 @@ OPCODE(0x2F39)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(28)
 }
@@ -9878,7 +9896,7 @@ OPCODE(0x203A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -9897,7 +9915,7 @@ OPCODE(0x20BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -9917,7 +9935,7 @@ OPCODE(0x20FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -9938,7 +9956,7 @@ OPCODE(0x213A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -9959,7 +9977,7 @@ OPCODE(0x217A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -9980,7 +9998,7 @@ OPCODE(0x21BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10001,7 +10019,7 @@ OPCODE(0x21FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10021,7 +10039,7 @@ OPCODE(0x23FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10041,7 +10059,7 @@ OPCODE(0x2EFA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10062,7 +10080,7 @@ OPCODE(0x2F3A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10072,7 +10090,7 @@ OPCODE(0x2F3A)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(24)
 }
@@ -10083,7 +10101,7 @@ OPCODE(0x203B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10102,7 +10120,7 @@ OPCODE(0x20BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10122,7 +10140,7 @@ OPCODE(0x20FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10143,7 +10161,7 @@ OPCODE(0x213B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10164,7 +10182,7 @@ OPCODE(0x217B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10185,7 +10203,7 @@ OPCODE(0x21BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10206,7 +10224,7 @@ OPCODE(0x21FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10226,7 +10244,7 @@ OPCODE(0x23FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10246,7 +10264,7 @@ OPCODE(0x2EFB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10267,7 +10285,7 @@ OPCODE(0x2F3B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, res)
@@ -10277,7 +10295,7 @@ OPCODE(0x2F3B)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(26)
 }
@@ -10460,7 +10478,7 @@ OPCODE(0x2F3C)
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
 	PRE_IO
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(20)
 }
@@ -10665,7 +10683,7 @@ OPCODE(0x2F1F)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(20)
 }
@@ -10870,7 +10888,7 @@ OPCODE(0x2F27)
 	flag_N = res >> 24;
 	adr = AREG(7) - 4;
 	AREG(7) = adr;
-	WRITE_LONG_F(adr, res)
+	WRITE_LONG_DEC_F(adr, res)
 	POST_IO
 RET(22)
 }
@@ -11005,7 +11023,7 @@ OPCODE(0x207A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_LONG_F(adr, res)
@@ -11020,7 +11038,7 @@ OPCODE(0x207B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_LONG_F(adr, res)
@@ -12847,7 +12865,7 @@ OPCODE(0x303A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12866,7 +12884,7 @@ OPCODE(0x30BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12886,7 +12904,7 @@ OPCODE(0x30FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12907,7 +12925,7 @@ OPCODE(0x313A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12928,7 +12946,7 @@ OPCODE(0x317A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12949,7 +12967,7 @@ OPCODE(0x31BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12970,7 +12988,7 @@ OPCODE(0x31FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -12990,7 +13008,7 @@ OPCODE(0x33FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13010,7 +13028,7 @@ OPCODE(0x3EFA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13031,7 +13049,7 @@ OPCODE(0x3F3A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13052,7 +13070,7 @@ OPCODE(0x303B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13071,7 +13089,7 @@ OPCODE(0x30BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13091,7 +13109,7 @@ OPCODE(0x30FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13112,7 +13130,7 @@ OPCODE(0x313B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13133,7 +13151,7 @@ OPCODE(0x317B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13154,7 +13172,7 @@ OPCODE(0x31BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13175,7 +13193,7 @@ OPCODE(0x31FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13195,7 +13213,7 @@ OPCODE(0x33FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13215,7 +13233,7 @@ OPCODE(0x3EFB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13236,7 +13254,7 @@ OPCODE(0x3F3B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -13974,7 +13992,7 @@ OPCODE(0x307A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_WORD_F(adr, res)
@@ -13989,7 +14007,7 @@ OPCODE(0x307B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_WORD_F(adr, res)
@@ -16467,7 +16485,7 @@ OPCODE(0x44FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -16482,7 +16500,7 @@ OPCODE(0x44FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, res)
@@ -16552,9 +16570,7 @@ OPCODE(0x46C0)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(12)
@@ -16583,9 +16599,7 @@ OPCODE(0x46D0)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(16)
@@ -16615,9 +16629,7 @@ OPCODE(0x46D8)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(16)
@@ -16647,9 +16659,7 @@ OPCODE(0x46E0)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(18)
@@ -16679,9 +16689,7 @@ OPCODE(0x46E8)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(20)
@@ -16711,9 +16719,7 @@ OPCODE(0x46F0)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(22)
@@ -16743,9 +16749,7 @@ OPCODE(0x46F8)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(20)
@@ -16774,9 +16778,7 @@ OPCODE(0x46F9)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(24)
@@ -16790,7 +16792,7 @@ OPCODE(0x46FA)
 
 	if (flag_S)
 	{
-		adr = GET_SWORD + ((u32)(PC) - BasePC);
+		adr = GET_SWORD + GET_PC;
 		PC++;
 		PRE_IO
 		READ_WORD_F(adr, res)
@@ -16802,13 +16804,11 @@ OPCODE(0x46FA)
 			ASP = res;
 		}
 		POST_IO
-		CHECK_INT_TO_JUMP(24)
+		CHECK_INT_TO_JUMP(20)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(20)
@@ -16822,7 +16822,7 @@ OPCODE(0x46FB)
 
 	if (flag_S)
 	{
-		adr = (u32)(PC) - BasePC;
+		adr = GET_PC;
 		DECODE_EXT_WORD
 		PRE_IO
 		READ_WORD_F(adr, res)
@@ -16838,9 +16838,7 @@ OPCODE(0x46FB)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(22)
@@ -16866,9 +16864,7 @@ OPCODE(0x46FC)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(16)
@@ -16898,9 +16894,7 @@ OPCODE(0x46DF)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(16)
@@ -16930,9 +16924,7 @@ OPCODE(0x46E7)
 	}
 	else
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 RET(18)
@@ -17264,7 +17256,7 @@ OPCODE(0x487A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	PUSH_32_F(adr)
@@ -17278,7 +17270,7 @@ OPCODE(0x487B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	PUSH_32_F(adr)
@@ -18306,8 +18298,19 @@ OPCODE(0x4AD0)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(8)
+#endif
 }
 
 // TAS
@@ -18324,8 +18327,20 @@ OPCODE(0x4AD8)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(8)
+#endif
 }
 
 // TAS
@@ -18342,8 +18357,20 @@ OPCODE(0x4AE0)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(20)
+#else
 RET(10)
+#endif
 }
 
 // TAS
@@ -18360,8 +18387,20 @@ OPCODE(0x4AE8)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(22)
+#else
 RET(12)
+#endif
 }
 
 // TAS
@@ -18378,8 +18417,20 @@ OPCODE(0x4AF0)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(24)
+#else
 RET(14)
+#endif
 }
 
 // TAS
@@ -18395,8 +18446,20 @@ OPCODE(0x4AF8)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(22)
+#else
 RET(12)
+#endif
 }
 
 // TAS
@@ -18412,8 +18475,20 @@ OPCODE(0x4AF9)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(26)
+#else
 RET(16)
+#endif
 }
 
 // TAS
@@ -18430,8 +18505,20 @@ OPCODE(0x4ADF)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(8)
+#endif
 }
 
 // TAS
@@ -18448,35 +18535,41 @@ OPCODE(0x4AE7)
 	flag_V = 0;
 	flag_NotZ = res;
 	flag_N = res;
+
+#ifdef PICODRIVE_HACK
+	if (g_m68kcontext == &PicoCpuFS68k) {
+		res |= 0x80;
+		WRITE_BYTE_F(adr, res);
+	}
+#endif
+
 	POST_IO
-RET(10)
+#ifdef USE_CYCLONE_TIMING
+RET(20)
+#else
+RET(8)
+#endif
 }
 
 // ILLEGAL
 OPCODE(0x4AFC)
 {
-	u32 oldPC=GET_PC;
-	SET_PC(oldPC-2)
-	execute_exception(M68K_ILLEGAL_INSTRUCTION_EX);
-RET(4)
+	SET_PC(execute_exception(M68K_ILLEGAL_INSTRUCTION_EX, GET_PC-2, GET_SR));
+RET(0)
 }
 
 // ILLEGAL A000-AFFF
 OPCODE(0xA000)
 {
-	u32 oldPC=GET_PC;
-	SET_PC(oldPC-2)
-	execute_exception(M68K_1010_EX);
-RET(4)
+	SET_PC(execute_exception(M68K_1010_EX, GET_PC-2, GET_SR));
+RET(0)
 }
 
 // ILLEGAL F000-FFFF
 OPCODE(0xF000)
 {
-	u32 oldPC=GET_PC;
-	SET_PC(oldPC-2)
-	execute_exception(M68K_1111_EX);
-RET(4)
+	SET_PC(execute_exception(M68K_1111_EX, GET_PC-2, GET_SR));
+RET(0) // 4 already taken by exc. handler
 }
 
 // MOVEMaR
@@ -18673,7 +18766,7 @@ OPCODE(0x4CBA)
 	s32 *psrc;
 
 	FETCH_WORD(res);
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	psrc = &DREGs32(0);
 	dst = adr;
@@ -18705,7 +18798,7 @@ OPCODE(0x4CBB)
 	s32 *psrc;
 
 	FETCH_WORD(res);
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	psrc = &DREGs32(0);
 	dst = adr;
@@ -18950,7 +19043,7 @@ OPCODE(0x4CFA)
 	u32 *psrc;
 
 	FETCH_WORD(res);
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	psrc = &DREGu32(0);
 	dst = adr;
@@ -18982,7 +19075,7 @@ OPCODE(0x4CFB)
 	u32 *psrc;
 
 	FETCH_WORD(res);
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	psrc = &DREGu32(0);
 	dst = adr;
@@ -19036,7 +19129,7 @@ RET(12)
 // TRAP
 OPCODE(0x4E40)
 {
-	execute_exception(M68K_TRAP_BASE_EX + (Opcode & 0xF));
+	SET_PC(execute_exception(M68K_TRAP_BASE_EX + (Opcode & 0xF), GET_PC, GET_SR));
 RET(4)
 }
 
@@ -19107,9 +19200,7 @@ OPCODE(0x4E60)
 
 	if (!flag_S)
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 	res = AREGu32((Opcode >> 0) & 7);
@@ -19125,9 +19216,7 @@ OPCODE(0x4E68)
 
 	if (!flag_S)
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 	res = ASP;
@@ -19143,9 +19232,7 @@ OPCODE(0x4E70)
 
 	if (!flag_S)
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 	PRE_IO
@@ -19169,9 +19256,7 @@ OPCODE(0x4E72)
 
 	if (!flag_S)
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 	FETCH_WORD(res);
@@ -19183,9 +19268,8 @@ OPCODE(0x4E72)
 		AREG(7) = ASP;
 		ASP = res;
 	}
-	m68kcontext.execinfo |= M68K_HALTED;
-	m68kcontext.io_cycle_counter = 0;
-RET(4)
+	m68kcontext.execinfo |= FM68K_HALTED;
+RET0()
 }
 
 // RTE
@@ -19196,9 +19280,7 @@ OPCODE(0x4E73)
 
 	if (!flag_S)
 	{
-		u32 oldPC=GET_PC;
-		SET_PC(oldPC-2)
-		execute_exception(M68K_PRIVILEGE_VIOLATION_EX);
+		SET_PC(execute_exception(M68K_PRIVILEGE_VIOLATION_EX, GET_PC-2, GET_SR));
 		RET(4)
 	}
 	PRE_IO
@@ -19213,7 +19295,7 @@ OPCODE(0x4E73)
 		ASP = res;
 	}
 	POST_IO
-	m68kcontext.execinfo &= ~(M68K_EMULATE_GROUP_0|M68K_EMULATE_TRACE|M68K_DO_TRACE);
+	m68kcontext.execinfo &= ~(FM68K_EMULATE_GROUP_0|FM68K_EMULATE_TRACE|FM68K_DO_TRACE);
 	CHECK_INT_TO_JUMP(20)
 RET(20)
 }
@@ -19236,7 +19318,7 @@ RET(16)
 OPCODE(0x4E76)
 {
 	if (flag_V & 0x80)
-		execute_exception(M68K_TRAPV_EX);
+		SET_PC(execute_exception(M68K_TRAPV_EX, GET_PC, GET_SR));
 RET(4)
 }
 
@@ -19266,7 +19348,7 @@ OPCODE(0x4E90)
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19287,7 +19369,7 @@ OPCODE(0x4EA8)
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19308,7 +19390,7 @@ OPCODE(0x4EB0)
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19328,7 +19410,7 @@ OPCODE(0x4EB8)
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19348,7 +19430,7 @@ OPCODE(0x4EB9)
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19364,12 +19446,12 @@ OPCODE(0x4EBA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19385,12 +19467,12 @@ OPCODE(0x4EBB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	{
 		u32 oldPC;
 
-		oldPC = (u32)(PC) - BasePC;
+		oldPC = GET_PC;
 	PRE_IO
 		PUSH_32_F(oldPC)
 	}
@@ -19468,7 +19550,7 @@ OPCODE(0x4EFA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	SET_PC(adr)
 	CHECK_BRANCH_EXCEPTION(adr)
@@ -19481,7 +19563,7 @@ OPCODE(0x4EFB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	SET_PC(adr)
 	CHECK_BRANCH_EXCEPTION(adr)
@@ -19499,7 +19581,7 @@ OPCODE(0x4180)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 RET(10)
 }
@@ -19517,7 +19599,7 @@ OPCODE(0x4190)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(14)
@@ -19537,7 +19619,7 @@ OPCODE(0x4198)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(14)
@@ -19557,7 +19639,7 @@ OPCODE(0x41A0)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(16)
@@ -19577,7 +19659,7 @@ OPCODE(0x41A8)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(18)
@@ -19597,7 +19679,7 @@ OPCODE(0x41B0)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(20)
@@ -19616,7 +19698,7 @@ OPCODE(0x41B8)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(18)
@@ -19635,7 +19717,7 @@ OPCODE(0x41B9)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(22)
@@ -19647,7 +19729,7 @@ OPCODE(0x41BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -19655,7 +19737,7 @@ OPCODE(0x41BA)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(18)
@@ -19667,7 +19749,7 @@ OPCODE(0x41BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -19675,7 +19757,7 @@ OPCODE(0x41BB)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(20)
@@ -19692,7 +19774,7 @@ OPCODE(0x41BC)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(14)
@@ -19712,7 +19794,7 @@ OPCODE(0x419F)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(14)
@@ -19732,7 +19814,7 @@ OPCODE(0x41A7)
 	if (((s32)res < 0) || (res > src))
 	{
 		flag_N = res >> 8;
-		execute_exception(M68K_CHK_EX);
+		SET_PC(execute_exception(M68K_CHK_EX, GET_PC, GET_SR));
 	}
 	POST_IO
 RET(16)
@@ -19806,7 +19888,7 @@ OPCODE(0x41FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	res = adr;
 	AREG((Opcode >> 9) & 7) = res;
@@ -19819,7 +19901,7 @@ OPCODE(0x41FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	res = adr;
 	AREG((Opcode >> 9) & 7) = res;
@@ -23222,6 +23304,8 @@ OPCODE(0x51C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	res = DREGu16((Opcode >> 0) & 7);
 	res--;
 	DREGu16((Opcode >> 0) & 7) = res;
@@ -23229,7 +23313,7 @@ OPCODE(0x51C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23245,6 +23329,8 @@ OPCODE(0x52C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if ((!flag_NotZ) || (flag_C & 0x100))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23254,7 +23340,7 @@ OPCODE(0x52C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23276,6 +23362,8 @@ OPCODE(0x53C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (flag_NotZ && (!(flag_C & 0x100)))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23285,7 +23373,7 @@ OPCODE(0x53C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23307,6 +23395,8 @@ OPCODE(0x54C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (flag_C & 0x100)
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23316,7 +23406,7 @@ OPCODE(0x54C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23338,6 +23428,8 @@ OPCODE(0x55C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (!(flag_C & 0x100))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23347,7 +23439,7 @@ OPCODE(0x55C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23369,6 +23461,8 @@ OPCODE(0x56C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (!flag_NotZ)
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23378,7 +23472,7 @@ OPCODE(0x56C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23400,6 +23494,8 @@ OPCODE(0x57C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (flag_NotZ)
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23409,7 +23505,7 @@ OPCODE(0x57C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23431,6 +23527,8 @@ OPCODE(0x58C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (flag_V & 0x80)
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23440,7 +23538,7 @@ OPCODE(0x58C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23462,6 +23560,8 @@ OPCODE(0x59C8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (!(flag_V & 0x80))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23471,7 +23571,7 @@ OPCODE(0x59C8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23493,6 +23593,8 @@ OPCODE(0x5AC8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (flag_N & 0x80)
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23502,7 +23604,7 @@ OPCODE(0x5AC8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23524,6 +23626,8 @@ OPCODE(0x5BC8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (!(flag_N & 0x80))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23533,7 +23637,7 @@ OPCODE(0x5BC8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23555,6 +23659,8 @@ OPCODE(0x5CC8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if ((flag_N ^ flag_V) & 0x80)
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23564,7 +23670,7 @@ OPCODE(0x5CC8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23586,6 +23692,8 @@ OPCODE(0x5DC8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (!((flag_N ^ flag_V) & 0x80))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23595,7 +23703,7 @@ OPCODE(0x5DC8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23617,6 +23725,8 @@ OPCODE(0x5EC8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if ((!flag_NotZ) || ((flag_N ^ flag_V) & 0x80))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23626,7 +23736,7 @@ OPCODE(0x5EC8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23648,6 +23758,8 @@ OPCODE(0x5FC8)
 	u32 adr, res;
 	u32 src, dst;
 
+	NOT_POLLING
+
 	if (flag_NotZ && (!((flag_N ^ flag_V) & 0x80)))
 	{
 	res = DREGu16((Opcode >> 0) & 7);
@@ -23657,7 +23769,7 @@ OPCODE(0x5FC8)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -23892,7 +24004,7 @@ OPCODE(0x5048)
 	dst = AREGu32((Opcode >> 0) & 7);
 	res = dst + src;
 	AREG((Opcode >> 0) & 7) = res;
-#ifdef USE_CYCLONE_TIMING_ // breaks Project-X
+#ifdef USE_CYCLONE_TIMING
 RET(4)
 #else
 RET(8)
@@ -25113,7 +25225,7 @@ OPCODE(0x6200)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25133,7 +25245,7 @@ OPCODE(0x6300)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25153,7 +25265,7 @@ OPCODE(0x6400)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25173,7 +25285,7 @@ OPCODE(0x6500)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25193,7 +25305,7 @@ OPCODE(0x6600)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25213,7 +25325,7 @@ OPCODE(0x6700)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25233,7 +25345,7 @@ OPCODE(0x6800)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25253,7 +25365,7 @@ OPCODE(0x6900)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25273,7 +25385,7 @@ OPCODE(0x6A00)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25293,7 +25405,7 @@ OPCODE(0x6B00)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25313,7 +25425,7 @@ OPCODE(0x6C00)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25333,7 +25445,7 @@ OPCODE(0x6D00)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25353,7 +25465,7 @@ OPCODE(0x6E00)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25373,7 +25485,7 @@ OPCODE(0x6F00)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25387,7 +25499,7 @@ RET(12)
 OPCODE(0x6001)
 {
 #ifdef FAMEC_CHECK_BRANCHES
-	u32 newPC = (u32)(PC) - BasePC;
+	u32 newPC = GET_PC;
 	s8 offs=Opcode;
 	newPC += offs;
 	SET_PC(newPC);
@@ -25407,7 +25519,7 @@ OPCODE(0x6000)
 	{
 		u32 newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		newPC += GET_SWORD;
 		SET_PC(newPC);
 		CHECK_BRANCH_EXCEPTION(newPC)
@@ -25425,7 +25537,7 @@ OPCODE(0x6101)
 
 	PRE_IO
 
-	oldPC = (u32)(PC) - BasePC;
+	oldPC = GET_PC;
 	PUSH_32_F(oldPC)
 #ifdef FAMEC_CHECK_BRANCHES
 	offs = Opcode;
@@ -25449,7 +25561,7 @@ OPCODE(0x6100)
 	{
 		u32 oldPC, newPC;
 
-		newPC = (u32)(PC) - BasePC;
+		newPC = GET_PC;
 		oldPC = newPC + 2;
 		PUSH_32_F(oldPC)
 		newPC += GET_SWORD;
@@ -25640,7 +25752,7 @@ OPCODE(0x803A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -25661,7 +25773,7 @@ OPCODE(0x803B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -25902,7 +26014,7 @@ OPCODE(0x807A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -25923,7 +26035,7 @@ OPCODE(0x807B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -26164,7 +26276,7 @@ OPCODE(0x80BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -26185,7 +26297,7 @@ OPCODE(0x80BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -26965,7 +27077,7 @@ OPCODE(0x80C0)
 	src = DREGu16((Opcode >> 0) & 7);
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(140)
 #else
@@ -27013,7 +27125,7 @@ OPCODE(0x80D0)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(144)
 #else
@@ -27062,7 +27174,7 @@ OPCODE(0x80D8)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(144)
 #else
@@ -27111,7 +27223,7 @@ OPCODE(0x80E0)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(146)
 #else
@@ -27160,7 +27272,7 @@ OPCODE(0x80E8)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(148)
 #else
@@ -27209,7 +27321,7 @@ OPCODE(0x80F0)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(150)
 #else
@@ -27257,7 +27369,7 @@ OPCODE(0x80F8)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(148)
 #else
@@ -27305,7 +27417,7 @@ OPCODE(0x80F9)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(162)
 #else
@@ -27348,13 +27460,13 @@ OPCODE(0x80FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(148)
 #else
@@ -27397,13 +27509,13 @@ OPCODE(0x80FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(160)
 #else
@@ -27449,7 +27561,7 @@ OPCODE(0x80FC)
 	FETCH_WORD(src);
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(144)
 #else
@@ -27498,7 +27610,7 @@ OPCODE(0x80DF)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(144)
 #else
@@ -27547,7 +27659,7 @@ OPCODE(0x80E7)
 	READ_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 RET(146)
 #else
@@ -27593,7 +27705,7 @@ OPCODE(0x81C0)
 	src = (s32)DREGs16((Opcode >> 0) & 7);
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81C0;
 #endif
@@ -27649,7 +27761,7 @@ OPCODE(0x81D0)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81D0;
 #endif
@@ -27706,7 +27818,7 @@ OPCODE(0x81D8)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81D8;
 #endif
@@ -27763,7 +27875,7 @@ OPCODE(0x81E0)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81E0;
 #endif
@@ -27820,7 +27932,7 @@ OPCODE(0x81E8)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81E8;
 #endif
@@ -27877,7 +27989,7 @@ OPCODE(0x81F0)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81F0;
 #endif
@@ -27933,7 +28045,7 @@ OPCODE(0x81F8)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81F8;
 #endif
@@ -27989,7 +28101,7 @@ OPCODE(0x81F9)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81F9;
 #endif
@@ -28040,13 +28152,13 @@ OPCODE(0x81FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81FA;
 #endif
@@ -28097,13 +28209,13 @@ OPCODE(0x81FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81FB;
 #endif
@@ -28157,7 +28269,7 @@ OPCODE(0x81FC)
 	FETCH_SWORD(src);
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81FC;
 #endif
@@ -28214,7 +28326,7 @@ OPCODE(0x81DF)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81DF;
 #endif
@@ -28271,7 +28383,7 @@ OPCODE(0x81E7)
 	READSX_WORD_F(adr, src)
 	if (src == 0)
 	{
-		execute_exception(M68K_ZERO_DIVIDE_EX);
+		SET_PC(execute_exception(M68K_ZERO_DIVIDE_EX, GET_PC, GET_SR));
 #ifdef USE_CYCLONE_TIMING_DIV
 goto end81E7;
 #endif
@@ -28333,6 +28445,7 @@ RET(4)
 }
 
 // SUBaD
+#if 0
 OPCODE(0x9008)
 {
 	u32 adr, res;
@@ -28352,6 +28465,7 @@ OPCODE(0x9008)
 */
 RET(4)
 }
+#endif
 
 // SUBaD
 OPCODE(0x9010)
@@ -28496,7 +28610,7 @@ OPCODE(0x903A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -28516,7 +28630,7 @@ OPCODE(0x903B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -28761,7 +28875,7 @@ OPCODE(0x907A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -28781,7 +28895,7 @@ OPCODE(0x907B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -29035,7 +29149,7 @@ OPCODE(0x90BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -29056,7 +29170,7 @@ OPCODE(0x90BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -30026,7 +30140,11 @@ OPCODE(0x90D0)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // SUBA
@@ -30043,7 +30161,11 @@ OPCODE(0x90D8)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // SUBA
@@ -30060,7 +30182,11 @@ OPCODE(0x90E0)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(14)
+#else
 RET(12)
+#endif
 }
 
 // SUBA
@@ -30077,7 +30203,11 @@ OPCODE(0x90E8)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // SUBA
@@ -30094,7 +30224,11 @@ OPCODE(0x90F0)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(16)
+#endif
 }
 
 // SUBA
@@ -30110,7 +30244,11 @@ OPCODE(0x90F8)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // SUBA
@@ -30126,7 +30264,11 @@ OPCODE(0x90F9)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(20)
+#else
 RET(18)
+#endif
 }
 
 // SUBA
@@ -30135,7 +30277,7 @@ OPCODE(0x90FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -30143,7 +30285,11 @@ OPCODE(0x90FA)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // SUBA
@@ -30152,7 +30298,7 @@ OPCODE(0x90FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -30160,7 +30306,11 @@ OPCODE(0x90FB)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(16)
+#endif
 }
 
 // SUBA
@@ -30190,7 +30340,11 @@ OPCODE(0x90DF)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // SUBA
@@ -30207,7 +30361,11 @@ OPCODE(0x90E7)
 	res = dst - src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(14)
+#else
 RET(12)
+#endif
 }
 
 // SUBA
@@ -30366,7 +30524,7 @@ OPCODE(0x91FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_LONG_F(adr, src)
@@ -30383,7 +30541,7 @@ OPCODE(0x91FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_LONG_F(adr, src)
@@ -30461,6 +30619,7 @@ RET(4)
 }
 
 // CMP
+#if 0
 OPCODE(0xB008)
 {
 	u32 adr, res;
@@ -30479,6 +30638,7 @@ OPCODE(0xB008)
 */
 RET(4)
 }
+#endif
 
 // CMP
 OPCODE(0xB010)
@@ -30616,7 +30776,7 @@ OPCODE(0xB03A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -30635,7 +30795,7 @@ OPCODE(0xB03B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -30867,7 +31027,7 @@ OPCODE(0xB07A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -30886,7 +31046,7 @@ OPCODE(0xB07B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -31127,7 +31287,7 @@ OPCODE(0xB0BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -31147,7 +31307,7 @@ OPCODE(0xB0BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -32257,7 +32417,7 @@ OPCODE(0xB0FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -32277,7 +32437,7 @@ OPCODE(0xB0FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -32522,7 +32682,7 @@ OPCODE(0xB1FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_LONG_F(adr, src)
@@ -32542,7 +32702,7 @@ OPCODE(0xB1FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_LONG_F(adr, src)
@@ -32779,7 +32939,7 @@ OPCODE(0xC03A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -32800,7 +32960,7 @@ OPCODE(0xC03B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -33041,7 +33201,7 @@ OPCODE(0xC07A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -33062,7 +33222,7 @@ OPCODE(0xC07B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -33303,7 +33463,7 @@ OPCODE(0xC0BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -33324,7 +33484,7 @@ OPCODE(0xC0BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -34286,7 +34446,7 @@ OPCODE(0xC0FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -34310,7 +34470,7 @@ OPCODE(0xC0FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -34587,7 +34747,7 @@ OPCODE(0xC1FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -34611,7 +34771,7 @@ OPCODE(0xC1FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -34756,6 +34916,7 @@ RET(4)
 }
 
 // ADDaD
+#if 0
 OPCODE(0xD008)
 {
 	u32 adr, res;
@@ -34775,6 +34936,7 @@ OPCODE(0xD008)
 */
 RET(4)
 }
+#endif
 
 // ADDaD
 OPCODE(0xD010)
@@ -34919,7 +35081,7 @@ OPCODE(0xD03A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -34939,7 +35101,7 @@ OPCODE(0xD03B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_BYTE_F(adr, src)
@@ -35184,7 +35346,7 @@ OPCODE(0xD07A)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -35204,7 +35366,7 @@ OPCODE(0xD07B)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_WORD_F(adr, src)
@@ -35458,7 +35620,7 @@ OPCODE(0xD0BA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -35479,7 +35641,7 @@ OPCODE(0xD0BB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READ_LONG_F(adr, src)
@@ -36449,7 +36611,11 @@ OPCODE(0xD0D0)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // ADDA
@@ -36466,7 +36632,11 @@ OPCODE(0xD0D8)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // ADDA
@@ -36483,7 +36653,11 @@ OPCODE(0xD0E0)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(14)
+#else
 RET(12)
+#endif
 }
 
 // ADDA
@@ -36500,7 +36674,11 @@ OPCODE(0xD0E8)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // ADDA
@@ -36517,7 +36695,11 @@ OPCODE(0xD0F0)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(16)
+#endif
 }
 
 // ADDA
@@ -36533,7 +36715,11 @@ OPCODE(0xD0F8)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // ADDA
@@ -36549,7 +36735,11 @@ OPCODE(0xD0F9)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(20)
+#else
 RET(18)
+#endif
 }
 
 // ADDA
@@ -36558,7 +36748,7 @@ OPCODE(0xD0FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -36566,7 +36756,11 @@ OPCODE(0xD0FA)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(16)
+#else
 RET(14)
+#endif
 }
 
 // ADDA
@@ -36575,7 +36769,7 @@ OPCODE(0xD0FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_WORD_F(adr, src)
@@ -36583,7 +36777,11 @@ OPCODE(0xD0FB)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(18)
+#else
 RET(16)
+#endif
 }
 
 // ADDA
@@ -36613,7 +36811,11 @@ OPCODE(0xD0DF)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(12)
+#else
 RET(10)
+#endif
 }
 
 // ADDA
@@ -36630,7 +36832,11 @@ OPCODE(0xD0E7)
 	res = dst + src;
 	AREG((Opcode >> 9) & 7) = res;
 	POST_IO
+#ifdef USE_CYCLONE_TIMING
+RET(14)
+#else
 RET(12)
+#endif
 }
 
 // ADDA
@@ -36789,7 +36995,7 @@ OPCODE(0xD1FA)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = GET_SWORD + ((u32)(PC) - BasePC);
+	adr = GET_SWORD + GET_PC;
 	PC++;
 	PRE_IO
 	READSX_LONG_F(adr, src)
@@ -36806,7 +37012,7 @@ OPCODE(0xD1FB)
 	u32 adr, res;
 	u32 src, dst;
 
-	adr = (u32)(PC) - BasePC;
+	adr = GET_PC;
 	DECODE_EXT_WORD
 	PRE_IO
 	READSX_LONG_F(adr, src)
@@ -39790,3 +39996,98 @@ OPCODE(0xE7E7)
 RET(14)
 }
 
+#ifdef PICODRIVE_HACK
+#if 0
+#define UPDATE_IDLE_COUNT { \
+	extern int idle_hit_counter; \
+	idle_hit_counter++; \
+}
+#else
+#define UPDATE_IDLE_COUNT
+#endif
+
+// BRA
+OPCODE(0x6001_idle)
+{
+#ifdef FAMEC_CHECK_BRANCHES
+	u32 newPC = GET_PC;
+	s8 offs=Opcode;
+	newPC += offs;
+	SET_PC(newPC);
+	CHECK_BRANCH_EXCEPTION(offs)
+#else
+	PC += ((s8)(Opcode & 0xFE)) >> 1;
+#endif
+	UPDATE_IDLE_COUNT
+RET0()
+}
+
+// BCC
+OPCODE(0x6601_idle)
+{
+	if (flag_NotZ)
+	{
+		UPDATE_IDLE_COUNT
+		PC += ((s8)(Opcode & 0xFE)) >> 1;
+		//if (idle_hit)
+		RET0()
+	}
+RET(8)
+}
+
+OPCODE(0x6701_idle)
+{
+	if (!flag_NotZ)
+	{
+		UPDATE_IDLE_COUNT
+		PC += ((s8)(Opcode & 0xFE)) >> 1;
+		//if (idle_hit)
+		RET0()
+	}
+RET(8)
+}
+
+
+extern int SekIsIdleReady(void);
+extern int SekIsIdleCode(unsigned short *dst, int bytes);
+extern int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx);
+
+OPCODE(idle_detector_bcc8)
+{
+	int frame_count, cond_true, bytes, ret, newop;
+	u16 *dest_pc;
+
+	dest_pc = PC + (((s8)(Opcode & 0xFE)) >> 1);
+
+	if (!SekIsIdleReady())
+		goto end;
+
+	bytes = 0 - (s8)(Opcode & 0xFE) - 2;
+	ret = SekIsIdleCode(dest_pc, bytes);
+	newop = (Opcode & 0xfe) | 0x7100;
+	if (!ret) newop |= 0x200;
+	if (  Opcode & 0x0100)  newop |= 0x400; // beq
+	if (!(Opcode & 0x0f00)) newop |= 0xc00; // bra
+
+	ret = SekRegisterIdlePatch(GET_PC - 2, Opcode, newop, &m68kcontext);
+	switch (ret)
+	{
+		case 0: PC[-1] = newop; break;
+		case 1: break;
+		case 2: JumpTable[Opcode] = (Opcode & 0x0f00) ?
+				((Opcode & 0x0100) ? CAST_OP(0x6701) : CAST_OP(0x6601)) :
+				CAST_OP(0x6001); break;
+	}
+
+end:
+	if ((Opcode & 0xff00) == 0x6000) cond_true = 1;
+	else cond_true = (Opcode & 0x0100) ? !flag_NotZ : flag_NotZ; // beq?
+	if (cond_true)
+	{
+		PC = dest_pc;
+		m68kcontext.io_cycle_counter -= 2;
+	}
+RET(8)
+}
+
+#endif // PICODRIVE_HACK