X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fmemory.c;h=2e8a821b822dbdf023d43b366ec50f9debe45734;hb=cff531af94bd9c9c89ae162e80f48ddc26a4e504;hp=11de6417fe27765322ea2ff9e11a31e41ce5faf9;hpb=5e89f0f5aebedc086888415e063b9883fc4a9e92;p=picodrive.git

diff --git a/pico/memory.c b/pico/memory.c
index 11de641..2e8a821 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"
@@ -15,15 +15,15 @@
 
 extern unsigned int lastSSRamWrite; // used by serial eeprom code
 
-unsigned long m68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long m68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
-unsigned long m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
+uptr m68k_read8_map  [0x1000000 >> M68K_MEM_SHIFT];
+uptr m68k_read16_map [0x1000000 >> M68K_MEM_SHIFT];
+uptr m68k_write8_map [0x1000000 >> M68K_MEM_SHIFT];
+uptr m68k_write16_map[0x1000000 >> M68K_MEM_SHIFT];
 
-static void xmap_set(unsigned long *map, int shift, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
+static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,
+    const void *func_or_mh, int is_func)
 {
-  unsigned long addr = (unsigned long)func_or_mh;
+  uptr addr = (uptr)func_or_mh;
   int mask = (1 << shift) - 1;
   int i;
 
@@ -44,18 +44,18 @@ static void xmap_set(unsigned long *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] |= 1 << (sizeof(addr) * 8 - 1);
+      map[i] |= (uptr)1 << (sizeof(addr) * 8 - 1);
   }
 }
 
-void z80_map_set(unsigned long *map, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
+void z80_map_set(uptr *map, int start_addr, int end_addr,
+    const void *func_or_mh, int is_func)
 {
   xmap_set(map, Z80_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);
 }
 
-void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr,
-    void *func_or_mh, int is_func)
+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);
 }
@@ -63,8 +63,8 @@ void cpu68k_map_set(unsigned long *map, int start_addr, int end_addr,
 // more specialized/optimized function (does same as above)
 void cpu68k_map_all_ram(int start_addr, int end_addr, void *ptr, int is_sub)
 {
-  unsigned long *r8map, *r16map, *w8map, *w16map;
-  unsigned long addr = (unsigned long)ptr;
+  uptr *r8map, *r16map, *w8map, *w16map;
+  uptr addr = (uptr)ptr;
   int shift = M68K_MEM_SHIFT;
   int i;
 
@@ -110,23 +110,23 @@ static void m68k_unmapped_write16(u32 a, u32 d)
 
 void m68k_map_unmap(int start_addr, int end_addr)
 {
-  unsigned long addr;
+  uptr addr;
   int shift = M68K_MEM_SHIFT;
   int i;
 
-  addr = (unsigned long)m68k_unmapped_read8;
+  addr = (uptr)m68k_unmapped_read8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
     m68k_read8_map[i] = (addr >> 1) | (1 << 31);
 
-  addr = (unsigned long)m68k_unmapped_read16;
+  addr = (uptr)m68k_unmapped_read16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
     m68k_read16_map[i] = (addr >> 1) | (1 << 31);
 
-  addr = (unsigned long)m68k_unmapped_write8;
+  addr = (uptr)m68k_unmapped_write8;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
     m68k_write8_map[i] = (addr >> 1) | (1 << 31);
 
-  addr = (unsigned long)m68k_unmapped_write16;
+  addr = (uptr)m68k_unmapped_write16;
   for (i = start_addr >> shift; i <= end_addr >> shift; i++)
     m68k_write16_map[i] = (addr >> 1) | (1 << 31);
 }
@@ -144,6 +144,10 @@ static u32 ym2612_read_local_68k(void);
 static int ym2612_write_local(u32 a, u32 d, int is_from_z80);
 static void z80_mem_setup(void);
 
+#ifdef _ASM_MEMORY_C
+u32 PicoRead8_sram(u32 a);
+u32 PicoRead16_sram(u32 a);
+#endif
 
 #ifdef EMU_CORE_DEBUG
 u32 lastread_a, lastread_d[16]={0,}, lastwrite_cyc_d[16]={0,}, lastwrite_mus_d[16]={0,};
@@ -162,7 +166,7 @@ void log_io(unsigned int addr, int bits, int rw);
 #if defined(EMU_C68K)
 void cyclone_crashed(u32 pc, struct Cyclone *context)
 {
-    elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x\n",
+    elprintf(EL_STATUS|EL_ANOMALY, "%c68k crash detected @ %06x",
       context == &PicoCpuCM68k ? 'm' : 's', pc);
     context->membase = (u32)Pico.rom;
     context->pc = (u32)Pico.rom + Pico.romsize;
@@ -172,7 +176,10 @@ void cyclone_crashed(u32 pc, struct Cyclone *context)
 // -----------------------------------------------------------------
 // memmap helpers
 
-static int PadRead(int i)
+#ifndef _ASM_MEMORY_C
+static
+#endif
+int PadRead(int i)
 {
   int pad,value,data_reg;
   pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU
@@ -204,6 +211,8 @@ static int PadRead(int i)
   return value; // will mirror later
 }
 
+#ifndef _ASM_MEMORY_C
+
 static u32 io_ports_read(u32 a)
 {
   u32 d;
@@ -233,7 +242,9 @@ static void NOINLINE io_ports_write(u32 a, u32 d)
   Pico.ioports[a] = d;
 }
 
-static void NOINLINE ctl_write_z80busreq(u32 d)
+#endif // _ASM_MEMORY_C
+
+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);
@@ -246,14 +257,17 @@ static void NOINLINE ctl_write_z80busreq(u32 d)
     else
     {
       z80stopCycle = SekCyclesDone();
-      if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset)
+      if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset) {
+        pprof_start(m68k);
         PicoSyncZ80(z80stopCycle);
+        pprof_end_sub(m68k);
+      }
     }
     Pico.m.z80Run = d;
   }
 }
 
