svp compiler, early stage, works

[picodrive.git] / Pico / PicoInt.h

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index 9aead10..b503330 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -13,6 +13,7 @@
 #include <stdlib.h>\r
 #include <string.h>\r
 #include "Pico.h"\r
+#include "carthw/carthw.h"\r
 \r
 //\r
 #define USE_POLL_DETECT\r
@@ -48,7 +49,11 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)\r
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }\r
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }\r
+#define SekIsStoppedS68k() (PicoCpuCS68k.state_flags&1)\r
 #define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))\r
+\r
+#define SekInterrupt(i) PicoCpuCM68k.irq=i\r
+\r
 #ifdef EMU_M68K\r
 #define EMU_CORE_DEBUG\r
 #endif\r
@@ -56,7 +61,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 \r
 #ifdef EMU_F68K\r
 #include "../cpu/fame/fame.h"\r
-M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;\r
+extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;\r
 #define SekCyclesLeftNoMCD PicoCpuFM68k.io_cycle_counter\r
 #define SekCyclesLeft \\r
        (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
@@ -76,7 +81,11 @@ M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
        PicoCpuFS68k.execinfo &= ~FM68K_HALTED; \\r
        if (x) { PicoCpuFS68k.execinfo |= FM68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \\r
 }\r
+#define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)\r
 #define SekShouldInterrupt fm68k_would_interrupt()\r
+\r
+#define SekInterrupt(irq) PicoCpuFM68k.interrupts[0]=irq\r
+\r
 #ifdef EMU_M68K\r
 #define EMU_CORE_DEBUG\r
 #endif\r
@@ -105,7 +114,16 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
        if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \\r
        else PicoCpuMS68k.stopped=0; \\r
 }\r
+#define SekIsStoppedS68k() (PicoCpuMS68k.stopped==STOP_LEVEL_STOP)\r
 #define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)\r
+\r
+#define SekInterrupt(irq) { \\r
+       void *oldcontext = m68ki_cpu_p; \\r
+       m68k_set_context(&PicoCpuMM68k); \\r
+       m68k_set_irq(irq); \\r
+       m68k_set_context(oldcontext); \\r
+}\r
+\r
 #endif\r
 #endif\r
 \r
@@ -148,6 +166,46 @@ extern int SekCycleAimS68k;
 #define SekEndRun(c)\r
 #endif\r
 \r
+// ----------------------- Z80 CPU -----------------------\r
+\r
+#if defined(_USE_MZ80)\r
+#include "../cpu/mz80/mz80.h"\r
+\r
+#define z80_run(cycles)    mz80_run(cycles)\r
+#define z80_run_nr(cycles) mz80_run(cycles)\r
+#define z80_int()          mz80int(0)\r
+#define z80_resetCycles()  mz80GetElapsedTicks(1)\r
+\r
+#elif defined(_USE_DRZ80)\r
+#include "../cpu/DrZ80/drz80.h"\r
+\r
+extern struct DrZ80 drZ80;\r
+\r
+#define z80_run(cycles)    ((cycles) - DrZ80Run(&drZ80, cycles))\r
+#define z80_run_nr(cycles) DrZ80Run(&drZ80, cycles)\r
+#define z80_int() { \\r
+  drZ80.z80irqvector = 0xFF; /* default IRQ vector RST opcode */ \\r
+  drZ80.Z80_IRQ = 1; \\r
+}\r
+#define z80_resetCycles()\r
+\r
+#elif defined(_USE_CZ80)\r
+#include "../cpu/cz80/cz80.h"\r
+\r
+#define z80_run(cycles)    Cz80_Exec(&CZ80, cycles)\r
+#define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles)\r
+#define z80_int()          Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE)\r
+#define z80_resetCycles()\r
+\r
+#else\r
+\r
+#define z80_run(cycles)    (cycles)\r
+#define z80_run_nr(cycles)\r
+#define z80_int()\r
+#define z80_resetCycles()\r
+\r
+#endif\r
+\r
 // ---------------------------------------------------------\r
 \r
 extern int PicoMCD;\r
@@ -277,10 +335,10 @@ typedef struct
        union {                                         // 0a0000: 256K\r
                struct {\r
                        unsigned char word_ram2M[0x40000];\r
-                       unsigned char unused[0x20000];\r
+                       unsigned char unused0[0x20000];\r
                };\r
                struct {\r
-                       unsigned char unused[0x20000];\r
+                       unsigned char unused1[0x20000];\r
                        unsigned char word_ram1M[2][0x20000];\r
                };\r
        };\r
@@ -309,11 +367,19 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
 PICO_INTERNAL int PicoCdSaveState(void *file);\r
 PICO_INTERNAL int PicoCdLoadState(void *file);\r
 \r
+typedef struct {\r
+       int chunk;\r
+       int size;\r
+       void *ptr;\r
+} carthw_state_chunk;\r
+extern carthw_state_chunk *carthw_chunks;\r
+#define CHUNK_CARTHW 64\r
+\r
 // Cart.c\r
 PICO_INTERNAL void PicoCartDetect(void);\r
 \r
 // Debug.c\r
-int CM_compareRun(int cyc);\r
+int CM_compareRun(int cyc, int is_sub);\r
 \r
 // Draw.c\r
 PICO_INTERNAL int PicoLine(int scan);\r
@@ -327,6 +393,7 @@ PICO_INTERNAL int PicoInitPc(unsigned int pc);
 PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);\r
 PICO_INTERNAL void PicoMemSetup(void);\r
 PICO_INTERNAL_ASM void PicoMemReset(void);\r
