X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FMemory.c;h=fb6b99c41e6ab98bc94b9b461e3911c3be372dbc;hb=43e6eaad0b73b37907be3342e0fd4cf65919e9f6;hp=847d1bd098afda1fc2cef9eb84f7457ca9db8481;hpb=dca310c413517d278898b967cfe610574310acd8;p=picodrive.git

diff --git a/Pico/Memory.c b/Pico/Memory.c
index 847d1bd..fb6b99c 100644
--- a/Pico/Memory.c
+++ b/Pico/Memory.c
@@ -67,7 +67,7 @@ static __inline int PicoMemBase(u32 pc)
 #endif
 
 
-static u32 PicoCheckPc(u32 pc)
+PICO_INTERNAL u32 PicoCheckPc(u32 pc)
 {
   u32 ret=0;
 #if defined(EMU_C68K)
@@ -112,7 +112,8 @@ int PadRead(int i)
   // orr the bits, which are set as output
   value = data_reg&(Pico.ioports[i+4]|0x80);
 
-  if(PicoOpt & 0x20) { // 6 button gamepad enabled
+  if (PicoOpt & POPT_6BTN_PAD)
+  {
     int phase = Pico.m.padTHPhase[i];
 
     if(phase == 2 && !(data_reg&0x40)) { // TH
@@ -209,6 +210,14 @@ static u32 OtherRead16End(u32 a, int realsize)
 {
   u32 d=0;
 
+  // 32x test
+/*
+  if      (a == 0xa130ec) { d = 0x4d41; goto end; } // MA
+  else if (a == 0xa130ee) { d = 0x5253; goto end; } // RS
+  else if (a == 0xa15100) { d = 0x0080; goto end; }
+  else
+*/
+
   // for games with simple protection devices, discovered by Haze
   // some dumb detection is used, but that should be enough to make things work
   if ((a>>22) == 1 && Pico.romsize >= 512*1024) {
@@ -303,19 +312,8 @@ static void OtherWrite8End(u32 a,u32 d,int realsize)
 #endif
   elprintf(EL_UIO, "strange w%i: %06x, %08x @%06x", realsize, a&0xffffff, d, SekPc);
 
-  if(a >= 0xA13004 && a < 0xA13040) {
-    // dumb 12-in-1 or 4-in-1 banking support
-    int len;
-    a &= 0x3f; a <<= 16;
-    len = Pico.romsize - a;
-    if (len <= 0) return; // invalid/missing bank
-    if (len > 0x200000) len = 0x200000; // 2 megs
-    memcpy(Pico.rom, Pico.rom+a, len); // code which does this is in RAM so this is safe.
-    return;
-  }
-
   // for games with simple protection devices, discovered by Haze
-  else if ((a>>22) == 1)
+  if ((a>>22) == 1)
     Pico.m.prot_bytes[(a>>2)&1] = (u8)d;
 }
 
@@ -498,7 +496,6 @@ static void PicoWrite32(u32 a,u32 d)
 
 // -----------------------------------------------------------------
 
-// TODO: asm code
 static void OtherWrite16End(u32 a,u32 d,int realsize)
 {
   PicoWrite8Hook(a,  d>>8, realsize);
@@ -517,6 +514,10 @@ PICO_INTERNAL void PicoMemResetHooks(void)
   PicoWrite16Hook = OtherWrite16End;
 }
 
+#ifdef EMU_M68K
+static void m68k_mem_setup(void);
+#endif
+
 PICO_INTERNAL void PicoMemSetup(void)
 {
   // Setup memory callbacks:
@@ -540,7 +541,7 @@ PICO_INTERNAL void PicoMemSetup(void)
   // setup FAME fetchmap
   {
     int i;
-    // by default, point everything to fitst 64k of ROM
+    // by default, point everything to first 64k of ROM
     for (i = 0; i < M68K_FETCHBANK1; i++)
       PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
     // now real ROM
@@ -551,15 +552,24 @@ PICO_INTERNAL void PicoMemSetup(void)
       PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
   }
 #endif
+#ifdef EMU_M68K
+  m68k_mem_setup();
+#endif
 }
 
-
+/* some nasty things below :( */
 #ifdef EMU_M68K
-unsigned int  m68k_read_pcrelative_CD8 (unsigned int a);
-unsigned int  m68k_read_pcrelative_CD16(unsigned int a);
-unsigned int  m68k_read_pcrelative_CD32(unsigned int a);
-
-// these are allowed to access RAM
+unsigned int (*pm68k_read_memory_8) (unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_16)(unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_32)(unsigned int address) = NULL;
+void (*pm68k_write_memory_8) (unsigned int address, unsigned char  value) = NULL;
+void (*pm68k_write_memory_16)(unsigned int address, unsigned short value) = NULL;
+void (*pm68k_write_memory_32)(unsigned int address, unsigned int   value) = NULL;
+unsigned int (*pm68k_read_memory_pcr_8) (unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_pcr_16)(unsigned int address) = NULL;
+unsigned int (*pm68k_read_memory_pcr_32)(unsigned int address) = NULL;
+
+// these are here for core debugging mode
 static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
 {
   a&=0xffffff;
@@ -567,9 +577,7 @@ static unsigned int  m68k_read_8 (unsigned int a, int do_fake)
 #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;
+  return pm68k_read_memory_pcr_8(a);
 }
 static unsigned int  m68k_read_16(unsigned int a, int do_fake)
 {
@@ -578,9 +586,7 @@ static unsigned int  m68k_read_16(unsigned int a, int do_fake)
 #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;
+  return pm68k_read_memory_pcr_16(a);
 }
 static unsigned int  m68k_read_32(unsigned int a, int do_fake)
 {
@@ -589,9 +595,7 @@ static unsigned int  m68k_read_32(unsigned int a, int do_fake)
 #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;
+  return pm68k_read_memory_pcr_32(a);
 }
 
 unsigned int m68k_read_pcrelative_8 (unsigned int a)   { return m68k_read_8 (a, 1); }
@@ -603,6 +607,24 @@ 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); }
 
+static unsigned int m68k_read_memory_pcr_8(unsigned int a)
+{
+  if((a&0xe00000)==0xe00000) return *(u8 *)(Pico.ram+((a^1)&0xffff)); // Ram
+  return 0;
+}
+
+static unsigned int m68k_read_memory_pcr_16(unsigned int a)
+{
+  if((a&0xe00000)==0xe00000) return *(u16 *)(Pico.ram+(a&0xfffe)); // Ram
+  return 0;
+}
+
+static unsigned int m68k_read_memory_pcr_32(unsigned int a)
+{
+  if((a&0xe00000)==0xe00000) { u16 *pm=(u16 *)(Pico.ram+(a&0xfffe)); return (pm[0]<<16)|pm[1]; } // Ram
+  return 0;
+}
+
 #ifdef EMU_CORE_DEBUG
 // ROM only
 unsigned int m68k_read_memory_8(unsigned int a)
@@ -638,49 +660,258 @@ unsigned int m68k_read_memory_32(unsigned int a)
 void m68k_write_memory_8(unsigned int address, unsigned int value)  { lastwrite_mus_d[lwp_mus++&15] = value; }
 void m68k_write_memory_16(unsigned int address, unsigned int value) { lastwrite_mus_d[lwp_mus++&15] = value; }
 void m68k_write_memory_32(unsigned int address, unsigned int value) { lastwrite_mus_d[lwp_mus++&15] = value; }
-#else
-unsigned char  PicoReadCD8w (unsigned int a);
-unsigned short PicoReadCD16w(unsigned int a);
-unsigned int   PicoReadCD32w(unsigned int a);
-void PicoWriteCD8w (unsigned int a, unsigned char d);
-void PicoWriteCD16w(unsigned int a, unsigned short d);
-void PicoWriteCD32w(unsigned int a, unsigned int d);
+
+#else // if !EMU_CORE_DEBUG
 
 /* it appears that Musashi doesn't always mask the unused bits */
-unsigned int  m68k_read_memory_8(unsigned int address)
-{
-    unsigned int d = (PicoMCD&1) ? PicoReadCD8w(address) : PicoRead8(address);
-    return d&0xff;
+unsigned int m68k_read_memory_8 (unsigned int address) { return pm68k_read_memory_8 (address) & 0xff; }
+unsigned int m68k_read_memory_16(unsigned int address) { return pm68k_read_memory_16(address) & 0xffff; }
+unsigned int m68k_read_memory_32(unsigned int address) { return pm68k_read_memory_32(address); }
+void m68k_write_memory_8 (unsigned int address, unsigned int value) { pm68k_write_memory_8 (address, (u8)value); }
+void m68k_write_memory_16(unsigned int address, unsigned int value) { pm68k_write_memory_16(address,(u16)value); }
+void m68k_write_memory_32(unsigned int address, unsigned int value) { pm68k_write_memory_32(address, value); }
+#endif // !EMU_CORE_DEBUG
+
+static void m68k_mem_setup(void)
+{
+  pm68k_read_memory_8  = PicoRead8;
+  pm68k_read_memory_16 = PicoRead16;
+  pm68k_read_memory_32 = PicoRead32;
+  pm68k_write_memory_8  = PicoWrite8;
+  pm68k_write_memory_16 = PicoWrite16;
+  pm68k_write_memory_32 = PicoWrite32;
+  pm68k_read_memory_pcr_8  = m68k_read_memory_pcr_8;
+  pm68k_read_memory_pcr_16 = m68k_read_memory_pcr_16;
+  pm68k_read_memory_pcr_32 = m68k_read_memory_pcr_32;
 }
+#endif // EMU_M68K
+
+
+// -----------------------------------------------------------------
+
+extern const unsigned short vcounts[];
 
-unsigned int  m68k_read_memory_16(unsigned int address)
+static int get_scanline(int is_from_z80)
 {
-    unsigned int d = (PicoMCD&1) ? PicoReadCD16w(address) : PicoRead16(address);
-    return d&0xffff;
+  if (is_from_z80) {
+    int cycles = z80_cyclesDone();
+    while (cycles - z80_scanline_cycles >= 228)
+      z80_scanline++, z80_scanline_cycles += 228;
+    return z80_scanline;
+  }
+
+  if (Pico.m.scanline != -1)
+    return Pico.m.scanline;
+
+  return vcounts[SekCyclesDone()>>8];
 }
 
-unsigned int  m68k_read_memory_32(unsigned int address)
+/* probably not should be in this file, but it's near related code here */
+void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)
 {
-    return (PicoMCD&1) ? PicoReadCD32w(address) : PicoRead32(address);
+  int xcycles = z80_cycles << 8;
+
+  /* check for overflows */
+  if ((mode_old & 4) && xcycles > timer_a_next_oflow)
+    ym2612.OPN.ST.status |= 1;
+
+  if ((mode_old & 8) && xcycles > timer_b_next_oflow)
+    ym2612.OPN.ST.status |= 2;
+
+  /* update timer a */
+  if (mode_old & 1)
+    while (xcycles >= timer_a_next_oflow)
+      timer_a_next_oflow += timer_a_step;
+
+  if ((mode_old ^ mode_new) & 1) // turning on/off
+  {
+    if (mode_old & 1) {
+      timer_a_offset = timer_a_next_oflow - xcycles;
+      timer_a_next_oflow = 0x70000000;
+    }
+    else
+      timer_a_next_oflow = xcycles + timer_a_offset;
+  }
+  if (mode_new & 1)
+    elprintf(EL_YMTIMER, "timer a upd to %i @ %i", timer_a_next_oflow>>8, z80_cycles);
+
+  /* update timer b */
+  if (mode_old & 2)
+    while (xcycles >= timer_b_next_oflow)
+      timer_b_next_oflow += timer_b_step;
+
+  if ((mode_old ^ mode_new) & 2)
+  {
+    if (mode_old & 2) {
+      timer_b_offset = timer_b_next_oflow - xcycles;
+      timer_b_next_oflow = 0x70000000;
+    }
+    else
+      timer_b_next_oflow = xcycles + timer_b_offset;
+  }
+  if (mode_new & 2)
+    elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles);
 }
 
-void m68k_write_memory_8(unsigned int address, unsigned int value)
+// ym2612 DAC and timer I/O handlers for z80
+int ym2612_write_local(u32 a, u32 d, int is_from_z80)
 {
-    if (PicoMCD&1) PicoWriteCD8w(address, (u8)value); else PicoWrite8(address, (u8)value);
+  int addr;
+
+  a &= 3;
+  if (a == 1 && ym2612.OPN.ST.address == 0x2a) /* DAC data */
+  {
+    int scanline = get_scanline(is_from_z80);
+    //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", PsndDacLine, scanline, d, is_from_z80);
+    ym2612.dacout = ((int)d - 0x80) << 6;
+    if (PsndOut && ym2612.dacen && scanline >= PsndDacLine)
+      PsndDoDAC(scanline);
+    return 0;
+  }
+
+  switch (a)
+  {
+    case 0: /* address port 0 */
+      ym2612.OPN.ST.address = d;
+      ym2612.addr_A1 = 0;
+#ifdef __GP2X__
+      if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
+#endif
+      return 0;
+
+    case 1: /* data port 0    */
+      if (ym2612.addr_A1 != 0)
+        return 0;
+
+      addr = ym2612.OPN.ST.address;
+      ym2612.REGS[addr] = d;
+
+      switch (addr)
+      {
+        case 0x24: // timer A High 8
+        case 0x25: { // timer A Low 2
+          int TAnew = (addr == 0x24) ? ((ym2612.OPN.ST.TA & 0x03)|(((int)d)<<2))
+                                     : ((ym2612.OPN.ST.TA & 0x3fc)|(d&3));
+          if (ym2612.OPN.ST.TA != TAnew)
+          {
+            //elprintf(EL_STATUS, "timer a set %i", TAnew);
+            ym2612.OPN.ST.TA = TAnew;
+            //ym2612.OPN.ST.TAC = (1024-TAnew)*18;
+            //ym2612.OPN.ST.TAT = 0;
+            //
+            timer_a_step = timer_a_offset = 16495 * (1024 - TAnew);
+            if (ym2612.OPN.ST.mode & 1) {
+              int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+              timer_a_next_oflow = (cycles << 8) + timer_a_step;
+            }
+            elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, timer_a_next_oflow>>8);
+          }
+          return 0;
+        }
+        case 0x26: // timer B
+          if (ym2612.OPN.ST.TB != d) {
+            //elprintf(EL_STATUS, "timer b set %i", d);
+            ym2612.OPN.ST.TB = d;
+            //ym2612.OPN.ST.TBC  = (256-d)<<4;
+            //ym2612.OPN.ST.TBC *= 18;
+            //ym2612.OPN.ST.TBT  = 0;
+            timer_b_step = timer_b_offset = 263912 * (256 - d);
+            if (ym2612.OPN.ST.mode & 2) {
+              int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+              timer_b_next_oflow = (cycles << 8) + timer_b_step;
+            }
+            elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, timer_b_next_oflow>>8);
+          }
+          return 0;
+        case 0x27: { /* mode, timer control */
+          int old_mode = ym2612.OPN.ST.mode;
+          int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+          ym2612.OPN.ST.mode = d;
+
+          elprintf(EL_YMTIMER, "st mode %02x", d);
+          ym2612_sync_timers(cycles, old_mode, d);
+
+          /* reset Timer a flag */
+          if (d & 0x10)
+            ym2612.OPN.ST.status &= ~1;
+
+          /* reset Timer b flag */
+          if (d & 0x20)
+            ym2612.OPN.ST.status &= ~2;
+
+          if ((d ^ old_mode) & 0xc0) {
+#ifdef __GP2X__
+            if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));
+#endif
+            return 1;
+          }
+          return 0;
+        }
+        case 0x2b: { /* DAC Sel  (YM2612) */
+          int scanline = get_scanline(is_from_z80);
+          ym2612.dacen = d & 0x80;
+          if (d & 0x80) PsndDacLine = scanline;
+#ifdef __GP2X__
+          if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);
+#endif
+          return 0;
+        }
+      }
+      break;
+
+    case 2: /* address port 1 */
+      ym2612.OPN.ST.address = d;
+      ym2612.addr_A1 = 1;
+#ifdef __GP2X__
+      if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
+#endif
+      return 0;
+
+    case 3: /* data port 1    */
+      if (ym2612.addr_A1 != 1)
+        return 0;
+
+      addr = ym2612.OPN.ST.address | 0x100;
+      ym2612.REGS[addr] = d;
+      break;
+  }
+
+#ifdef __GP2X__
+  if (PicoOpt & POPT_EXT_FM)
+    return YM2612Write_940(a, d, get_scanline(is_from_z80));
+#endif
+  return YM2612Write_(a, d);
 }
 
