X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=83fe18196f02950ec7b60d9c27dca5a349020efe;hb=c6b118c0ad6b51e36855601de0913437833ba63b;hp=ac4b31fd05d95afa6f1515e62698676b919bc097;hpb=bf61bea0f2e94206a79fecc83b719f24cfc951c2;p=picodrive.git

diff --git a/pico/memory.c b/pico/memory.c
index ac4b31f..83fe181 100644
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -1,11 +1,11 @@
-// This is part of Pico Library
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * memory handling
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include "pico_int.h"
 #include "memory.h"
@@ -23,6 +23,11 @@ uptr m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
 static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
     const void *func_or_mh, int is_func)
 {
+#ifdef __clang__
+  // workaround bug (segfault) in 
+  // Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
+  volatile 
+#endif
   uptr addr = (uptr)func_or_mh;
   int mask = (1 << shift) - 1;
   int i;
@@ -44,7 +49,7 @@ static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
   for (i = start_addr >> shift; i <= end_addr >> shift; i++) {
     map[i] = addr >> 1;
     if (is_func)
-      map[i] |= (uptr)1 << (sizeof(addr) * 8 - 1);
+      map[i] |= MAP_FLAG;
   }
 }
 
@@ -58,6 +63,17 @@ void cpu68k_map_set(uptr *map, int start_addr, int end_addr,
     const void *func_or_mh, int is_func)
 {
   xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);
+#ifdef EMU_F68K
+  // setup FAME fetchmap
+  if (!is_func)
+  {
+    int shiftout = 24 - FAMEC_FETCHBITS;
+    int i = start_addr >> shiftout;
+    uptr base = (uptr)func_or_mh - (i << shiftout);
+    for (; i <= (end_addr >> shiftout); i++)
+      PicoCpuFM68k.Fetch[i] = base;
+  }
+#endif
 }
 
 // more specialized/optimized function (does same as above)
@@ -84,6 +100,17 @@ void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub)
   addr >>= 1;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
     r8map[i] = r16map[i] = w8map[i] = w16map[i] = addr;
+#ifdef EMU_F68K
+  // setup FAME fetchmap
+  {
+    M68K_CONTEXT *ctx = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;
+    int shiftout = 24 - FAMEC_FETCHBITS;
+    i = start_addr >> shiftout;
+    addr = (uptr)ptr - (i << shiftout);
+    for (; i <= (end_addr >> shiftout); i++)
+      ctx->Fetch[i] = addr;
+  }
+#endif
 }
 
 static u32 m68k_unmapped_read8(u32 a)
@@ -110,25 +137,30 @@ static void m68k_unmapped_write16(u32 a, u32 d)
 
 void m68k_map_unmap(int start_addr, int end_addr)
 {
+#ifdef __clang__
+  // workaround bug (segfault) in 
+  // Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
+  volatile 
+#endif
   uptr addr;
   int shift = M68K_MEM_SHIFT;
   int i;
 
   addr = (uptr)m68k_unmapped_read8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_read8_map[i] = (addr >> 1) | (1 << 31);
+    m68k_read8_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_read16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_read16_map[i] = (addr >> 1) | (1 << 31);
+    m68k_read16_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_write8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_write8_map[i] = (addr >> 1) | (1 << 31);
+    m68k_write8_map[i] = (addr >> 1) | MAP_FLAG;
 
   addr = (uptr)m68k_unmapped_write16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
-    m68k_write16_map[i] = (addr >> 1) | (1 << 31);
+    m68k_write16_map[i] = (addr >> 1) | MAP_FLAG;
 }
 
 MAKE_68K_READ8(m68k_read8, m68k_read8_map)
@@ -176,62 +208,119 @@ void cyclone_crashed(u32 pc, struct Cyclone *context)
 // -----------------------------------------------------------------
 // memmap helpers
 
