X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=ecc34c2549cac42940d419be596e9a046d33977b;hb=ea08c2967b1c61e3b81c911dfd5eb7a0e72a28bf;hp=3c7b70c28e6ef5c24c29599b5a029007a94ce14f;hpb=a4221917e147ba303f2cf6c09d12362bf2802084;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 3c7b70c..ecc34c2 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -7,7 +7,7 @@
 // For commercial use, separate licencing terms must be obtained.
 
 
-#define __debug_io
+//#define __debug_io
 
 #include "PicoInt.h"
 
@@ -28,12 +28,10 @@ u32  PicoRead8(u32 a);
 u32  PicoRead16(u32 a);
 void PicoWrite8(u32 a,u8 d);
 void PicoWriteRomHW_SSF2(u32 a,u32 d);
-void PicoWriteRomHW_in1 (u32 a,u32 d);
 #endif
 
 
-#if defined(EMU_C68K) && defined(EMU_M68K)
-// cyclone debug mode
+#ifdef EMU_CORE_DEBUG
 u32 lastread_a, lastread_d[16]={0,}, lastwrite_cyc_d[16]={0,}, lastwrite_mus_d[16]={0,};
 int lrp_cyc=0, lrp_mus=0, lwp_cyc=0, lwp_mus=0;
 extern unsigned int ppop;