-void m68k_write_memory_16(unsigned int address, unsigned int value)
+// TODO: savestates
+#define ym2612_read_local() \
+  if (xcycles >= timer_a_next_oflow) \
+    ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \
+  if (xcycles >= timer_b_next_oflow) \
+    ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2
+
+
+u32 ym2612_read_local_z80(void)
 {
-    if (PicoMCD&1) PicoWriteCD16w(address,(u16)value); else PicoWrite16(address,(u16)value);
+  int xcycles = z80_cyclesDone() << 8;
+
+  ym2612_read_local();
+
+  elprintf(EL_YMTIMER, "timer z80 read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status,
+      timer_a_next_oflow>>8, timer_b_next_oflow>>8, xcycles >> 8, (xcycles >> 8) / 228);
+  return ym2612.OPN.ST.status;
 }
 
-void m68k_write_memory_32(unsigned int address, unsigned int value)
+u32 ym2612_read_local_68k(void)
 {
-    if (PicoMCD&1) PicoWriteCD32w(address, value); else PicoWrite32(address, value);
-}
-#endif
-#endif // EMU_M68K
+  int xcycles = cycles_68k_to_z80(SekCyclesDone()) << 8;
 
+  ym2612_read_local();
+
+  elprintf(EL_YMTIMER, "timer 68k read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status,
+      timer_a_next_oflow>>8, timer_b_next_oflow>>8, xcycles >> 8, (xcycles >> 8) / 228);
+  return ym2612.OPN.ST.status;
+}
 
 // -----------------------------------------------------------------
 //                        z80 memhandlers
