X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=b49956e3d3b6626fdf0472528102016700f322a3;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=34ef99d6a0eea26e1aee16023cdd6b9cc6209adb;hpb=75b84e4b7c446cf42a2838834b5d50a4059709fe;p=picodrive.git

diff --git a/pico/memory.c b/pico/memory.c
index 34ef99d..b49956e 100644
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -210,7 +210,7 @@ void cyclone_crashed(u32 pc, struct Cyclone *context)
 
 static u32 read_pad_3btn(int i, u32 out_bits)
 {
-  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  u32 pad = ~PicoIn.padInt[i]; // Get inverse of pad MXYZ SACB RLDU
   u32 value;
 
   if (out_bits & 0x40) // TH
@@ -224,7 +224,7 @@ static u32 read_pad_3btn(int i, u32 out_bits)
 
 static u32 read_pad_6btn(int i, u32 out_bits)
 {
-  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  u32 pad = ~PicoIn.padInt[i]; // Get inverse of pad MXYZ SACB RLDU
   int phase = Pico.m.padTHPhase[i];
   u32 value;
 
@@ -265,8 +265,8 @@ static port_read_func *port_readers[3] = {
 
 static NOINLINE u32 port_read(int i)
 {
-  u32 data_reg = Pico.ioports[i + 1];
-  u32 ctrl_reg = Pico.ioports[i + 4] | 0x80;
+  u32 data_reg = PicoMem.ioports[i + 1];
+  u32 ctrl_reg = PicoMem.ioports[i + 4] | 0x80;
   u32 in, out;
 
   out = data_reg & ctrl_reg;
@@ -310,7 +310,7 @@ NOINLINE u32 io_ports_read(u32 a)
     case 1:  d = port_read(0); break;
     case 2:  d = port_read(1); break;
     case 3:  d = port_read(2); break;
-    default: d = Pico.ioports[a]; break; // IO ports can be used as RAM
+    default: d = PicoMem.ioports[a]; break; // IO ports can be used as RAM
   }
   return d;
 }
@@ -323,34 +323,33 @@ NOINLINE void io_ports_write(u32 a, u32 d)
   if (1 <= a && a <= 2)
   {
     Pico.m.padDelay[a - 1] = 0;
-    if (!(Pico.ioports[a] & 0x40) && (d & 0x40))
+    if (!(PicoMem.ioports[a] & 0x40) && (d & 0x40))
       Pico.m.padTHPhase[a - 1]++;
   }
 
   // certain IO ports can be used as RAM
-  Pico.ioports[a] = d;
+  PicoMem.ioports[a] = d;
 }
 
-// lame..
 static int z80_cycles_from_68k(void)
 {
-  return z80_cycle_aim
-    + cycles_68k_to_z80(SekCyclesDone() - last_z80_sync);
+  int m68k_cnt = SekCyclesDone() - Pico.t.m68c_frame_start;
+  return cycles_68k_to_z80(m68k_cnt);
 }
 
 void NOINLINE ctl_write_z80busreq(u32 d)
 {
   d&=1; d^=1;
-  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
+  elprintf(EL_BUSREQ, "set_zrun: %i->%i [%u] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);
   if (d ^ Pico.m.z80Run)
   {
     if (d)
     {
-      z80_cycle_cnt = z80_cycles_from_68k();
+      Pico.t.z80c_cnt = z80_cycles_from_68k() + 2;
     }
     else
     {
-      if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset) {
+      if ((PicoIn.opt & POPT_EN_Z80) && !Pico.m.z80_reset) {
         pprof_start(m68k);
         PicoSyncZ80(SekCyclesDone());
         pprof_end_sub(m68k);
@@ -363,12 +362,12 @@ void NOINLINE ctl_write_z80busreq(u32 d)
 void NOINLINE ctl_write_z80reset(u32 d)
 {
   d&=1; d^=1;
-  elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
+  elprintf(EL_BUSREQ, "set_zreset: %i->%i [%u] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);
   if (d ^ Pico.m.z80_reset)
   {
     if (d)
     {
-      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run) {
+      if ((PicoIn.opt & POPT_EN_Z80) && Pico.m.z80Run) {
         pprof_start(m68k);
         PicoSyncZ80(SekCyclesDone());
         pprof_end_sub(m68k);
@@ -378,7 +377,7 @@ void NOINLINE ctl_write_z80reset(u32 d)
     }
     else
     {
-      z80_cycle_cnt = z80_cycles_from_68k();
+      Pico.t.z80c_cnt = z80_cycles_from_68k() + 2;
       z80_reset();
     }
     Pico.m.z80_reset = d;
@@ -415,14 +414,14 @@ static void psg_write_z80(u32 d)
 static u32 PicoRead8_sram(u32 a)
 {
   u32 d;
-  if (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))
+  if (Pico.sv.start <= a && a <= Pico.sv.end && (Pico.m.sram_reg & SRR_MAPPED))
   {
-    if (SRam.flags & SRF_EEPROM) {
+    if (Pico.sv.flags & SRF_EEPROM) {
       d = EEPROM_read();
       if (!(a & 1))
         d >>= 8;
     } else
-      d = *(u8 *)(SRam.data - SRam.start + a);
+      d = *(u8 *)(Pico.sv.data - Pico.sv.start + a);
     elprintf(EL_SRAMIO, "sram r8  [%06x]   %02x @ %06x", a, d, SekPc);
     return d;
   }
@@ -437,12 +436,12 @@ static u32 PicoRead8_sram(u32 a)
 static u32 PicoRead16_sram(u32 a)
 {
   u32 d;
-  if (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))
+  if (Pico.sv.start <= a && a <= Pico.sv.end && (Pico.m.sram_reg & SRR_MAPPED))
   {
-    if (SRam.flags & SRF_EEPROM)
+    if (Pico.sv.flags & SRF_EEPROM)
       d = EEPROM_read();
     else {
-      u8 *pm = (u8 *)(SRam.data - SRam.start + a);
+      u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);
       d  = pm[0] << 8;
       d |= pm[1];
     }
@@ -460,20 +459,20 @@ static u32 PicoRead16_sram(u32 a)
 
 static void PicoWrite8_sram(u32 a, u32 d)
 {
-  if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
+  if (a > Pico.sv.end || a < Pico.sv.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
     m68k_unmapped_write8(a, d);
     return;
   }
 
   elprintf(EL_SRAMIO, "sram w8  [%06x]   %02x @ %06x", a, d & 0xff, SekPc);
-  if (SRam.flags & SRF_EEPROM)
+  if (Pico.sv.flags & SRF_EEPROM)
   {
     EEPROM_write8(a, d);
   }
   else {
-    u8 *pm = (u8 *)(SRam.data - SRam.start + a);
+    u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);
     if (*pm != (u8)d) {
-      SRam.changed = 1;
+      Pico.sv.changed = 1;
       *pm = (u8)d;
     }
   }
@@ -481,24 +480,24 @@ static void PicoWrite8_sram(u32 a, u32 d)
 
 static void PicoWrite16_sram(u32 a, u32 d)
 {
-  if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
+  if (a > Pico.sv.end || a < Pico.sv.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
     m68k_unmapped_write16(a, d);
     return;
   }
 
   elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d & 0xffff, SekPc);
-  if (SRam.flags & SRF_EEPROM)
+  if (Pico.sv.flags & SRF_EEPROM)
   {
     EEPROM_write16(d);
   }
   else {
-    u8 *pm = (u8 *)(SRam.data - SRam.start + a);
+    u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);
     if (pm[0] != (u8)(d >> 8)) {
-      SRam.changed = 1;
+      Pico.sv.changed = 1;
       pm[0] = (u8)(d >> 8);
     }
     if (pm[1] != (u8)d) {
-      SRam.changed = 1;
+      Pico.sv.changed = 1;
       pm[1] = (u8)d;
     }
   }
@@ -516,7 +515,7 @@ static u32 PicoRead8_z80(u32 a)
   }
 
   if ((a & 0x4000) == 0x0000)
-    d = Pico.zram[a & 0x1fff];
+    d = PicoMem.zram[a & 0x1fff];
   else if ((a & 0x6000) == 0x4000) // 0x4000-0x5fff
     d = ym2612_read_local_68k(); 
   else
@@ -539,13 +538,12 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }
 
   if ((a & 0x4000) == 0x0000) { // z80 RAM
-    SekCyclesBurnRun(2); // FIXME hack
-    Pico.zram[a & 0x1fff] = (u8)d;
+    PicoMem.zram[a & 0x1fff] = (u8)d;
     return;
   }
   if ((a & 0x6000) == 0x4000) { // FM Sound
-    if (PicoOpt & POPT_EN_FM)
-      emustatus |= ym2612_write_local(a&3, d&0xff, 0)&1;
+    if (PicoIn.opt & POPT_EN_FM)
+      Pico.m.status |= ym2612_write_local(a & 3, d & 0xff, 0) & 1;
     return;
   }
   // TODO: probably other VDP access too? Maybe more mirrors?
@@ -594,17 +592,13 @@ u32 PicoRead8_io(u32 a)
 
     if ((a & 0xff01) == 0x1100) { // z80 busreq (verified)
       d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1;
-      elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d, SekCyclesDone(), SekPc);
+      elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc);
     }
     goto end;
   }
 
-  if (PicoOpt & POPT_EN_32X) {
-    d = PicoRead8_32x(a);
-    goto end;
-  }
+  d = PicoRead8_32x(a);
 
-  d = m68k_unmapped_read8(a);
 end:
   return d;
 }
@@ -629,17 +623,13 @@ u32 PicoRead16_io(u32 a)
 
     if ((a & 0xff00) == 0x1100) { // z80 busreq
       d |= ((Pico.m.z80Run | Pico.m.z80_reset) & 1) << 8;
-      elprintf(EL_BUSREQ, "get_zrun: %04x [%i] @%06x", d, SekCyclesDone(), SekPc);
+      elprintf(EL_BUSREQ, "get_zrun: %04x [%u] @%06x", d, SekCyclesDone(), SekPc);
     }
     goto end;
   }
 
-  if (PicoOpt & POPT_EN_32X) {
-    d = PicoRead16_32x(a);
-    goto end;
-  }
+  d = PicoRead16_32x(a);
 
-  d = m68k_unmapped_read16(a);
 end:
   return d;
 }
@@ -664,12 +654,7 @@ void PicoWrite8_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);
     return;
   }