@@ -143,16 +141,33 @@ static
 u32 SRAMRead(u32 a)
 {
   unsigned int sreg = Pico.m.sram_reg;
-  if(!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
+  if (!(sreg & 0x10) && (sreg & 1) && a > 0x200001) { // not yet detected SRAM
     elprintf(EL_SRAMIO, "normal sram detected.");
     Pico.m.sram_reg|=0x10; // should be normal SRAM
   }
-  if(sreg & 4) // EEPROM read
+  if (sreg & 4) // EEPROM read
     return SRAMReadEEPROM();
   else // if(sreg & 1) // (sreg&5) is one of prerequisites
     return *(u8 *)(SRam.data-SRam.start+a);
 }
 
+#ifndef _ASM_MEMORY_C
+static
+#endif
+u32 SRAMRead16(u32 a)
+{
+  u32 d;
+  if (Pico.m.sram_reg & 4) {
+    d = SRAMReadEEPROM();
+    d |= d << 8;
+  } else {
+    u8 *pm=(u8 *)(SRam.data-SRam.start+a);
+    d =*pm++ << 8;
+    d|=*pm++;
+  }
+  return d;
+}
+
 static void SRAMWrite(u32 a, u32 d)
 {
   unsigned int sreg = Pico.m.sram_reg;
@@ -323,9 +338,9 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
 
   a&=0xffffff;
 
-#if !(defined(EMU_C68K) && defined(EMU_M68K))
+#ifndef EMU_CORE_DEBUG
   // sram
-  if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
+  if (a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
     d = SRAMRead(a);
     elprintf(EL_SRAMIO, "sram r8 [%06x] %02x @ %06x", a, d, SekPc);
     goto end;
@@ -336,14 +351,17 @@ PICO_INTERNAL_ASM u32 PicoRead8(u32 a)
   log_io(a, 8, 0);
   if ((a&0xff4000)==0xa00000) { d=z80Read8(a); goto end; } // Z80 Ram
 
-  d=OtherRead16(a&~1, 8); if ((a&1)==0) d>>=8;
+  if ((a&0xe700e0)==0xc00000) // VDP
+       d=PicoVideoRead(a);
+  else d=OtherRead16(a&~1, 8);
+  if ((a&1)==0) d>>=8;
 
 end:
 #ifdef __debug_io
   dprintf("r8 : %06x,   %02x @%06x", a&0xffffff, (u8)d, SekPc);
 #endif
-#if defined(EMU_C68K) && defined(EMU_M68K)
-  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
     lastread_a = a;
     lastread_d[lrp_cyc++&15] = (u8)d;
   }
@@ -359,11 +377,10 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
 
   a&=0xfffffe;
 
-#if !(defined(EMU_C68K) && defined(EMU_M68K))
+#ifndef EMU_CORE_DEBUG
   // sram
-  if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
-    d = SRAMRead(a);
-    d |= d<<8;
+  if (a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
+    d = SRAMRead16(a);
     elprintf(EL_SRAMIO, "sram r16 [%06x] %04x @ %06x", a, d, SekPc);
     goto end;
   }
@@ -372,14 +389,16 @@ PICO_INTERNAL_ASM u32 PicoRead16(u32 a)
   if (a<Pico.romsize) { d = *(u16 *)(Pico.rom+a); goto end; } // Rom
   log_io(a, 16, 0);
 
-  d = OtherRead16(a, 16);
+  if ((a&0xe700e0)==0xc00000)
+       d = PicoVideoRead(a);
+  else d = OtherRead16(a, 16);
 
 end:
 #ifdef __debug_io
   dprintf("r16: %06x, %04x  @%06x", a&0xffffff, d, SekPc);
 #endif
-#if defined(EMU_C68K) && defined(EMU_M68K)
-  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
     lastread_a = a;
     lastread_d[lrp_cyc++&15] = d;
   }
@@ -397,8 +416,7 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
 
   // sram
   if(a >= SRam.start && a <= SRam.end && (Pico.m.sram_reg&5)) {
-    d = (SRAMRead(a)<<16)|SRAMRead(a+2);
-    d |= d<<8;
+    d = (SRAMRead16(a)<<16)|SRAMRead16(a+2);
     elprintf(EL_SRAMIO, "sram r32 [%06x] %08x @ %06x", a, d, SekPc);
     goto end;
   }
@@ -406,14 +424,16 @@ PICO_INTERNAL_ASM u32 PicoRead32(u32 a)
   if (a<Pico.romsize) { u16 *pm=(u16 *)(Pico.rom+a); d = (pm[0]<<16)|pm[1]; goto end; } // Rom
   log_io(a, 32, 0);
 
-  d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
+  if ((a&0xe700e0)==0xc00000)
+       d = (PicoVideoRead(a)<<16)|PicoVideoRead(a+2);
+  else d = (OtherRead16(a, 32)<<16)|OtherRead16(a+2, 32);
 
 end:
 #ifdef __debug_io
   dprintf("r32: %06x, %08x @%06x", a&0xffffff, d, SekPc);
 #endif
-#if defined(EMU_C68K) && defined(EMU_M68K)
-  if(a>=Pico.romsize/*&&(ppop&0x3f)!=0x3a&&(ppop&0x3f)!=0x3b*/) {
+#ifdef EMU_CORE_DEBUG
+  if (a>=Pico.romsize) {
     lastread_a = a;
     lastread_d[lrp_cyc++&15] = d;
   }
@@ -425,18 +445,15 @@ end:
 // -----------------------------------------------------------------
 //                            Write Ram
 
-#ifndef _ASM_MEMORY_C
+#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
 PICO_INTERNAL_ASM void PicoWrite8(u32 a,u8 d)
 {
 #ifdef __debug_io
   dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
 #endif
-#if defined(EMU_C68K) && defined(EMU_M68K)
+#ifdef EMU_CORE_DEBUG
   lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
-  //if ((a&0xe0ffff)==0xe0a9ba+0x69c)
-  //if(a==0x200000||a==0x200001) printf("w8 : %02x [%06x] @ %06x [%i]\n", d, a, SekPc, SekCyclesDoneT());
-  //  dprintf("w8 : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
 
   if ((a&0xe00000)==0xe00000) { *(u8 *)(Pico.ram+((a^1)&0xffff))=d; return; } // Ram
   log_io(a, 8, 1);
@@ -451,7 +468,7 @@ void PicoWrite16(u32 a,u16 d)
 #ifdef __debug_io
   dprintf("w16: %06x, %04x", a&0xffffff, d);
 #endif
-#if defined(EMU_C68K) && defined(EMU_M68K)
+#ifdef EMU_CORE_DEBUG
   lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
 
@@ -459,6 +476,7 @@ void PicoWrite16(u32 a,u16 d)
   log_io(a, 16, 1);
 
   a&=0xfffffe;
+  if ((a&0xe700e0)==0xc00000) { PicoVideoWrite(a,(u16)d); return; } // VDP
   OtherWrite16(a,d);
 }
 
@@ -467,7 +485,7 @@ static void PicoWrite32(u32 a,u32 d)
 #ifdef __debug_io
   dprintf("w32: %06x, %08x", a&0xffffff, d);
 #endif
-#if defined(EMU_C68K) && defined(EMU_M68K)
+#ifdef EMU_CORE_DEBUG
   lastwrite_cyc_d[lwp_cyc++&15] = d;
 #endif
 
@@ -481,6 +499,14 @@ static void PicoWrite32(u32 a,u32 d)
   log_io(a, 32, 1);
 
   a&=0xfffffe;
+  if ((a&0xe700e0)==0xc00000)
+  {
+    // VDP:
+    PicoVideoWrite(a,  (u16)(d>>16));
+    PicoVideoWrite(a+2,(u16)d);
+    return;
+  }
+
   OtherWrite16(a,  (u16)(d>>16));
   OtherWrite16(a+2,(u16)d);
 }
@@ -530,33 +556,36 @@ unsigned int  m68k_read_pcrelative_CD16(unsigned int a);
 unsigned int  m68k_read_pcrelative_CD32(unsigned int a);
 
 // these are allowed to access RAM
-static unsigned int  m68k_read_8 (unsigned int a, int do_fake) {
+static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
+{
   a&=0xffffff;
-  if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);
-  if(a<Pico.romsize)         return *(u8 *)(Pico.rom+(a^1)); // Rom
-#ifdef EMU_C68K
+  if(a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)    return *(u8 *)(Pico.rom+(a^1)); // Rom
+#ifdef EMU_CORE_DEBUG
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
 #endif
+  if(PicoMCD&1) return m68k_read_pcrelative_CD8(a);
   if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
   return 0;
 }
-static unsigned int  m68k_read_16(unsigned int a, int do_fake) {
+static unsigned int  m68k_read_16(unsigned int a, int do_fake)
+{
   a&=0xffffff;
-  if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);
-  if(a<Pico.romsize)         return *(u16 *)(Pico.rom+(a&~1)); // Rom
-#ifdef EMU_C68K
+  if(a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)    return *(u16 *)(Pico.rom+(a&~1)); // Rom
+#ifdef EMU_CORE_DEBUG
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
 #endif
+  if(PicoMCD&1) return m68k_read_pcrelative_CD16(a);
   if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
   return 0;
 }
-static unsigned int  m68k_read_32(unsigned int a, int do_fake) {
+static unsigned int  m68k_read_32(unsigned int a, int do_fake)
+{
   a&=0xffffff;
-  if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);
-  if(a<Pico.romsize)         { u16 *pm=(u16 *)(Pico.rom+(a&~1));     return (pm[0]<<16)|pm[1]; }
-#ifdef EMU_C68K
+  if(a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k) { u16 *pm=(u16 *)(Pico.rom+(a&~1)); return (pm[0]<<16)|pm[1]; }
+#ifdef EMU_CORE_DEBUG
   if(do_fake&&((ppop&0x3f)==0x3a||(ppop&0x3f)==0x3b)) return lastread_d[lrp_mus++&15];
 #endif
+  if(PicoMCD&1) return m68k_read_pcrelative_CD32(a);
   if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
   return 0;
 }
@@ -570,12 +599,13 @@ unsigned int m68k_read_disassembler_8 (unsigned int a) { return m68k_read_8 (a,
 unsigned int m68k_read_disassembler_16(unsigned int a) { return m68k_read_16(a, 0); }
 unsigned int m68k_read_disassembler_32(unsigned int a) { return m68k_read_32(a, 0); }
 
-#ifdef EMU_C68K
+#ifdef EMU_CORE_DEBUG
 // ROM only
 unsigned int m68k_read_memory_8(unsigned int a)
 {
   u8 d;
-  if(a<Pico.romsize) d = *(u8 *) (Pico.rom+(a^1));
+  if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)
+       d = *(u8 *) (Pico.rom+(a^1));
   else d = (u8) lastread_d[lrp_mus++&15];
 #ifdef __debug_io
   dprintf("r8_mu : %06x,   %02x @%06x", a&0xffffff, d, SekPc);
@@ -585,7 +615,8 @@ unsigned int m68k_read_memory_8(unsigned int a)
 unsigned int m68k_read_memory_16(unsigned int a)
 {
   u16 d;
-  if(a<Pico.romsize) d = *(u16 *)(Pico.rom+(a&~1));
+  if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)
+       d = *(u16 *)(Pico.rom+(a&~1));
   else d = (u16) lastread_d[lrp_mus++&15];
 #ifdef __debug_io
   dprintf("r16_mu: %06x, %04x @%06x", a&0xffffff, d, SekPc);
@@ -595,7 +626,9 @@ unsigned int m68k_read_memory_16(unsigned int a)
 unsigned int m68k_read_memory_32(unsigned int a)
 {
   u32 d;
-  if(a<Pico.romsize) {u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1];}
+  if (a<Pico.romsize && m68ki_cpu_p==&PicoCpuMM68k)
+       { u16 *pm=(u16 *)(Pico.rom+(a&~1));d=(pm[0]<<16)|pm[1]; }
+  else if (a <= 0x78) d = m68k_read_32(a, 0);
   else d = lastread_d[lrp_mus++&15];
 #ifdef __debug_io
   dprintf("r32_mu: %06x, %08x @%06x", a&0xffffff, d, SekPc);
@@ -660,27 +693,28 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
-    if(PicoOpt&1) ret = (u8) YM2612Read();
-    goto end;
+    if (PicoOpt&1) ret = (u8) YM2612Read();
+    return ret;
   }
 
   if (a>=0x8000)
   {
+    extern u32 PicoReadM68k8(u32 a);
     u32 addr68k;
     addr68k=Pico.m.z80_bank68k<<15;
     addr68k+=a&0x7fff;
 
-    ret = (u8) PicoRead8(addr68k);
+    if (PicoMCD & 1)
+         ret = PicoReadM68k8(addr68k);
+    else ret = PicoRead8(addr68k);
     elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);
-    goto end;
+    return ret;
   }
 
-  // should not be needed || dprintf("z80_read RAM");
-  if (a<0x4000) { ret = (u8) Pico.zram[a&0x1fff]; goto end; }
+  // should not be needed, cores should be able to access RAM themselves
+  if (a<0x4000) return Pico.zram[a&0x1fff];
 
   elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, ret);