-#ifndef _ASM_MEMORY_C
-static
-#endif
-int PadRead(int i)
+static u32 read_pad_3btn(int i, u32 out_bits)
 {
-  int pad,value,data_reg;
-  pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
-  data_reg=Pico.ioports[i+1];
+  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  u32 value;
 
-  // orr the bits, which are set as output
-  value = data_reg&(Pico.ioports[i+4]|0x80);
+  if (out_bits & 0x40) // TH
+    value = pad & 0x3f;                      // ?1CB RLDU
+  else
+    value = ((pad & 0xc0) >> 2) | (pad & 3); // ?0SA 00DU
 
-  if (PicoOpt & POPT_6BTN_PAD)
-  {
-    int phase = Pico.m.padTHPhase[i];
-
-    if(phase == 2 && !(data_reg&0x40)) { // TH
-      value|=(pad&0xc0)>>2;              // ?0SA 0000
-      return value;
-    } else if(phase == 3) {
-      if(data_reg&0x40)
-        value|=(pad&0x30)|((pad>>8)&0xf);  // ?1CB MXYZ
-      else
-        value|=((pad&0xc0)>>2)|0x0f;       // ?0SA 1111
-      return value;
-    }
+  value |= out_bits & 0x40;
+  return value;
+}
+
+static u32 read_pad_6btn(int i, u32 out_bits)
+{
+  u32 pad = ~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
+  int phase = Pico.m.padTHPhase[i];
+  u32 value;
+
+  if (phase == 2 && !(out_bits & 0x40)) {
+    value = (pad & 0xc0) >> 2;                   // ?0SA 0000
+    goto out;
+  }
+  else if(phase == 3) {
+    if (out_bits & 0x40)
+      return (pad & 0x30) | ((pad >> 8) & 0xf);  // ?1CB MXYZ
+    else
+      return ((pad & 0xc0) >> 2) | 0x0f;         // ?0SA 1111
+    goto out;
   }
 
-  if(data_reg&0x40) // TH
-       value|=(pad&0x3f);              // ?1CB RLDU
-  else value|=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU
+  if (out_bits & 0x40) // TH
+    value = pad & 0x3f;                          // ?1CB RLDU
+  else
+    value = ((pad & 0xc0) >> 2) | (pad & 3);     // ?0SA 00DU
 
-  return value; // will mirror later
+out:
+  value |= out_bits & 0x40;
+  return value;
 }
 
-#ifndef _ASM_MEMORY_C
+static u32 read_nothing(int i, u32 out_bits)
+{
+  return 0xff;
+}
+
+typedef u32 (port_read_func)(int index, u32 out_bits);
 
-static u32 io_ports_read(u32 a)
+static port_read_func *port_readers[3] = {
+  read_pad_3btn,
+  read_pad_3btn,
+  read_nothing
+};
+
+static NOINLINE u32 port_read(int i)
+{
+  u32 data_reg = Pico.ioports[i + 1];
+  u32 ctrl_reg = Pico.ioports[i + 4] | 0x80;
+  u32 in, out;
+
+  out = data_reg & ctrl_reg;
+  out |= 0x7f & ~ctrl_reg; // pull-ups
+
+  in = port_readers[i](i, out);
+
+  return (in & ~ctrl_reg) | (data_reg & ctrl_reg);
+}
+
+void PicoSetInputDevice(int port, enum input_device device)
+{
+  port_read_func *func;
+
+  if (port < 0 || port > 2)
+    return;
+
+  switch (device) {
+  case PICO_INPUT_PAD_3BTN:
+    func = read_pad_3btn;
+    break;
+
+  case PICO_INPUT_PAD_6BTN:
+    func = read_pad_6btn;
+    break;
+
+  default:
+    func = read_nothing;
+    break;
+  }
+
+  port_readers[port] = func;
+}
+
+NOINLINE u32 io_ports_read(u32 a)
 {
   u32 d;
   a = (a>>1) & 0xf;
   switch (a) {
     case 0:  d = Pico.m.hardware; break; // Hardware value (Version register)
-    case 1:  d = PadRead(0); break;
-    case 2:  d = PadRead(1); break;
+    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
   }
   return d;
 }
 
-static void NOINLINE io_ports_write(u32 a, u32 d)
+NOINLINE void io_ports_write(u32 a, u32 d)
 {
   a = (a>>1) & 0xf;
 
   // 6 button gamepad: if TH went from 0 to 1, gamepad changes state
-  if (1 <= a && a <= 2 && (PicoOpt & POPT_6BTN_PAD))
+  if (1 <= a && a <= 2)
   {
     Pico.m.padDelay[a - 1] = 0;
     if (!(Pico.ioports[a] & 0x40) && (d & 0x40))
@@ -242,7 +331,12 @@ static void NOINLINE io_ports_write(u32 a, u32 d)
   Pico.ioports[a] = d;
 }
 
-#endif // _ASM_MEMORY_C
+// lame..
+static int z80_cycles_from_68k(void)
+{
+  return z80_cycle_aim
+    + cycles_68k_to_z80(SekCyclesDone() - last_z80_sync);
+}
 
 void NOINLINE ctl_write_z80busreq(u32 d)
 {
@@ -252,14 +346,13 @@ void NOINLINE ctl_write_z80busreq(u32 d)
   {
     if (d)
     {
-      z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());
+      z80_cycle_cnt = z80_cycles_from_68k();
     }
     else
     {
-      z80stopCycle = SekCyclesDone();
       if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset) {
         pprof_start(m68k);
-        PicoSyncZ80(z80stopCycle);
+        PicoSyncZ80(SekCyclesDone());
         pprof_end_sub(m68k);
       }
     }
@@ -285,7 +378,7 @@ void NOINLINE ctl_write_z80reset(u32 d)
     }
     else
     {
-      z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());
+      z80_cycle_cnt = z80_cycles_from_68k();
       z80_reset();
     }
     Pico.m.z80_reset = d;