-static void NOINLINE ctl_write_z80reset(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);
@@ -261,8 +275,11 @@ static void NOINLINE ctl_write_z80reset(u32 d)
   {
     if (d)
     {
-      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run)
+      if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run) {
+        pprof_start(m68k);
         PicoSyncZ80(SekCyclesDone());
+        pprof_end_sub(m68k);
+      }
       YM2612ResetChip();
       timers_reset();
     }
@@ -277,6 +294,8 @@ static void NOINLINE ctl_write_z80reset(u32 d)
 
 // -----------------------------------------------------------------
 
+#ifndef _ASM_MEMORY_C
+
 // cart (save) RAM area (usually 0x200000 - ...)
 static u32 PicoRead8_sram(u32 a)
 {
@@ -303,7 +322,7 @@ static u32 PicoRead8_sram(u32 a)
 static u32 PicoRead16_sram(u32 a)
 {
   u32 d;
-  if (SRam.end >= a && a >= SRam.start && (Pico.m.sram_reg & SRR_MAPPED))
+  if (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))
   {
     if (SRam.flags & SRF_EEPROM)
       d = EEPROM_read();
@@ -322,6 +341,8 @@ static u32 PicoRead16_sram(u32 a)
   return m68k_unmapped_read16(a);
 }
 
+#endif // _ASM_MEMORY_C
+
 static void PicoWrite8_sram(u32 a, u32 d)
 {
   if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {
@@ -415,7 +436,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
       SN76496Write(d);
     return;
   }
-#if !defined(_ASM_MEMORY_C) || defined(_ASM_MEMORY_C_AMIPS)
   if ((a & 0x7f00) == 0x6000) // Z80 BANK register
   {
     Pico.m.z80_bank68k >>= 1;
@@ -424,7 +444,6 @@ static void PicoWrite8_z80(u32 a, u32 d)
     elprintf(EL_Z80BNK, "z80 bank=%06x", Pico.m.z80_bank68k << 15);
     return;
   }
-#endif
   elprintf(EL_UIO|EL_ANOMALY, "68k bad write [%06x] %02x @ %06x", a, d&0xff, SekPc);
 }
 
@@ -435,6 +454,8 @@ static void PicoWrite16_z80(u32 a, u32 d)
   PicoWrite8_z80(a, d >> 8);
 }
 
