X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fcz80%2Fcz80.c;h=091e2a5f9dd2474fe07461b5329901ba2883d384;hb=4c67e7ad99a5891340f92eb86f0d24e0975eca90;hp=d7bdba3bb61bdf16ba7a7ff37bb5289d3e69041a;hpb=10d84cb2757db05bf7d66ef33575c52ed4b22053;p=picodrive.git

diff --git a/cpu/cz80/cz80.c b/cpu/cz80/cz80.c
index d7bdba3..091e2a5 100644
--- a/cpu/cz80/cz80.c
+++ b/cpu/cz80/cz80.c
@@ -15,7 +15,7 @@
 
 #if PICODRIVE_HACKS
 #undef EMU_M68K
-#include <Pico/PicoInt.h>
+#include <pico/pico_int.h>
 #endif
 
 #ifndef ALIGN_DATA
@@ -219,7 +219,10 @@ void Cz80_Reset(cz80_struc *CPU)
 #if PICODRIVE_HACKS
 static inline unsigned char picodrive_read(unsigned short a)
 {
-	return (a < 0x4000) ? Pico.zram[a&0x1fff] : z80_read(a);
+	unsigned long v = z80_read_map[a >> Z80_MEM_SHIFT];
+	if (v & 0x80000000)
+		return ((z80_read_f *)(v << 1))(a);
+	return *(unsigned char *)((v << 1) + a);
 }
 #endif
 
@@ -242,6 +245,7 @@ INT32 Cz80_Exec(cz80_struc *CPU, INT32 cycles)
 	UINT32 res;
 	UINT32 val;
 	int afterEI = 0;
+	union16 *data;
 
 	PC = CPU->PC;
 #if CZ80_ENCRYPTED_ROM
@@ -255,7 +259,8 @@ INT32 Cz80_Exec(cz80_struc *CPU, INT32 cycles)
 Cz80_Exec:
 		if (CPU->ICount > 0)
 		{
-			union16 *data = pzHL;
+Cz80_Exec_nocheck:
+			data = pzHL;
 			Opcode = READ_OP();
 #if CZ80_EMULATE_R_EXACTLY
 			zR++;
@@ -270,6 +275,8 @@ Cz80_Check_Interrupt:
 			if (CPU->IRQState != CLEAR_LINE)
 			{
 				CHECK_INT
+				CPU->ICount -= CPU->ExtraCycles;
+				CPU->ExtraCycles = 0;
 			}
 			goto Cz80_Exec;
 		}