Cyclone interface for new mem system, minor tweaks

[picodrive.git] / pico / cd / memory.c

diff --git a/pico/cd/memory.c b/pico/cd/memory.c
index 1e6a9c9..b8998f8 100644 (file)
--- a/pico/cd/memory.c
+++ b/pico/cd/memory.c
@@ -787,74 +787,6 @@ static void PicoWriteS68k16_pr(u32 a, u32 d)
 \r
 // -----------------------------------------------------------------\r
 \r
-#ifdef EMU_C68K\r
-static __inline int PicoMemBaseM68k(u32 pc)\r
-{\r
-  if ((pc&0xe00000)==0xe00000)\r
-    return (int)Pico.ram-(pc&0xff0000); // Program Counter in Ram\r
-\r
-  if (pc < 0x20000)\r
-    return (int)Pico_mcd->bios; // Program Counter in BIOS\r
-\r
-  if ((pc&0xfc0000)==0x200000)\r
-  {\r
-    if (!(Pico_mcd->s68k_regs[3]&4))\r
-      return (int)Pico_mcd->word_ram2M - 0x200000; // Program Counter in Word Ram\r
-    if (pc < 0x220000) {\r
-      int bank = Pico_mcd->s68k_regs[3]&1;\r
-      return (int)Pico_mcd->word_ram1M[bank] - 0x200000;\r
-    }\r
-  }\r
-\r
-  // Error - Program Counter is invalid\r
-  elprintf(EL_ANOMALY, "m68k FIXME: unhandled jump to %06x", pc);\r
-\r
-  return (int)Pico_mcd->bios;\r
-}\r
-\r
-\r
-static u32 PicoCheckPcM68k(u32 pc)\r
-{\r
-  pc-=PicoCpuCM68k.membase; // Get real pc\r
-  pc&=0xfffffe;\r
-\r
-  PicoCpuCM68k.membase=PicoMemBaseM68k(pc);\r
-\r
-  return PicoCpuCM68k.membase+pc;\r
-}\r
-\r
-\r
-static __inline int PicoMemBaseS68k(u32 pc)\r
-{\r
-  if (pc < 0x80000)                     // PRG RAM\r
-    return (int)Pico_mcd->prg_ram;\r
-\r
-  if ((pc&0xfc0000)==0x080000)          // WORD RAM 2M area (assume we are in the right mode..)\r
-    return (int)Pico_mcd->word_ram2M - 0x080000;\r
-\r
-  if ((pc&0xfe0000)==0x0c0000) {        // word RAM 1M area\r
-    int bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
-    return (int)Pico_mcd->word_ram1M[bank] - 0x0c0000;\r
-  }\r
-\r
-  // Error - Program Counter is invalid\r
-  elprintf(EL_ANOMALY, "s68k FIXME: unhandled jump to %06x", pc);\r
-\r
-  return (int)Pico_mcd->prg_ram;\r
-}\r
-\r
-\r
-static u32 PicoCheckPcS68k(u32 pc)\r
-{\r
-  pc-=PicoCpuCS68k.membase; // Get real pc\r
-  pc&=0xfffffe;\r
-\r
-  PicoCpuCS68k.membase=PicoMemBaseS68k(pc);\r
-\r
-  return PicoCpuCS68k.membase+pc;\r
-}\r
-#endif\r
-\r
 // TODO: probably split\r
 void PicoMemRemapCD(int r3)\r
 {\r
@@ -963,15 +895,17 @@ PICO_INTERNAL void PicoMemSetupCD(void)
   cpu68k_map_set(s68k_write16_map, 0xff0000, 0xffffff, PicoWriteS68k16_pr, 1);\r
 \r
 #ifdef EMU_C68K\r
-  PicoCpuCM68k.checkpc = PicoCheckPcM68k;\r
   // s68k\r
-  PicoCpuCS68k.checkpc = PicoCheckPcS68k;\r
-  PicoCpuCS68k.fetch8  = PicoCpuCS68k.read8  = s68k_read8;\r
-  PicoCpuCS68k.fetch16 = PicoCpuCS68k.read16 = s68k_read16;\r
-  PicoCpuCS68k.fetch32 = PicoCpuCS68k.read32 = s68k_read32;\r
-  PicoCpuCS68k.write8  = s68k_write8;\r
-  PicoCpuCS68k.write16 = s68k_write16;\r
-  PicoCpuCS68k.write32 = s68k_write32;\r
+  PicoCpuCS68k.read8  = (void *)s68k_read8_map;\r
+  PicoCpuCS68k.read16 = (void *)s68k_read16_map;\r
+  PicoCpuCS68k.read32 = (void *)s68k_read16_map;\r
+  PicoCpuCS68k.write8  = (void *)s68k_write8_map;\r
+  PicoCpuCS68k.write16 = (void *)s68k_write16_map;\r
+  PicoCpuCS68k.write32 = (void *)s68k_write16_map;\r
+  PicoCpuCS68k.checkpc = NULL; /* unused */\r
+  PicoCpuCS68k.fetch8  = NULL;\r
+  PicoCpuCS68k.fetch16 = NULL;\r
+  PicoCpuCS68k.fetch32 = NULL;\r
 #endif\r
 #ifdef EMU_F68K\r
   // s68k\r