large ROM hack fix (up to 10MB now)

[picodrive.git] / Pico / PicoInt.h

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index e9f7e77..58d37d0 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -1,7 +1,7 @@
 // Pico Library - Header File\r
 \r
 // (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006 notaz, All rights reserved.\r
+// (c) Copyright 2006,2007 Grazvydas "notaz" Ignotas, all rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
@@ -38,8 +38,8 @@ extern struct Cyclone PicoCpu, PicoCpuS68k;
 }\r
 #define SekPc (PicoCpu.pc-PicoCpu.membase)\r
 #define SekPcS68k (PicoCpuS68k.pc-PicoCpuS68k.membase)\r
-#define SekSetStop(x) { PicoCpu.stopped=x; if (x) PicoCpu.cycles=0; }\r
-#define SekSetStopS68k(x) { PicoCpuS68k.stopped=x; if (x) PicoCpuS68k.cycles=0; }\r
+#define SekSetStop(x) { PicoCpu.state_flags&=~1; if (x) { PicoCpu.state_flags|=1; PicoCpu.cycles=0; } }\r
+#define SekSetStopS68k(x) { PicoCpuS68k.state_flags&=~1; if (x) { PicoCpuS68k.state_flags|=1; PicoCpuS68k.cycles=0; } }\r
 #endif\r
 \r
 #ifdef EMU_A68K\r
@@ -110,8 +110,17 @@ extern int SekCycleAimS68k;
 #define SekCyclesResetS68k() {SekCycleCntS68k=SekCycleAimS68k=0;}\r
 #define SekCyclesDoneS68k()  (SekCycleAimS68k-SekCyclesLeftS68k)\r
 \r
-// does not work as expected\r
-//extern int z80ExtraCycles; // extra z80 cycles, used when z80 is [en|dis]abled\r
+// debug cyclone\r
+#if defined(EMU_C68K) && defined(EMU_M68K)\r
+#undef SekSetCyclesLeftNoMCD\r
+#undef SekSetCyclesLeft\r
+#undef SekCyclesBurn\r
+#undef SekEndRun\r
+#define SekSetCyclesLeftNoMCD(c)\r
+#define SekSetCyclesLeft(c)\r
+#define SekCyclesBurn(c) c\r
+#define SekEndRun(c)\r
+#endif\r
 \r
 extern int PicoMCD;\r
 \r
@@ -217,10 +226,13 @@ struct mcd_misc
        unsigned int   counter75hz;\r
        unsigned short audio_offset;    // 0c: for savestates: play pointer offset (0-1023)\r
        unsigned char  audio_track;     // playing audio track # (zero based)\r
-       char pad1;\r
+       char           pad1;\r
        int            timer_int3;      // 10\r
        unsigned int   timer_stopwatch;\r
-       int pad[10];\r
+       unsigned char  bcram_reg;       // 18: battery-backed RAM cart register\r
+       unsigned char  pad2;\r
+       unsigned short pad3;\r
+       int pad[9];\r
 };\r
 \r
 typedef struct\r
@@ -333,7 +345,7 @@ unsigned int SRAMReadEEPROM();
 void SRAMUpdPending(unsigned int a, unsigned int d);\r
 void memcpy16(unsigned short *dest, unsigned short *src, int count);\r
 void memcpy16bswap(unsigned short *dest, void *src, int count);\r
-void memcpy32(int *dest, int *src, int count);\r
+void memcpy32(int *dest, int *src, int count); // 32bit word count\r
 void memset32(int *dest, int c, int count);\r
 \r
 // cd/Misc.c\r