@@ -691,7 +922,7 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
 
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
-    if (PicoOpt&1) ret = (u8) YM2612Read();
+    if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();
     return ret;
   }
 
@@ -702,9 +933,12 @@ PICO_INTERNAL unsigned char z80_read(unsigned short a)
     addr68k=Pico.m.z80_bank68k<<15;
     addr68k+=a&0x7fff;
 
-    if (PicoMCD & 1)
+    if (addr68k < Pico.romsize) { ret = Pico.rom[addr68k^1]; goto bnkend; }
+    elprintf(EL_ANOMALY, "z80->68k upper read [%06x] %02x", addr68k, ret);
+    if (PicoAHW & PAHW_MCD)
          ret = PicoReadM68k8(addr68k);
     else ret = PicoRead8(addr68k);
+bnkend:
     elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);
     return ret;
   }
@@ -724,13 +958,13 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
 {
   if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)
   {
-    if(PicoOpt&1) emustatus|=YM2612Write(a, data) & 1;
+    if(PicoOpt&POPT_EN_FM) emustatus|=ym2612_write_local(a, data, 1) & 1;
     return;
   }
 
   if ((a&0xfff9)==0x7f11) // 7f11 7f13 7f15 7f17
   {
-    if(PicoOpt&2) SN76496Write(data);
+    if(PicoOpt&POPT_EN_PSG) SN76496Write(data);
     return;
   }
 
@@ -749,7 +983,7 @@ PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data)
     addr68k=Pico.m.z80_bank68k<<15;
     addr68k+=a&0x7fff;
     elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, data);
-    if (PicoMCD & 1)
+    if (PicoAHW & PAHW_MCD)
          PicoWriteM68k8(addr68k, data);
     else PicoWrite8(addr68k, data);
     return;