.cue support, Pico stubs

[picodrive.git] / Pico / cd / Memory.c

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index 2d08fd4..2b419b7 100644 (file)
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -18,10 +18,15 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED\r
 #endif\r
 \r
+#ifdef _MSC_VER\r
+#define rdprintf\r
+#define wrdprintf\r
+#else\r
 //#define rdprintf dprintf\r
 #define rdprintf(...)\r
 //#define wrdprintf dprintf\r
 #define wrdprintf(...)\r
+#endif\r
 \r
 #ifdef EMU_CORE_DEBUG\r
 extern u32 lastread_a, lastread_d[16], lastwrite_cyc_d[16];\r
@@ -1158,11 +1163,12 @@ static u32 PicoReadS68k32(u32 a)
   // word RAM (1M area)\r
   if ((a&0xfe0000)==0x0c0000 && (Pico_mcd->s68k_regs[3]&4)) { // 0c0000-0dffff\r
     int bank;\r
+    u16 *pm;\r
     wrdprintf("s68k_wram1M r32: [%06x] @%06x", a, SekPcS68k);\r
 //    if (!(Pico_mcd->s68k_regs[3]&4))\r
 //      dprintf("s68k_wram1M FIXME: wrong mode");\r
     bank = (Pico_mcd->s68k_regs[3]&1)^1;\r
-    u16 *pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];\r
+    pm=(u16 *)(Pico_mcd->word_ram1M[bank]+(a&0x1fffe)); d = (pm[0]<<16)|pm[1];\r
     wrdprintf("ret = %08x", d);\r
     goto end;\r
   }\r
@@ -1630,6 +1636,10 @@ void PicoMemResetCD(int r3)
 }\r
 #endif\r
 \r
+#ifdef EMU_M68K\r
+static void m68k_mem_setup_cd(void);\r
+#endif\r
+\r
 PICO_INTERNAL void PicoMemSetupCD(void)\r
 {\r
   // additional handlers for common code\r
@@ -1696,6 +1706,9 @@ PICO_INTERNAL void PicoMemSetupCD(void)
     // PicoMemResetCD() will setup word ram for both\r
   }\r
 #endif\r
+#ifdef EMU_M68K\r
+  m68k_mem_setup_cd();\r
+#endif\r
 \r
   // m68k_poll_addr = m68k_poll_cnt = 0;\r
   s68k_poll_adclk = s68k_poll_cnt = 0;\r
@@ -1703,27 +1716,27 @@ PICO_INTERNAL void PicoMemSetupCD(void)
 \r
 \r
 #ifdef EMU_M68K\r
-unsigned char  PicoReadCD8w (unsigned int a) {\r
+static unsigned int PicoReadCD8w (unsigned int a) {\r
        return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k8(a) : PicoReadM68k8(a);\r
 }\r
-unsigned short PicoReadCD16w(unsigned int a) {\r
+static unsigned int PicoReadCD16w(unsigned int a) {\r
        return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k16(a) : PicoReadM68k16(a);\r
 }\r
-unsigned int   PicoReadCD32w(unsigned int a) {\r
+static unsigned int PicoReadCD32w(unsigned int a) {\r
        return m68ki_cpu_p == &PicoCpuMS68k ? PicoReadS68k32(a) : PicoReadM68k32(a);\r
 }\r
-void PicoWriteCD8w (unsigned int a, unsigned char d) {\r
+static void PicoWriteCD8w (unsigned int a, unsigned char d) {\r
        if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k8(a, d); else PicoWriteM68k8(a, d);\r
 }\r
-void PicoWriteCD16w(unsigned int a, unsigned short d) {\r
+static void PicoWriteCD16w(unsigned int a, unsigned short d) {\r
        if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k16(a, d); else PicoWriteM68k16(a, d);\r
 }\r
-void PicoWriteCD32w(unsigned int a, unsigned int d) {\r
+static void PicoWriteCD32w(unsigned int a, unsigned int d) {\r
        if (m68ki_cpu_p == &PicoCpuMS68k) PicoWriteS68k32(a, d); else PicoWriteM68k32(a, d);\r
 }\r
 \r
 // these are allowed to access RAM\r
-unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)\r
+static unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)\r
 {\r
   a&=0xffffff;\r
   if(m68ki_cpu_p == &PicoCpuMS68k) {\r
@@ -1750,7 +1763,7 @@ unsigned int  m68k_read_pcrelative_CD8 (unsigned int a)
   }\r
   return 0;//(u8)  lastread_d;\r
 }\r
-unsigned int  m68k_read_pcrelative_CD16(unsigned int a)\r
+static unsigned int  m68k_read_pcrelative_CD16(unsigned int a)\r
 {\r
   a&=0xffffff;\r
   if(m68ki_cpu_p == &PicoCpuMS68k) {\r
@@ -1777,7 +1790,7 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a)
   }\r
   return 0;\r
 }\r
-unsigned int  m68k_read_pcrelative_CD32(unsigned int a)\r
+static unsigned int  m68k_read_pcrelative_CD32(unsigned int a)\r
 {\r
   u16 *pm;\r
   a&=0xffffff;\r
@@ -1807,5 +1820,28 @@ unsigned int  m68k_read_pcrelative_CD32(unsigned int a)
   }\r
   return 0;\r
 }\r
+\r
+extern unsigned int (*pm68k_read_memory_8) (unsigned int address);\r
+extern unsigned int (*pm68k_read_memory_16)(unsigned int address);\r
+extern unsigned int (*pm68k_read_memory_32)(unsigned int address);\r
+extern void (*pm68k_write_memory_8) (unsigned int address, unsigned char  value);\r
+extern void (*pm68k_write_memory_16)(unsigned int address, unsigned short value);\r
+extern void (*pm68k_write_memory_32)(unsigned int address, unsigned int   value);\r
+extern unsigned int (*pm68k_read_memory_pcr_8) (unsigned int address);\r
+extern unsigned int (*pm68k_read_memory_pcr_16)(unsigned int address);\r
+extern unsigned int (*pm68k_read_memory_pcr_32)(unsigned int address);\r
+\r
+static void m68k_mem_setup_cd(void)\r
+{\r
+  pm68k_read_memory_8  = PicoReadCD8w;\r
+  pm68k_read_memory_16 = PicoReadCD16w;\r
+  pm68k_read_memory_32 = PicoReadCD32w;\r
+  pm68k_write_memory_8  = PicoWriteCD8w;\r
+  pm68k_write_memory_16 = PicoWriteCD16w;\r
+  pm68k_write_memory_32 = PicoWriteCD32w;\r
+  pm68k_read_memory_pcr_8  = m68k_read_pcrelative_CD8;\r
+  pm68k_read_memory_pcr_16 = m68k_read_pcrelative_CD16;\r
+  pm68k_read_memory_pcr_32 = m68k_read_pcrelative_CD32;\r
+}\r
 #endif // EMU_M68K\r
 \r