FAME integration finished, some adjustments of CPU core stuff

[picodrive.git] / Pico / Memory.c

diff --git a/Pico/Memory.c b/Pico/Memory.c
index b0aa7af..963d30b 100644 (file)
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -73,7 +73,7 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
 {\r
   u32 ret=0;\r
 #if defined(EMU_C68K)\r
-  pc-=PicoCpu.membase; // Get real pc\r
+  pc-=PicoCpuCM68k.membase; // Get real pc\r
 //  pc&=0xfffffe;\r
   pc&=~1;\r
   if ((pc<<8) == 0)\r
@@ -82,10 +82,10 @@ static u32 CPU_CALL PicoCheckPc(u32 pc)
     return (int)Pico.rom + Pico.romsize; // common crash condition, can happen if acc timing is off\r
   }\r
 \r
-  PicoCpu.membase=PicoMemBase(pc&0x00ffffff);\r
-  PicoCpu.membase-=pc&0xff000000;\r
+  PicoCpuCM68k.membase=PicoMemBase(pc&0x00ffffff);\r
+  PicoCpuCM68k.membase-=pc&0xff000000;\r
 \r
-  ret = PicoCpu.membase+pc;\r
+  ret = PicoCpuCM68k.membase+pc;\r
 #endif\r
   return ret;\r
 }\r
@@ -491,21 +491,35 @@ PICO_INTERNAL void PicoMemSetup(void)
 {\r
   // Setup memory callbacks:\r
 #ifdef EMU_C68K\r
-  PicoCpu.checkpc=PicoCheckPc;\r
-  PicoCpu.fetch8 =PicoCpu.read8 =PicoRead8;\r
-  PicoCpu.fetch16=PicoCpu.read16=PicoRead16;\r
-  PicoCpu.fetch32=PicoCpu.read32=PicoRead32;\r
-  PicoCpu.write8 =PicoWrite8;\r
-  PicoCpu.write16=PicoWrite16;\r
-  PicoCpu.write32=PicoWrite32;\r
+  PicoCpuCM68k.checkpc=PicoCheckPc;\r
+  PicoCpuCM68k.fetch8 =PicoCpuCM68k.read8 =PicoRead8;\r
+  PicoCpuCM68k.fetch16=PicoCpuCM68k.read16=PicoRead16;\r
+  PicoCpuCM68k.fetch32=PicoCpuCM68k.read32=PicoRead32;\r
+  PicoCpuCM68k.write8 =PicoWrite8;\r
+  PicoCpuCM68k.write16=PicoWrite16;\r
+  PicoCpuCM68k.write32=PicoWrite32;\r
 #endif\r
 #ifdef EMU_F68K\r
-  PicoCpuM68k.read_byte =PicoRead8;\r
-  PicoCpuM68k.read_word =PicoRead16;\r
-  PicoCpuM68k.read_long =PicoRead32;\r
-  PicoCpuM68k.write_byte=PicoWrite8;\r
-  PicoCpuM68k.write_word=PicoWrite16;\r
-  PicoCpuM68k.write_long=PicoWrite32;\r
+  PicoCpuFM68k.read_byte =PicoRead8;\r
+  PicoCpuFM68k.read_word =PicoRead16;\r
+  PicoCpuFM68k.read_long =PicoRead32;\r
+  PicoCpuFM68k.write_byte=PicoWrite8;\r
+  PicoCpuFM68k.write_word=PicoWrite16;\r
+  PicoCpuFM68k.write_long=PicoWrite32;\r
+\r
+  // setup FAME fetchmap\r
+  {\r
+    int i;\r
+    // by default, point everything to fitst 64k of ROM\r
+    for (i = 0; i < M68K_FETCHBANK1; i++)\r
+      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));\r
+    // now real ROM\r
+    for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)\r
+      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom;\r
+    // .. and RAM\r
+    for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)\r
+      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));\r
+  }\r
 #endif\r
 }\r
 \r