-
-end:
   return ret;
 }
 
@@ -690,9 +724,6 @@ PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a)
 PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 #endif
 {
-  //if (a<0x4000)
-  //  dprintf("z80 w8 : %06x,   %02x @%04x", a, data, mz80GetRegisterValue(NULL, 0));
-
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
     if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;
@@ -715,15 +746,18 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 
   if (a>=0x8000)
   {
+    extern void PicoWriteM68k8(u32 a,u8 d);
     u32 addr68k;
     addr68k=Pico.m.z80_bank68k<<15;
     addr68k+=a&0x7fff;
     elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);
-    PicoWrite8(addr68k, data);
+    if (PicoMCD & 1)
+         PicoWriteM68k8(addr68k, data);
+    else PicoWrite8(addr68k, data);
     return;
   }
 
-  // should not be needed, drZ80 knows how to access RAM itself || dprintf("z80_write RAM @ %08x", lr);
+  // should not be needed
   if (a<0x4000) { Pico.zram[a&0x1fff]=data; return; }
 
   elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
@@ -732,15 +766,11 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 #ifndef _USE_CZ80
 PICO_INTERNAL unsigned short z80_read16(unsigned short a)
 {
-  //dprintf("z80_read16");
-
   return (u16) ( (u16)z80_read(a) | ((u16)z80_read((u16)(a+1))<<8) );
 }
 
 PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a)
 {
-  //dprintf("z80_write16");
-
   z80_write((unsigned char) data,a);
   z80_write((unsigned char)(data>>8),(u16)(a+1));
 }