svp compiler, early stage, works

[picodrive.git] / Pico / PicoInt.h

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index e2ce1ad..b503330 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -169,7 +169,7 @@ extern int SekCycleAimS68k;
 // ----------------------- Z80 CPU -----------------------\r
 \r
 #if defined(_USE_MZ80)\r
-#include "../../cpu/mz80/mz80.h"\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
@@ -177,7 +177,7 @@ extern int SekCycleAimS68k;
 #define z80_resetCycles()  mz80GetElapsedTicks(1)\r
 \r
 #elif defined(_USE_DRZ80)\r
-#include "../../cpu/DrZ80/drz80.h"\r
+#include "../cpu/DrZ80/drz80.h"\r
 \r
 extern struct DrZ80 drZ80;\r
 \r
@@ -190,7 +190,7 @@ extern struct DrZ80 drZ80;
 #define z80_resetCycles()\r
 \r
 #elif defined(_USE_CZ80)\r
-#include "../../cpu/cz80/cz80.h"\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
@@ -335,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
@@ -367,6 +367,14 @@ 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
@@ -503,9 +511,17 @@ extern void lprintf(const char *fmt, ...);
        if ((w) & EL_LOGMASK) \\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