X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=e5bbffdbd15915d27c4f749d283f3512dfa5e522;hb=07ceafdb04502be69d06c3b54437fd4e8b88dfbe;hp=9630399abfd28e2377986329197a1852c5b2d3e7;hpb=7b3f44c6b677a60b63b092f825a2b6c58166b70c;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 9630399..e5bbffd 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -41,10 +41,8 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
 	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)
-#define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c
-#define SekSetCyclesLeft(c) { \
-	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
-}
+#define SekEndTimeslice(after) PicoCpuCM68k.cycles=after
+#define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after
 #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }
@@ -67,10 +65,8 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
 	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter)
-#define SekSetCyclesLeftNoMCD(c) PicoCpuFM68k.io_cycle_counter=c
-#define SekSetCyclesLeft(c) { \
-	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
-}
+#define SekEndTimeslice(after) PicoCpuFM68k.io_cycle_counter=after
+#define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after
 #define SekPc     fm68k_get_pc(&PicoCpuFM68k)
 #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)
 #define SekSetStop(x) { \
@@ -100,10 +96,8 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
 	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles)
-#define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c)
-#define SekSetCyclesLeft(c) { \
-	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \
-}
+#define SekEndTimeslice(after) SET_CYCLES(after)
+#define SekEndTimesliceS68k(after) PicoCpuMS68k.cyc_remaining_cycles=after
 #define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)
 #define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)
 #define SekSetStop(x) { \
@@ -125,7 +119,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 }
 
 #endif
-#endif
+#endif // EMU_M68K
 
 extern int SekCycleCnt; // cycles done in this frame
 extern int SekCycleAim; // cycle aim
@@ -141,9 +135,15 @@ extern unsigned int SekCycleCntT; // total cycle counter, updated once per frame
 #define SekCyclesDoneT() (SekCycleCntT+SekCyclesDone()) // total nuber of cycles done for this rom
 
 #define SekEndRun(after) { \
-	SekCycleCnt -= SekCyclesLeft - after; \
-	if(SekCycleCnt < 0) SekCycleCnt = 0; \
-	SekSetCyclesLeft(after); \
+	SekCycleCnt -= SekCyclesLeft - (after); \
+	if (SekCycleCnt < 0) SekCycleCnt = 0; \
+	SekEndTimeslice(after); \
+}
+
+#define SekEndRunS68k(after) { \
+	SekCycleCntS68k -= SekCyclesLeftS68k - (after); \
+	if (SekCycleCntS68k < 0) SekCycleCntS68k = 0; \
+	SekEndTimesliceS68k(after); \
 }
 
 extern int SekCycleCntS68k;
@@ -157,13 +157,11 @@ extern int SekCycleAimS68k;
 
 #ifdef EMU_CORE_DEBUG
 extern int dbg_irq_level;
-#undef SekSetCyclesLeftNoMCD
-#undef SekSetCyclesLeft
+#undef SekEndTimeslice
 #undef SekCyclesBurn
 #undef SekEndRun
 #undef SekInterrupt
-#define SekSetCyclesLeftNoMCD(c)
-#define SekSetCyclesLeft(c)
+#define SekEndTimeslice(c)
 #define SekCyclesBurn(c) c
 #define SekEndRun(c)
 #define SekInterrupt(irq) dbg_irq_level=irq
@@ -325,7 +323,7 @@ struct mcd_misc
 	unsigned short hint_vector;
 	unsigned char  busreq;
 	unsigned char  s68k_pend_ints;
-	unsigned int   state_flags;	// 04: emu state: reset_pending, dmna_pending
+	unsigned int   state_flags;	// 04: emu state: reset_pending
 	unsigned int   counter75hz;
 	unsigned int   pad0;
 	int            timer_int3;	// 10
@@ -388,6 +386,17 @@ typedef struct {
 extern carthw_state_chunk *carthw_chunks;
 #define CHUNK_CARTHW 64
 
+// area.c
+typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);
+typedef size_t (areaeof)(void *file);
+typedef int    (areaseek)(void *file, long offset, int whence);
+typedef int    (areaclose)(void *file);
+extern arearw  *areaRead;  // external read and write function pointers for
+extern arearw  *areaWrite; // gzip save state ability
+extern areaeof *areaEof;
+extern areaseek *areaSeek;
+extern areaclose *areaClose;
+
 // Cart.c
 extern void (*PicoCartUnloadHook)(void);