FAME integration finished, some adjustments of CPU core stuff

[picodrive.git] / Pico / PicoInt.h

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index a6fceff..a9720c8 100644 (file)
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -34,69 +34,68 @@ extern "C" {
 // ----------------------- 68000 CPU -----------------------\r
 #ifdef EMU_C68K\r
 #include "../cpu/Cyclone/Cyclone.h"\r
-extern struct Cyclone PicoCpu, PicoCpuS68k;\r
-#define SekCyclesLeftNoMCD PicoCpu.cycles // cycles left for this run\r
+extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;\r
+#define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run\r
 #define SekCyclesLeft \\r
        (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
 #define SekCyclesLeftS68k \\r
-       ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuS68k.cycles)\r
-#define SekSetCyclesLeftNoMCD(c) PicoCpu.cycles=c\r
+       ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)\r
+#define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c\r
 #define SekSetCyclesLeft(c) { \\r
        if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \\r
 }\r
-#define SekPc (PicoCpu.pc-PicoCpu.membase)\r
-#define SekPcS68k (PicoCpuS68k.pc-PicoCpuS68k.membase)\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
+#define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)\r
+#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
 #endif\r
 \r
 #ifdef EMU_F68K\r
 #include "../cpu/fame/fame.h"\r
-M68K_CONTEXT PicoCpuM68k, PicoCpuS68k;\r
-#define SekCyclesLeftNoMCD PicoCpuM68k.io_cycle_counter\r
+M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;\r
+#define SekCyclesLeftNoMCD PicoCpuFM68k.io_cycle_counter\r
 #define SekCyclesLeft \\r
        (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
 #define SekCyclesLeftS68k \\r
-       ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuS68k.io_cycle_counter)\r
-#define SekSetCyclesLeftNoMCD(c) PicoCpuM68k.io_cycle_counter=c\r
+       ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter)\r
+#define SekSetCyclesLeftNoMCD(c) PicoCpuFM68k.io_cycle_counter=c\r
 #define SekSetCyclesLeft(c) { \\r
        if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \\r
 }\r
-#define SekPc     m68k_get_pc(&PicoCpuM68k)\r
-#define SekPcS68k m68k_get_pc(&PicoCpuS68k)\r
+#define SekPc     m68k_get_pc(&PicoCpuFM68k)\r
+#define SekPcS68k m68k_get_pc(&PicoCpuFS68k)\r
 #define SekSetStop(x) { \\r
-       PicoCpuM68k.execinfo &= ~M68K_HALTED; \\r
-       if (x) { PicoCpuM68k.execinfo |= M68K_HALTED; PicoCpuM68k.io_cycle_counter = 0; } \\r
+       PicoCpuFM68k.execinfo &= ~M68K_HALTED; \\r
+       if (x) { PicoCpuFM68k.execinfo |= M68K_HALTED; PicoCpuFM68k.io_cycle_counter = 0; } \\r
 }\r
 #define SekSetStopS68k(x) { \\r
-       PicoCpuS68k.execinfo &= ~M68K_HALTED; \\r
-       if (x) { PicoCpuS68k.execinfo |= M68K_HALTED; PicoCpuS68k.io_cycle_counter = 0; } \\r
+       PicoCpuFS68k.execinfo &= ~M68K_HALTED; \\r
+       if (x) { PicoCpuFS68k.execinfo |= M68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \\r
 }\r
 #endif\r
 \r
 #ifdef EMU_M68K\r
 #include "../cpu/musashi/m68kcpu.h"\r
-extern m68ki_cpu_core PicoM68kCPU; // MD's CPU\r
-extern m68ki_cpu_core PicoS68kCPU; // Mega CD's CPU\r
+extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;\r
 #ifndef SekCyclesLeft\r
-#define SekCyclesLeftNoMCD PicoM68kCPU.cyc_remaining_cycles\r
+#define SekCyclesLeftNoMCD PicoCpuMM68k.cyc_remaining_cycles\r
 #define SekCyclesLeft \\r
        (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
 #define SekCyclesLeftS68k \\r
-       ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoS68kCPU.cyc_remaining_cycles)\r
+       ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles)\r
 #define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c)\r
 #define SekSetCyclesLeft(c) { \\r
        if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \\r
 }\r
-#define SekPc m68k_get_reg(&PicoM68kCPU, M68K_REG_PC)\r
-#define SekPcS68k m68k_get_reg(&PicoS68kCPU, M68K_REG_PC)\r
+#define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)\r
+#define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)\r
 #define SekSetStop(x) { \\r
-       if(x) { SET_CYCLES(0); PicoM68kCPU.stopped=STOP_LEVEL_STOP; } \\r
-       else PicoM68kCPU.stopped=0; \\r
+       if(x) { SET_CYCLES(0); PicoCpuMM68k.stopped=STOP_LEVEL_STOP; } \\r
+       else PicoCpuMM68k.stopped=0; \\r
 }\r
 #define SekSetStopS68k(x) { \\r
-       if(x) { SET_CYCLES(0); PicoS68kCPU.stopped=STOP_LEVEL_STOP; } \\r
-       else PicoS68kCPU.stopped=0; \\r
+       if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \\r
+       else PicoCpuMS68k.stopped=0; \\r
 }\r
 #endif\r
 #endif\r
@@ -345,7 +344,7 @@ PICO_INTERNAL int PicoFrameMCD(void);
 PICO_INTERNAL int SekInit(void);\r
 PICO_INTERNAL int SekReset(void);\r
 PICO_INTERNAL int SekInterrupt(int irq);\r
-PICO_INTERNAL void SekState(unsigned char *data);\r
+PICO_INTERNAL void SekState(int *data);\r
 PICO_INTERNAL void SekSetRealTAS(int use_real);\r
 \r
 // cd/Sek.c\r