-  if (PicoOpt & POPT_EN_32X) {
-    PicoWrite8_32x(a, d);
-    return;
-  }
-
-  m68k_unmapped_write8(a, d);
+  PicoWrite8_32x(a, d);
 }
 
 void PicoWrite16_io(u32 a, u32 d)
@@ -692,11 +677,7 @@ void PicoWrite16_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);
     return;
   }
-  if (PicoOpt & POPT_EN_32X) {
-    PicoWrite16_32x(a, d);
-    return;
-  }
-  m68k_unmapped_write16(a, d);
+  PicoWrite16_32x(a, d);
 }
 
 #endif // _ASM_MEMORY_C
@@ -767,7 +748,7 @@ static void m68k_mem_setup(void);
 
 PICO_INTERNAL void PicoMemSetup(void)
 {
-  int mask, rs, a;
+  int mask, rs, sstart, a;
 
   // setup the memory map
   cpu68k_map_set(m68k_read8_map,   0x000000, 0xffffff, m68k_unmapped_read8, 1);
@@ -783,15 +764,16 @@ PICO_INTERNAL void PicoMemSetup(void)
   cpu68k_map_set(m68k_read16_map, 0x000000, rs - 1, Pico.rom, 0);
 
   // Common case of on-cart (save) RAM, usually at 0x200000-...
-  if ((SRam.flags & SRF_ENABLED) && SRam.data != NULL) {
-    rs = SRam.end - SRam.start;
+  if ((Pico.sv.flags & SRF_ENABLED) && Pico.sv.data != NULL) {
+    sstart = Pico.sv.start;
+    rs = Pico.sv.end - sstart;
     rs = (rs + mask) & ~mask;
-    if (SRam.start + rs >= 0x1000000)
-      rs = 0x1000000 - SRam.start;
-    cpu68k_map_set(m68k_read8_map,   SRam.start, SRam.start + rs - 1, PicoRead8_sram, 1);
-    cpu68k_map_set(m68k_read16_map,  SRam.start, SRam.start + rs - 1, PicoRead16_sram, 1);
-    cpu68k_map_set(m68k_write8_map,  SRam.start, SRam.start + rs - 1, PicoWrite8_sram, 1);
-    cpu68k_map_set(m68k_write16_map, SRam.start, SRam.start + rs - 1, PicoWrite16_sram, 1);
+    if (sstart + rs >= 0x1000000)
+      rs = 0x1000000 - sstart;
+    cpu68k_map_set(m68k_read8_map,   sstart, sstart + rs - 1, PicoRead8_sram, 1);
+    cpu68k_map_set(m68k_read16_map,  sstart, sstart + rs - 1, PicoRead16_sram, 1);
+    cpu68k_map_set(m68k_write8_map,  sstart, sstart + rs - 1, PicoWrite8_sram, 1);
+    cpu68k_map_set(m68k_write16_map, sstart, sstart + rs - 1, PicoWrite16_sram, 1);
   }
 
   // Z80 region
@@ -818,10 +800,10 @@ PICO_INTERNAL void PicoMemSetup(void)
 
   // RAM and it's mirrors
   for (a = 0xe00000; a < 0x1000000; a += 0x010000) {
-    cpu68k_map_set(m68k_read8_map,   a, a + 0xffff, Pico.ram, 0);
-    cpu68k_map_set(m68k_read16_map,  a, a + 0xffff, Pico.ram, 0);
-    cpu68k_map_set(m68k_write8_map,  a, a + 0xffff, Pico.ram, 0);
-    cpu68k_map_set(m68k_write16_map, a, a + 0xffff, Pico.ram, 0);
+    cpu68k_map_set(m68k_read8_map,   a, a + 0xffff, PicoMem.ram, 0);
+    cpu68k_map_set(m68k_read16_map,  a, a + 0xffff, PicoMem.ram, 0);
+    cpu68k_map_set(m68k_write8_map,  a, a + 0xffff, PicoMem.ram, 0);
+    cpu68k_map_set(m68k_write16_map, a, a + 0xffff, PicoMem.ram, 0);
   }
 
   // Setup memory callbacks:
@@ -897,10 +879,11 @@ static void m68k_mem_setup(void)
 static int get_scanline(int is_from_z80)
 {
   if (is_from_z80) {
-    int cycles = z80_cyclesDone();
-    while (cycles - z80_scanline_cycles >= 228)
-      z80_scanline++, z80_scanline_cycles += 228;
-    return z80_scanline;
+    int mclk_z80 = z80_cyclesDone() * 15;
+    int mclk_line = Pico.t.z80_scanline * 488 * 7;
+    while (mclk_z80 - mclk_line >= 488 * 7)
+      Pico.t.z80_scanline++, mclk_line += 488 * 7;
+    return Pico.t.z80_scanline;
   }
 
   return Pico.m.scanline;
@@ -971,7 +954,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
       ym2612.OPN.ST.address = d;
       ym2612.addr_A1 = 0;
 #ifdef __GP2X__
-      if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
+      if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
 #endif
       return 0;
 
@@ -1036,7 +1019,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
 
           if ((d ^ old_mode) & 0xc0) {
 #ifdef __GP2X__
-            if (PicoOpt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));
+            if (PicoIn.opt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));
 #endif
             return 1;
           }
@@ -1049,7 +1032,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             PsndDacLine = scanline;
           }
 #ifdef __GP2X__
