X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=9aead10701059351c5053b915a9f74a843fb9e0d;hb=9d917eea21607c7c239d4b0cd850d660c0c8e4c5;hp=a9720c86037b130eac6bd1f1b296e927f0af33ca;hpb=3aa1e148a28da9b4e10e824984f7b3a4908b1ace;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index a9720c8..9aead10 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -48,6 +48,10 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }
+#define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))
+#ifdef EMU_M68K
+#define EMU_CORE_DEBUG
+#endif
 #endif
 
 #ifdef EMU_F68K
@@ -62,16 +66,20 @@ M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #define SekSetCyclesLeft(c) { \
 	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
 }
-#define SekPc     m68k_get_pc(&PicoCpuFM68k)
-#define SekPcS68k m68k_get_pc(&PicoCpuFS68k)
+#define SekPc     fm68k_get_pc(&PicoCpuFM68k)
+#define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)
 #define SekSetStop(x) { \
-	PicoCpuFM68k.execinfo &= ~M68K_HALTED; \
-	if (x) { PicoCpuFM68k.execinfo |= M68K_HALTED; PicoCpuFM68k.io_cycle_counter = 0; } \
+	PicoCpuFM68k.execinfo &= ~FM68K_HALTED; \
+	if (x) { PicoCpuFM68k.execinfo |= FM68K_HALTED; PicoCpuFM68k.io_cycle_counter = 0; } \
 }
 #define SekSetStopS68k(x) { \
-	PicoCpuFS68k.execinfo &= ~M68K_HALTED; \
-	if (x) { PicoCpuFS68k.execinfo |= M68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \
+	PicoCpuFS68k.execinfo &= ~FM68K_HALTED; \
+	if (x) { PicoCpuFS68k.execinfo |= FM68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \
 }
+#define SekShouldInterrupt fm68k_would_interrupt()
+#ifdef EMU_M68K
+#define EMU_CORE_DEBUG
+#endif
 #endif
 
 #ifdef EMU_M68K
@@ -97,6 +105,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 	if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \
 	else PicoCpuMS68k.stopped=0; \
 }
+#define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)
 #endif
 #endif
 
@@ -128,8 +137,7 @@ extern int SekCycleAimS68k;
 }
 #define SekCyclesDoneS68k()  (SekCycleAimS68k-SekCyclesLeftS68k)
 
-// debug cyclone
-#if defined(EMU_C68K) && defined(EMU_M68K)
+#ifdef EMU_CORE_DEBUG
 #undef SekSetCyclesLeftNoMCD
 #undef SekSetCyclesLeft
 #undef SekCyclesBurn
@@ -304,6 +312,9 @@ PICO_INTERNAL int PicoCdLoadState(void *file);
 // Cart.c
 PICO_INTERNAL void PicoCartDetect(void);
 
+// Debug.c
+int CM_compareRun(int cyc);
+
 // Draw.c
 PICO_INTERNAL int PicoLine(int scan);
 PICO_INTERNAL void PicoFrameStart(void);
@@ -313,14 +324,18 @@ PICO_INTERNAL void PicoFrameFull();
 
 // Memory.c
 PICO_INTERNAL int PicoInitPc(unsigned int pc);
-PICO_INTERNAL_ASM unsigned int CPU_CALL PicoRead32(unsigned int a);
+PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);
 PICO_INTERNAL void PicoMemSetup(void);
 PICO_INTERNAL_ASM void PicoMemReset(void);
 PICO_INTERNAL int PadRead(int i);
 PICO_INTERNAL unsigned char z80_read(unsigned short a);
-PICO_INTERNAL unsigned short z80_read16(unsigned short a);
+#ifndef _USE_CZ80
 PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a);
 PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a);
+PICO_INTERNAL unsigned short z80_read16(unsigned short a);
+#else
+PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data);
+#endif
 
 // cd/Memory.c
 PICO_INTERNAL void PicoMemSetupCD(void);
@@ -377,10 +392,10 @@ PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);
 PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba);
 
 // sound/sound.c
-PICO_INTERNAL void sound_reset(void);
-PICO_INTERNAL void sound_timers_and_dac(int raster);
-PICO_INTERNAL int  sound_render(int offset, int length);
-PICO_INTERNAL void sound_clear(void);
+PICO_INTERNAL void PsndReset(void);
+PICO_INTERNAL void Psnd_timers_and_dac(int raster);
+PICO_INTERNAL int  PsndRender(int offset, int length);
+PICO_INTERNAL void PsndClear(void);
 // z80 functionality wrappers
 PICO_INTERNAL void z80_init(void);
 PICO_INTERNAL void z80_resetCycles(void);