@@ -377,11 +470,14 @@ static void PicoWrite16_sram(u32 a, u32 d)
     EEPROM_write16(d);
   }
   else {
-    // XXX: hardware could easily use MSB too..
     u8 *pm = (u8 *)(SRam.data - SRam.start + a);
-    if (*pm != (u8)d) {
+    if (pm[0] != (u8)(d >> 8)) {
       SRam.changed = 1;
-      *pm = (u8)d;
+      pm[0] = (u8)(d >> 8);
+    }
+    if (pm[1] != (u8)d) {
+      SRam.changed = 1;
+      pm[1] = (u8)d;
     }
   }
 }
@@ -421,7 +517,7 @@ static void PicoWrite8_z80(u32 a, u32 d)
   }
 
   if ((a & 0x4000) == 0x0000) { // z80 RAM
-    SekCyclesBurn(2); // hack
+    SekCyclesBurnRun(2); // FIXME hack
     Pico.zram[a & 0x1fff] = (u8)d;
     return;
   }
@@ -725,14 +821,12 @@ PICO_INTERNAL void PicoMemSetup(void)
   {
     int i;
     // 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));
+    for (i = 0; i < M68K_FETCHBANK1 * 0xe0 / 0x100; i++)
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom - (i<<(24-FAMEC_FETCHBITS));
     // now real ROM
     for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.rom;
-    // .. and RAM
-    for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)
-      PicoCpuFM68k.Fetch[i] = (unsigned int)Pico.ram - (i<<(24-FAMEC_FETCHBITS));
+      PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;
+    // RAM already set
   }
 #endif
 #ifdef EMU_M68K
@@ -875,7 +969,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew);
             if (ym2612.OPN.ST.mode & 1) {
               // this is not right, should really be done on overflow only
-              int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+              int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
               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);
@@ -890,7 +984,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
             //ym2612.OPN.ST.TBT  = 0;
             timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800
             if (ym2612.OPN.ST.mode & 2) {
-              int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());
+              int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
               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);
@@ -898,7 +992,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
           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());
+          int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();
           ym2612.OPN.ST.mode = d;
 
           elprintf(EL_YMTIMER, "st mode %02x", d);
@@ -976,7 +1070,7 @@ static u32 ym2612_read_local_z80(void)
 
 static u32 ym2612_read_local_68k(void)
 {
-  int xcycles = cycles_68k_to_z80(SekCyclesDone()) << 8;
+  int xcycles = z80_cycles_from_68k() << 8;
 
   ym2612_read_local();
 
@@ -1167,3 +1261,4 @@ static void z80_mem_setup(void)
 #endif
 }
 
+// vim:shiftwidth=2:ts=2:expandtab