-          if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);
+          if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);
 #endif
           return 0;
         }
@@ -1060,7 +1043,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
       ym2612.OPN.ST.address = d;
       ym2612.addr_A1 = 1;
 #ifdef __GP2X__
-      if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
+      if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);
 #endif
       return 0;
 
@@ -1074,7 +1057,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   }
 
 #ifdef __GP2X__
-  if (PicoOpt & POPT_EXT_FM)
+  if (PicoIn.opt & POPT_EXT_FM)
     return YM2612Write_940(a, d, get_scanline(is_from_z80));
 #endif
   return YM2612Write_(a, d);
@@ -1123,7 +1106,7 @@ void ym2612_pack_state(void)
   elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc);
 
 #ifdef __GP2X__
-  if (PicoOpt & POPT_EXT_FM)
+  if (PicoIn.opt & POPT_EXT_FM)
     YM2612PicoStateSave2_940(tat, tbt);
   else
 #endif
@@ -1158,7 +1141,7 @@ void ym2612_unpack_state(void)
   }
 
 #ifdef __GP2X__
-  if (PicoOpt & POPT_EXT_FM)
+  if (PicoIn.opt & POPT_EXT_FM)
     ret = YM2612PicoStateLoad2_940(&tat, &tbt);
   else
 #endif