+#ifndef _ASM_MEMORY_C
+
 // IO/control area (0xa10000 - 0xa1ffff)
 u32 PicoRead8_io(u32 a)
 {
@@ -461,7 +482,7 @@ u32 PicoRead8_io(u32 a)
     goto end;
   }
 
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     d = PicoRead8_32x(a);
     goto end;
   }
@@ -496,7 +517,7 @@ u32 PicoRead16_io(u32 a)
     goto end;
   }
 
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     d = PicoRead16_32x(a);
     goto end;
   }
@@ -526,7 +547,7 @@ void PicoWrite8_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);
     return;
   }
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     PicoWrite8_32x(a, d);
     return;
   }
@@ -554,13 +575,15 @@ void PicoWrite16_io(u32 a, u32 d)
     Pico.m.sram_reg |= (u8)(d & 3);
     return;
   }
-  if (!(PicoOpt & POPT_DIS_32X)) {
+  if (PicoOpt & POPT_EN_32X) {
     PicoWrite16_32x(a, d);
     return;
   }
   m68k_unmapped_write16(a, d);
 }
 
+#endif // _ASM_MEMORY_C
+
 // VDP area (0xc00000 - 0xdfffff)
 // TODO: verify if lower byte goes to PSG on word writes
 static u32 PicoRead8_vdp(u32 a)
@@ -940,7 +963,7 @@ static int ym2612_write_local(u32 a, u32 d, int is_from_z80)
   if (xcycles >= timer_b_next_oflow) \
     ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2
 
-static u32 MEMH_FUNC ym2612_read_local_z80(void)
+static u32 ym2612_read_local_z80(void)
 {
   int xcycles = z80_cyclesDone() << 8;
 
@@ -1035,17 +1058,25 @@ void ym2612_unpack_state(void)
   elprintf(EL_YMTIMER, "load: %i/%i, timer_b_next_oflow %i", tbt>>16, tbc>>16, timer_b_next_oflow >> 8);
 }
 
+#if defined(NO_32X) && defined(_ASM_MEMORY_C)
+// referenced by asm code
+u32 PicoRead8_32x(u32 a) { return 0; }
+u32 PicoRead16_32x(u32 a) { return 0; }
+void PicoWrite8_32x(u32 a, u32 d) {}
+void PicoWrite16_32x(u32 a, u32 d) {}
+#endif
+
 // -----------------------------------------------------------------
 //                        z80 memhandlers
 
-static unsigned char MEMH_FUNC z80_md_vdp_read(unsigned short a)
+static unsigned char z80_md_vdp_read(unsigned short a)
 {
   // TODO?
   elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);
   return 0xff;
 }
 
-static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
+static unsigned char z80_md_bank_read(unsigned short a)
 {
   unsigned int addr68k;
   unsigned char ret;
@@ -1059,13 +1090,13 @@ static unsigned char MEMH_FUNC z80_md_bank_read(unsigned short a)
   return ret;
 }
 
-static void MEMH_FUNC z80_md_ym2612_write(unsigned int a, unsigned char data)
+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;
 }
 
-static void MEMH_FUNC z80_md_vdp_br_write(unsigned int a, unsigned char data)
+static void z80_md_vdp_br_write(unsigned int a, unsigned char data)
 {
   // TODO: allow full VDP access
   if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17
@@ -1086,7 +1117,7 @@ static void MEMH_FUNC z80_md_vdp_br_write(unsigned int a, unsigned char data)
   elprintf(EL_ANOMALY, "z80 invalid w8 [%06x] %02x", a, data);
 }
 
-static void MEMH_FUNC z80_md_bank_write(unsigned int a, unsigned char data)
+static void z80_md_bank_write(unsigned int a, unsigned char data)
 {
   unsigned int addr68k;
 
@@ -1129,8 +1160,8 @@ static void z80_mem_setup(void)
   drZ80.z80_out = z80_md_out;
 #endif
 #ifdef _USE_CZ80
-  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (UINT32)Pico.zram); // main RAM
-  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (UINT32)Pico.zram); // mirror
+  Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (FPTR)Pico.zram); // main RAM
+  Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)Pico.zram); // mirror
   Cz80_Set_INPort(&CZ80, z80_md_in);
   Cz80_Set_OUTPort(&CZ80, z80_md_out);
 #endif