+PICO_INTERNAL void PicoMemResetHooks(void);\r
 PICO_INTERNAL int PadRead(int i);\r
 PICO_INTERNAL unsigned char z80_read(unsigned short a);\r
 #ifndef _USE_CZ80\r
@@ -336,6 +403,9 @@ PICO_INTERNAL unsigned short z80_read16(unsigned short a);
 #else\r
 PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data);\r
 #endif\r
+extern unsigned int (*PicoRead16Hook)(unsigned int a, int realsize);\r
+extern void (*PicoWrite8Hook) (unsigned int a,unsigned int d,int realsize);\r
+extern void (*PicoWrite16Hook)(unsigned int a,unsigned int d,int realsize);\r
 \r
 // cd/Memory.c\r
 PICO_INTERNAL void PicoMemSetupCD(void);\r
@@ -347,6 +417,8 @@ extern struct Pico Pico;
 extern struct PicoSRAM SRam;\r
 extern int emustatus;\r
 extern int z80startCycle, z80stopCycle; // in 68k cycles\r
+extern void (*PicoResetHook)(void);\r
+extern void (*PicoLineHook)(int count);\r
 PICO_INTERNAL int CheckDMA(void);\r
 \r
 // cd/Pico.c\r
@@ -358,7 +430,6 @@ PICO_INTERNAL int PicoFrameMCD(void);
 // Sek.c\r
 PICO_INTERNAL int SekInit(void);\r
 PICO_INTERNAL int SekReset(void);\r
-PICO_INTERNAL int SekInterrupt(int irq);\r
 PICO_INTERNAL void SekState(int *data);\r
 PICO_INTERNAL void SekSetRealTAS(int use_real);\r
 \r
@@ -374,6 +445,7 @@ extern int PsndLen_exc_add;
 // VideoPort.c\r
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);\r
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);\r
+extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);\r
 \r
 // Misc.c\r
 PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);\r
@@ -398,9 +470,6 @@ PICO_INTERNAL int  PsndRender(int offset, int length);
 PICO_INTERNAL void PsndClear(void);\r
 // z80 functionality wrappers\r
 PICO_INTERNAL void z80_init(void);\r
-PICO_INTERNAL void z80_resetCycles(void);\r
-PICO_INTERNAL void z80_int(void);\r
-PICO_INTERNAL int  z80_run(int cycles);\r
 PICO_INTERNAL void z80_pack(unsigned char *data);\r
 PICO_INTERNAL void z80_unpack(unsigned char *data);\r
 PICO_INTERNAL void z80_reset(void);\r
@@ -416,32 +485,43 @@ PICO_INTERNAL void z80_exit(void);
 #define EL_LOGMASK 0\r
 #endif\r
 \r
-#define EL_HVCNT   0x0001 /* hv counter reads */\r
-#define EL_SR      0x0002 /* SR reads */\r
-#define EL_INTS    0x0004 /* ints and acks */\r
-#define EL_YM2612R 0x0008 /* 68k ym2612 reads */\r
-#define EL_INTSW   0x0010 /* log irq switching on/off */\r
-#define EL_ASVDP   0x0020 /* VDP accesses during active scan */\r
-#define EL_VDPDMA  0x0040 /* VDP DMA transfers and their timing */\r
-#define EL_BUSREQ  0x0080 /* z80 busreq r/w or reset w */\r
-#define EL_Z80BNK  0x0100 /* z80 i/o through bank area */\r
-#define EL_SRAMIO  0x0200 /* sram i/o */\r
-#define EL_EEPROM  0x0400 /* eeprom debug */\r
-#define EL_UIO     0x0800 /* unmapped i/o */\r
-#define EL_IO      0x1000 /* all i/o (TODO) */\r
-\r
-#define EL_STATUS  0x4000 /* status messages */\r
-#define EL_ANOMALY 0x8000 /* some unexpected conditions */\r
+#define EL_HVCNT   0x00000001 /* hv counter reads */\r
+#define EL_SR      0x00000002 /* SR reads */\r
+#define EL_INTS    0x00000004 /* ints and acks */\r
+#define EL_YM2612R 0x00000008 /* 68k ym2612 reads */\r
+#define EL_INTSW   0x00000010 /* log irq switching on/off */\r
+#define EL_ASVDP   0x00000020 /* VDP accesses during active scan */\r
+#define EL_VDPDMA  0x00000040 /* VDP DMA transfers and their timing */\r
+#define EL_BUSREQ  0x00000080 /* z80 busreq r/w or reset w */\r
+#define EL_Z80BNK  0x00000100 /* z80 i/o through bank area */\r
+#define EL_SRAMIO  0x00000200 /* sram i/o */\r
+#define EL_EEPROM  0x00000400 /* eeprom debug */\r
+#define EL_UIO     0x00000800 /* unmapped i/o */\r
+#define EL_IO      0x00001000 /* all i/o */\r
+#define EL_CDPOLL  0x00002000 /* MCD: log poll detection */\r
+#define EL_SVP     0x00004000 /* SVP stuff */\r
+\r
+#define EL_STATUS  0x40000000 /* status messages */\r
+#define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */\r
 \r
 #if EL_LOGMASK\r
+extern void lprintf(const char *fmt, ...);\r
 #define elprintf(w,f,...) \\r
 { \\r
        if ((w) & EL_LOGMASK) \\r
-               printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \\r
+               lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \\r
 }\r
+#elif defined(_MSC_VER)\r
+#define elprintf\r
 #else\r
 #define elprintf(w,f,...)\r
 #endif\r
 \r
+#ifdef _MSC_VER\r
+#define cdprintf\r
+#else\r
+#define cdprintf(x...)\r
+#endif\r
+\r
 #endif // PICO_INTERNAL_INCLUDED\r
 \r