@@ -1195,6 +1178,8 @@ void PicoWrite16_32x(u32 a, u32 d) {}
 
 static unsigned char z80_md_vdp_read(unsigned short a)
 {
+  z80_subCLeft(2);
+
   if ((a & 0x00f0) == 0x0000) {
     switch (a & 0x0d)
     {
@@ -1218,8 +1203,10 @@ static unsigned char z80_md_bank_read(unsigned short a)
   unsigned int addr68k;
   unsigned char ret;
 
-  addr68k = Pico.m.z80_bank68k<<15;
-  addr68k += a & 0x7fff;
+  z80_subCLeft(3);
+
+  addr68k = Pico.m.z80_bank68k << 15;
+  addr68k |= a & 0x7fff;
 
   ret = m68k_read8(addr68k);
 
@@ -1229,8 +1216,8 @@ static unsigned char z80_md_bank_read(unsigned short a)
 
 static void z80_md_ym2612_write(unsigned int a, unsigned char data)
 {
-  if (PicoOpt & POPT_EN_FM)
-    emustatus |= ym2612_write_local(a, data, 1) & 1;
+  if (PicoIn.opt & POPT_EN_FM)
+    Pico.m.status |= ym2612_write_local(a, data, 1) & 1;
 }
 
 static void z80_md_vdp_br_write(unsigned int a, unsigned char data)
@@ -1279,14 +1266,14 @@ static void z80_md_out(unsigned short p, unsigned char d)
 
 static void z80_mem_setup(void)
 {
-  z80_map_set(z80_read_map, 0x0000, 0x1fff, Pico.zram, 0);
-  z80_map_set(z80_read_map, 0x2000, 0x3fff, Pico.zram, 0);
+  z80_map_set(z80_read_map, 0x0000, 0x1fff, PicoMem.zram, 0);
+  z80_map_set(z80_read_map, 0x2000, 0x3fff, PicoMem.zram, 0);
   z80_map_set(z80_read_map, 0x4000, 0x5fff, ym2612_read_local_z80, 1);
   z80_map_set(z80_read_map, 0x6000, 0x7fff, z80_md_vdp_read, 1);
   z80_map_set(z80_read_map, 0x8000, 0xffff, z80_md_bank_read, 1);
 
-  z80_map_set(z80_write_map, 0x0000, 0x1fff, Pico.zram, 0);
-  z80_map_set(z80_write_map, 0x2000, 0x3fff, Pico.zram, 0);
+  z80_map_set(z80_write_map, 0x0000, 0x1fff, PicoMem.zram, 0);
+  z80_map_set(z80_write_map, 0x2000, 0x3fff, PicoMem.zram, 0);
   z80_map_set(z80_write_map, 0x4000, 0x5fff, z80_md_ym2612_write, 1);
   z80_map_set(z80_write_map, 0x6000, 0x7fff, z80_md_vdp_br_write, 1);
   z80_map_set(z80_write_map, 0x8000, 0xffff, z80_md_bank_write, 1);
@@ -1296,8 +1283,8 @@ static void z80_mem_setup(void)
   drZ80.z80_out = z80_md_out;
 #endif
 #ifdef _USE_CZ80
-  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (FPTR)Pico.zram); // main RAM
-  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)Pico.zram); // mirror
+  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (FPTR)PicoMem.zram); // main RAM
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)PicoMem.zram); // mirror
   Cz80_Set_INPort(&CZ80, z80_md_in);
   Cz80_Set_OUTPort(&CZ80, z80_md_out);
 #endif