static void xmap_set(uptr *map, int shift, int start_addr, int end_addr,\r
const void *func_or_mh, int is_func)\r
{\r
+#ifdef __clang__\r
+ // workaround bug (segfault) in \r
+ // Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)\r
+ volatile \r
+#endif\r
uptr addr = (uptr)func_or_mh;\r
int mask = (1 << shift) - 1;\r
int i;\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++) {\r
map[i] = addr >> 1;\r
if (is_func)\r
- map[i] |= (uptr)1 << (sizeof(addr) * 8 - 1);\r
+ map[i] |= MAP_FLAG;\r
}\r
}\r
\r
const void *func_or_mh, int is_func)\r
{\r
xmap_set(map, M68K_MEM_SHIFT, start_addr, end_addr, func_or_mh, is_func);\r
+#ifdef EMU_F68K\r
+ // setup FAME fetchmap\r
+ if (!is_func)\r
+ {\r
+ int shiftout = 24 - FAMEC_FETCHBITS;\r
+ int i = start_addr >> shiftout;\r
+ uptr base = (uptr)func_or_mh - (i << shiftout);\r
+ for (; i <= (end_addr >> shiftout); i++)\r
+ PicoCpuFM68k.Fetch[i] = base;\r
+ }\r
+#endif\r
}\r
\r
// more specialized/optimized function (does same as above)\r
addr >>= 1;\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
r8map[i] = r16map[i] = w8map[i] = w16map[i] = addr;\r
+#ifdef EMU_F68K\r
+ // setup FAME fetchmap\r
+ {\r
+ M68K_CONTEXT *ctx = is_sub ? &PicoCpuFS68k : &PicoCpuFM68k;\r
+ int shiftout = 24 - FAMEC_FETCHBITS;\r
+ i = start_addr >> shiftout;\r
+ addr = (uptr)ptr - (i << shiftout);\r
+ for (; i <= (end_addr >> shiftout); i++)\r
+ ctx->Fetch[i] = addr;\r
+ }\r
+#endif\r
}\r
\r
static u32 m68k_unmapped_read8(u32 a)\r
\r
void m68k_map_unmap(int start_addr, int end_addr)\r
{\r
+#ifdef __clang__\r
+ // workaround bug (segfault) in \r
+ // Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)\r
+ volatile \r
+#endif\r
uptr addr;\r
int shift = M68K_MEM_SHIFT;\r
int i;\r
\r
addr = (uptr)m68k_unmapped_read8;\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
- m68k_read8_map[i] = (addr >> 1) | (1 << 31);\r
+ m68k_read8_map[i] = (addr >> 1) | MAP_FLAG;\r
\r
addr = (uptr)m68k_unmapped_read16;\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
- m68k_read16_map[i] = (addr >> 1) | (1 << 31);\r
+ m68k_read16_map[i] = (addr >> 1) | MAP_FLAG;\r
\r
addr = (uptr)m68k_unmapped_write8;\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
- m68k_write8_map[i] = (addr >> 1) | (1 << 31);\r
+ m68k_write8_map[i] = (addr >> 1) | MAP_FLAG;\r
\r
addr = (uptr)m68k_unmapped_write16;\r
for (i = start_addr >> shift; i <= end_addr >> shift; i++)\r
- m68k_write16_map[i] = (addr >> 1) | (1 << 31);\r
+ m68k_write16_map[i] = (addr >> 1) | MAP_FLAG;\r
}\r
\r
MAKE_68K_READ8(m68k_read8, m68k_read8_map)\r
// -----------------------------------------------------------------\r
// memmap helpers\r
\r
-#ifndef _ASM_MEMORY_C\r
-static\r
-#endif\r
-int PadRead(int i)\r
+static u32 read_pad_3btn(int i, u32 out_bits)\r
{\r
- int pad,value,data_reg;\r
- pad=~PicoPadInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
- data_reg=Pico.ioports[i+1];\r
+ u32 pad = ~PicoIn.padInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
+ u32 value;\r
\r
- // orr the bits, which are set as output\r
- value = data_reg&(Pico.ioports[i+4]|0x80);\r
+ if (out_bits & 0x40) // TH\r
+ value = pad & 0x3f; // ?1CB RLDU\r
+ else\r
+ value = ((pad & 0xc0) >> 2) | (pad & 3); // ?0SA 00DU\r
\r
- if (PicoOpt & POPT_6BTN_PAD)\r
- {\r
- int phase = Pico.m.padTHPhase[i];\r
-\r
- if(phase == 2 && !(data_reg&0x40)) { // TH\r
- value|=(pad&0xc0)>>2; // ?0SA 0000\r
- return value;\r
- } else if(phase == 3) {\r
- if(data_reg&0x40)\r
- value|=(pad&0x30)|((pad>>8)&0xf); // ?1CB MXYZ\r
- else\r
- value|=((pad&0xc0)>>2)|0x0f; // ?0SA 1111\r
- return value;\r
- }\r
+ value |= out_bits & 0x40;\r
+ return value;\r
+}\r
+\r
+static u32 read_pad_6btn(int i, u32 out_bits)\r
+{\r
+ u32 pad = ~PicoIn.padInt[i]; // Get inverse of pad MXYZ SACB RLDU\r
+ int phase = Pico.m.padTHPhase[i];\r
+ u32 value;\r
+\r
+ if (phase == 2 && !(out_bits & 0x40)) {\r
+ value = (pad & 0xc0) >> 2; // ?0SA 0000\r
+ goto out;\r
+ }\r
+ else if(phase == 3) {\r
+ if (out_bits & 0x40)\r
+ return (pad & 0x30) | ((pad >> 8) & 0xf); // ?1CB MXYZ\r
+ else\r
+ return ((pad & 0xc0) >> 2) | 0x0f; // ?0SA 1111\r
+ goto out;\r
}\r
\r
- if(data_reg&0x40) // TH\r
- value|=(pad&0x3f); // ?1CB RLDU\r
- else value|=((pad&0xc0)>>2)|(pad&3); // ?0SA 00DU\r
+ if (out_bits & 0x40) // TH\r
+ value = pad & 0x3f; // ?1CB RLDU\r
+ else\r
+ value = ((pad & 0xc0) >> 2) | (pad & 3); // ?0SA 00DU\r
\r
- return value; // will mirror later\r
+out:\r
+ value |= out_bits & 0x40;\r
+ return value;\r
}\r
\r
-#ifndef _ASM_MEMORY_C\r
+static u32 read_nothing(int i, u32 out_bits)\r
+{\r
+ return 0xff;\r
+}\r
+\r
+typedef u32 (port_read_func)(int index, u32 out_bits);\r
+\r
+static port_read_func *port_readers[3] = {\r
+ read_pad_3btn,\r
+ read_pad_3btn,\r
+ read_nothing\r
+};\r
+\r
+static NOINLINE u32 port_read(int i)\r
+{\r
+ u32 data_reg = PicoMem.ioports[i + 1];\r
+ u32 ctrl_reg = PicoMem.ioports[i + 4] | 0x80;\r
+ u32 in, out;\r
+\r
+ out = data_reg & ctrl_reg;\r
+ out |= 0x7f & ~ctrl_reg; // pull-ups\r
+\r
+ in = port_readers[i](i, out);\r
+\r
+ return (in & ~ctrl_reg) | (data_reg & ctrl_reg);\r
+}\r
+\r
+void PicoSetInputDevice(int port, enum input_device device)\r
+{\r
+ port_read_func *func;\r
+\r
+ if (port < 0 || port > 2)\r
+ return;\r
+\r
+ switch (device) {\r
+ case PICO_INPUT_PAD_3BTN:\r
+ func = read_pad_3btn;\r
+ break;\r
+\r
+ case PICO_INPUT_PAD_6BTN:\r
+ func = read_pad_6btn;\r
+ break;\r
+\r
+ default:\r
+ func = read_nothing;\r
+ break;\r
+ }\r
+\r
+ port_readers[port] = func;\r
+}\r
\r
-static u32 io_ports_read(u32 a)\r
+NOINLINE u32 io_ports_read(u32 a)\r
{\r
u32 d;\r
a = (a>>1) & 0xf;\r
switch (a) {\r
case 0: d = Pico.m.hardware; break; // Hardware value (Version register)\r
- case 1: d = PadRead(0); break;\r
- case 2: d = PadRead(1); break;\r
- default: d = Pico.ioports[a]; break; // IO ports can be used as RAM\r
+ case 1: d = port_read(0); break;\r
+ case 2: d = port_read(1); break;\r
+ case 3: d = port_read(2); break;\r
+ default: d = PicoMem.ioports[a]; break; // IO ports can be used as RAM\r
}\r
return d;\r
}\r
\r
-static void NOINLINE io_ports_write(u32 a, u32 d)\r
+NOINLINE void io_ports_write(u32 a, u32 d)\r
{\r
a = (a>>1) & 0xf;\r
\r
// 6 button gamepad: if TH went from 0 to 1, gamepad changes state\r
- if (1 <= a && a <= 2 && (PicoOpt & POPT_6BTN_PAD))\r
+ if (1 <= a && a <= 2)\r
{\r
Pico.m.padDelay[a - 1] = 0;\r
- if (!(Pico.ioports[a] & 0x40) && (d & 0x40))\r
+ if (!(PicoMem.ioports[a] & 0x40) && (d & 0x40))\r
Pico.m.padTHPhase[a - 1]++;\r
}\r
\r
// certain IO ports can be used as RAM\r
- Pico.ioports[a] = d;\r
+ PicoMem.ioports[a] = d;\r
}\r
\r
-#endif // _ASM_MEMORY_C\r
+static int z80_cycles_from_68k(void)\r
+{\r
+ int m68k_cnt = SekCyclesDone() - Pico.t.m68c_frame_start;\r
+ return cycles_68k_to_z80(m68k_cnt);\r
+}\r
\r
void NOINLINE ctl_write_z80busreq(u32 d)\r
{\r
d&=1; d^=1;\r
- elprintf(EL_BUSREQ, "set_zrun: %i->%i [%i] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "set_zrun: %i->%i [%u] @%06x", Pico.m.z80Run, d, SekCyclesDone(), SekPc);\r
if (d ^ Pico.m.z80Run)\r
{\r
if (d)\r
{\r
- z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());\r
+ Pico.t.z80c_cnt = z80_cycles_from_68k() + 2;\r
}\r
else\r
{\r
- z80stopCycle = SekCyclesDone();\r
- if ((PicoOpt&POPT_EN_Z80) && !Pico.m.z80_reset) {\r
+ if ((PicoIn.opt & POPT_EN_Z80) && !Pico.m.z80_reset) {\r
pprof_start(m68k);\r
- PicoSyncZ80(z80stopCycle);\r
+ PicoSyncZ80(SekCyclesDone());\r
pprof_end_sub(m68k);\r
}\r
}\r
void NOINLINE ctl_write_z80reset(u32 d)\r
{\r
d&=1; d^=1;\r
- elprintf(EL_BUSREQ, "set_zreset: %i->%i [%i] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "set_zreset: %i->%i [%u] @%06x", Pico.m.z80_reset, d, SekCyclesDone(), SekPc);\r
if (d ^ Pico.m.z80_reset)\r
{\r
if (d)\r
{\r
- if ((PicoOpt&POPT_EN_Z80) && Pico.m.z80Run) {\r
+ if ((PicoIn.opt & POPT_EN_Z80) && Pico.m.z80Run) {\r
pprof_start(m68k);\r
PicoSyncZ80(SekCyclesDone());\r
pprof_end_sub(m68k);\r
}\r
else\r
{\r
- z80_cycle_cnt = cycles_68k_to_z80(SekCyclesDone());\r
+ Pico.t.z80c_cnt = z80_cycles_from_68k() + 2;\r
z80_reset();\r
}\r
Pico.m.z80_reset = d;\r
}\r
}\r
\r
+static int get_scanline(int is_from_z80);\r
+\r
+static void psg_write_68k(u32 d)\r
+{\r
+ // look for volume write and update if needed\r
+ if ((d & 0x90) == 0x90 && Pico.snd.psg_line < Pico.m.scanline)\r
+ PsndDoPSG(Pico.m.scanline);\r
+\r
+ SN76496Write(d);\r
+}\r
+\r
+static void psg_write_z80(u32 d)\r
+{\r
+ if ((d & 0x90) == 0x90) {\r
+ int scanline = get_scanline(1);\r
+ if (Pico.snd.psg_line < scanline)\r
+ PsndDoPSG(scanline);\r
+ }\r
+\r
+ SN76496Write(d);\r
+}\r
+\r
// -----------------------------------------------------------------\r
\r
#ifndef _ASM_MEMORY_C\r
static u32 PicoRead8_sram(u32 a)\r
{\r
u32 d;\r
- if (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))\r
+ if (Pico.sv.start <= a && a <= Pico.sv.end && (Pico.m.sram_reg & SRR_MAPPED))\r
{\r
- if (SRam.flags & SRF_EEPROM) {\r
+ if (Pico.sv.flags & SRF_EEPROM) {\r
d = EEPROM_read();\r
if (!(a & 1))\r
d >>= 8;\r
} else\r
- d = *(u8 *)(SRam.data - SRam.start + a);\r
+ d = *(u8 *)(Pico.sv.data - Pico.sv.start + a);\r
elprintf(EL_SRAMIO, "sram r8 [%06x] %02x @ %06x", a, d, SekPc);\r
return d;\r
}\r
static u32 PicoRead16_sram(u32 a)\r
{\r
u32 d;\r
- if (SRam.start <= a && a <= SRam.end && (Pico.m.sram_reg & SRR_MAPPED))\r
+ if (Pico.sv.start <= a && a <= Pico.sv.end && (Pico.m.sram_reg & SRR_MAPPED))\r
{\r
- if (SRam.flags & SRF_EEPROM)\r
+ if (Pico.sv.flags & SRF_EEPROM)\r
d = EEPROM_read();\r
else {\r
- u8 *pm = (u8 *)(SRam.data - SRam.start + a);\r
+ u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);\r
d = pm[0] << 8;\r
d |= pm[1];\r
}\r
\r
static void PicoWrite8_sram(u32 a, u32 d)\r
{\r
- if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {\r
+ if (a > Pico.sv.end || a < Pico.sv.start || !(Pico.m.sram_reg & SRR_MAPPED)) {\r
m68k_unmapped_write8(a, d);\r
return;\r
}\r
\r
elprintf(EL_SRAMIO, "sram w8 [%06x] %02x @ %06x", a, d & 0xff, SekPc);\r
- if (SRam.flags & SRF_EEPROM)\r
+ if (Pico.sv.flags & SRF_EEPROM)\r
{\r
EEPROM_write8(a, d);\r
}\r
else {\r
- u8 *pm = (u8 *)(SRam.data - SRam.start + a);\r
+ u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);\r
if (*pm != (u8)d) {\r
- SRam.changed = 1;\r
+ Pico.sv.changed = 1;\r
*pm = (u8)d;\r
}\r
}\r
\r
static void PicoWrite16_sram(u32 a, u32 d)\r
{\r
- if (a > SRam.end || a < SRam.start || !(Pico.m.sram_reg & SRR_MAPPED)) {\r
+ if (a > Pico.sv.end || a < Pico.sv.start || !(Pico.m.sram_reg & SRR_MAPPED)) {\r
m68k_unmapped_write16(a, d);\r
return;\r
}\r
\r
elprintf(EL_SRAMIO, "sram w16 [%06x] %04x @ %06x", a, d & 0xffff, SekPc);\r
- if (SRam.flags & SRF_EEPROM)\r
+ if (Pico.sv.flags & SRF_EEPROM)\r
{\r
EEPROM_write16(d);\r
}\r
else {\r
- // XXX: hardware could easily use MSB too..\r
- u8 *pm = (u8 *)(SRam.data - SRam.start + a);\r
- if (*pm != (u8)d) {\r
- SRam.changed = 1;\r
- *pm = (u8)d;\r
+ u8 *pm = (u8 *)(Pico.sv.data - Pico.sv.start + a);\r
+ if (pm[0] != (u8)(d >> 8)) {\r
+ Pico.sv.changed = 1;\r
+ pm[0] = (u8)(d >> 8);\r
+ }\r
+ if (pm[1] != (u8)d) {\r
+ Pico.sv.changed = 1;\r
+ pm[1] = (u8)d;\r
}\r
}\r
}\r
}\r
\r
if ((a & 0x4000) == 0x0000)\r
- d = Pico.zram[a & 0x1fff];\r
+ d = PicoMem.zram[a & 0x1fff];\r
else if ((a & 0x6000) == 0x4000) // 0x4000-0x5fff\r
d = ym2612_read_local_68k(); \r
else\r
}\r
\r
if ((a & 0x4000) == 0x0000) { // z80 RAM\r
- SekCyclesBurn(2); // hack\r
- Pico.zram[a & 0x1fff] = (u8)d;\r
+ PicoMem.zram[a & 0x1fff] = (u8)d;\r
return;\r
}\r
if ((a & 0x6000) == 0x4000) { // FM Sound\r
- if (PicoOpt & POPT_EN_FM)\r
- emustatus |= ym2612_write_local(a&3, d&0xff, 0)&1;\r
+ if (PicoIn.opt & POPT_EN_FM)\r
+ Pico.m.status |= ym2612_write_local(a & 3, d & 0xff, 0) & 1;\r
return;\r
}\r
// TODO: probably other VDP access too? Maybe more mirrors?\r
if ((a & 0x7ff9) == 0x7f11) { // PSG Sound\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(d);\r
+ psg_write_68k(d);\r
return;\r
}\r
if ((a & 0x7f00) == 0x6000) // Z80 BANK register\r
\r
if ((a & 0xff01) == 0x1100) { // z80 busreq (verified)\r
d |= (Pico.m.z80Run | Pico.m.z80_reset) & 1;\r
- elprintf(EL_BUSREQ, "get_zrun: %02x [%i] @%06x", d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "get_zrun: %02x [%u] @%06x", d, SekCyclesDone(), SekPc);\r
}\r
goto end;\r
}\r
\r
- if (PicoOpt & POPT_EN_32X) {\r
- d = PicoRead8_32x(a);\r
- goto end;\r
- }\r
+ d = PicoRead8_32x(a);\r
\r
- d = m68k_unmapped_read8(a);\r
end:\r
return d;\r
}\r
\r
if ((a & 0xff00) == 0x1100) { // z80 busreq\r
d |= ((Pico.m.z80Run | Pico.m.z80_reset) & 1) << 8;\r
- elprintf(EL_BUSREQ, "get_zrun: %04x [%i] @%06x", d, SekCyclesDone(), SekPc);\r
+ elprintf(EL_BUSREQ, "get_zrun: %04x [%u] @%06x", d, SekCyclesDone(), SekPc);\r
}\r
goto end;\r
}\r
\r
- if (PicoOpt & POPT_EN_32X) {\r
- d = PicoRead16_32x(a);\r
- goto end;\r
- }\r
+ d = PicoRead16_32x(a);\r
\r
- d = m68k_unmapped_read16(a);\r
end:\r
return d;\r
}\r
Pico.m.sram_reg |= (u8)(d & 3);\r
return;\r
}\r
- if (PicoOpt & POPT_EN_32X) {\r
- PicoWrite8_32x(a, d);\r
- return;\r
- }\r
-\r
- m68k_unmapped_write8(a, d);\r
+ PicoWrite8_32x(a, d);\r
}\r
\r
void PicoWrite16_io(u32 a, u32 d)\r
Pico.m.sram_reg |= (u8)(d & 3);\r
return;\r
}\r
- if (PicoOpt & POPT_EN_32X) {\r
- PicoWrite16_32x(a, d);\r
- return;\r
- }\r
- m68k_unmapped_write16(a, d);\r
+ PicoWrite16_32x(a, d);\r
}\r
\r
#endif // _ASM_MEMORY_C\r
\r
// VDP area (0xc00000 - 0xdfffff)\r
// TODO: verify if lower byte goes to PSG on word writes\r
-static u32 PicoRead8_vdp(u32 a)\r
+u32 PicoRead8_vdp(u32 a)\r
{\r
- if ((a & 0x00e0) == 0x0000)\r
- return PicoVideoRead8(a);\r
+ if ((a & 0x00f0) == 0x0000) {\r
+ switch (a & 0x0d)\r
+ {\r
+ case 0x00: return PicoVideoRead8DataH();\r
+ case 0x01: return PicoVideoRead8DataL();\r
+ case 0x04: return PicoVideoRead8CtlH();\r
+ case 0x05: return PicoVideoRead8CtlL();\r
+ case 0x08:\r
+ case 0x0c: return PicoVideoRead8HV_H();\r
+ case 0x09:\r
+ case 0x0d: return PicoVideoRead8HV_L();\r
+ }\r
+ }\r
\r
elprintf(EL_UIO|EL_ANOMALY, "68k bad read [%06x] @%06x", a, SekPc);\r
return 0;\r
static void PicoWrite8_vdp(u32 a, u32 d)\r
{\r
if ((a & 0x00f9) == 0x0011) { // PSG Sound\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(d);\r
+ psg_write_68k(d);\r
return;\r
}\r
if ((a & 0x00e0) == 0x0000) {\r
\r
static void PicoWrite16_vdp(u32 a, u32 d)\r
{\r
- if ((a & 0x00f9) == 0x0010) { // PSG Sound\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(d);\r
- return;\r
- }\r
+ if ((a & 0x00f9) == 0x0010) // PSG Sound\r
+ psg_write_68k(d);\r
if ((a & 0x00e0) == 0x0000) {\r
PicoVideoWrite(a, d);\r
return;\r
\r
PICO_INTERNAL void PicoMemSetup(void)\r
{\r
- int mask, rs, a;\r
+ int mask, rs, sstart, a;\r
\r
// setup the memory map\r
cpu68k_map_set(m68k_read8_map, 0x000000, 0xffffff, m68k_unmapped_read8, 1);\r
cpu68k_map_set(m68k_read16_map, 0x000000, rs - 1, Pico.rom, 0);\r
\r
// Common case of on-cart (save) RAM, usually at 0x200000-...\r
- if ((SRam.flags & SRF_ENABLED) && SRam.data != NULL) {\r
- rs = SRam.end - SRam.start;\r
+ if ((Pico.sv.flags & SRF_ENABLED) && Pico.sv.data != NULL) {\r
+ sstart = Pico.sv.start;\r
+ rs = Pico.sv.end - sstart;\r
rs = (rs + mask) & ~mask;\r
- if (SRam.start + rs >= 0x1000000)\r
- rs = 0x1000000 - SRam.start;\r
- cpu68k_map_set(m68k_read8_map, SRam.start, SRam.start + rs - 1, PicoRead8_sram, 1);\r
- cpu68k_map_set(m68k_read16_map, SRam.start, SRam.start + rs - 1, PicoRead16_sram, 1);\r
- cpu68k_map_set(m68k_write8_map, SRam.start, SRam.start + rs - 1, PicoWrite8_sram, 1);\r
- cpu68k_map_set(m68k_write16_map, SRam.start, SRam.start + rs - 1, PicoWrite16_sram, 1);\r
+ if (sstart + rs >= 0x1000000)\r
+ rs = 0x1000000 - sstart;\r
+ cpu68k_map_set(m68k_read8_map, sstart, sstart + rs - 1, PicoRead8_sram, 1);\r
+ cpu68k_map_set(m68k_read16_map, sstart, sstart + rs - 1, PicoRead16_sram, 1);\r
+ cpu68k_map_set(m68k_write8_map, sstart, sstart + rs - 1, PicoWrite8_sram, 1);\r
+ cpu68k_map_set(m68k_write16_map, sstart, sstart + rs - 1, PicoWrite16_sram, 1);\r
}\r
\r
// Z80 region\r
\r
// RAM and it's mirrors\r
for (a = 0xe00000; a < 0x1000000; a += 0x010000) {\r
- cpu68k_map_set(m68k_read8_map, a, a + 0xffff, Pico.ram, 0);\r
- cpu68k_map_set(m68k_read16_map, a, a + 0xffff, Pico.ram, 0);\r
- cpu68k_map_set(m68k_write8_map, a, a + 0xffff, Pico.ram, 0);\r
- cpu68k_map_set(m68k_write16_map, a, a + 0xffff, Pico.ram, 0);\r
+ cpu68k_map_set(m68k_read8_map, a, a + 0xffff, PicoMem.ram, 0);\r
+ cpu68k_map_set(m68k_read16_map, a, a + 0xffff, PicoMem.ram, 0);\r
+ cpu68k_map_set(m68k_write8_map, a, a + 0xffff, PicoMem.ram, 0);\r
+ cpu68k_map_set(m68k_write16_map, a, a + 0xffff, PicoMem.ram, 0);\r
}\r
\r
// Setup memory callbacks:\r
{\r
int i;\r
// by default, point everything to first 64k of ROM\r
- for (i = 0; i < M68K_FETCHBANK1; i++)\r
- PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom - (i<<(24-FAMEC_FETCHBITS));\r
+ for (i = 0; i < M68K_FETCHBANK1 * 0xe0 / 0x100; i++)\r
+ PicoCpuFM68k.Fetch[i] = (uptr)Pico.rom - (i<<(24-FAMEC_FETCHBITS));\r
// now real ROM\r
for (i = 0; i < M68K_FETCHBANK1 && (i<<(24-FAMEC_FETCHBITS)) < Pico.romsize; i++)\r
- PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.rom;\r
- // .. and RAM\r
- for (i = M68K_FETCHBANK1*14/16; i < M68K_FETCHBANK1; i++)\r
- PicoCpuFM68k.Fetch[i] = (unsigned long)Pico.ram - (i<<(24-FAMEC_FETCHBITS));\r
+ PicoCpuFM68k.Fetch[i] = (uptr)Pico.rom;\r
+ // RAM already set\r
}\r
#endif\r
#ifdef EMU_M68K\r
static int get_scanline(int is_from_z80)\r
{\r
if (is_from_z80) {\r
- int cycles = z80_cyclesDone();\r
- while (cycles - z80_scanline_cycles >= 228)\r
- z80_scanline++, z80_scanline_cycles += 228;\r
- return z80_scanline;\r
+ int mclk_z80 = z80_cyclesDone() * 15;\r
+ int mclk_line = Pico.t.z80_scanline * 488 * 7;\r
+ while (mclk_z80 - mclk_line >= 488 * 7)\r
+ Pico.t.z80_scanline++, mclk_line += 488 * 7;\r
+ return Pico.t.z80_scanline;\r
}\r
\r
return Pico.m.scanline;\r
int xcycles = z80_cycles << 8;\r
\r
/* check for overflows */\r
- if ((mode_old & 4) && xcycles > timer_a_next_oflow)\r
+ if ((mode_old & 4) && xcycles > Pico.t.timer_a_next_oflow)\r
ym2612.OPN.ST.status |= 1;\r
\r
- if ((mode_old & 8) && xcycles > timer_b_next_oflow)\r
+ if ((mode_old & 8) && xcycles > Pico.t.timer_b_next_oflow)\r
ym2612.OPN.ST.status |= 2;\r
\r
/* update timer a */\r
if (mode_old & 1)\r
- while (xcycles > timer_a_next_oflow)\r
- timer_a_next_oflow += timer_a_step;\r
+ while (xcycles > Pico.t.timer_a_next_oflow)\r
+ Pico.t.timer_a_next_oflow += Pico.t.timer_a_step;\r
\r
if ((mode_old ^ mode_new) & 1) // turning on/off\r
{\r
if (mode_old & 1)\r
- timer_a_next_oflow = TIMER_NO_OFLOW;\r
+ Pico.t.timer_a_next_oflow = TIMER_NO_OFLOW;\r
else\r
- timer_a_next_oflow = xcycles + timer_a_step;\r
+ Pico.t.timer_a_next_oflow = xcycles + Pico.t.timer_a_step;\r
}\r
if (mode_new & 1)\r
- elprintf(EL_YMTIMER, "timer a upd to %i @ %i", timer_a_next_oflow>>8, z80_cycles);\r
+ elprintf(EL_YMTIMER, "timer a upd to %i @ %i", Pico.t.timer_a_next_oflow>>8, z80_cycles);\r
\r
/* update timer b */\r
if (mode_old & 2)\r
- while (xcycles > timer_b_next_oflow)\r
- timer_b_next_oflow += timer_b_step;\r
+ while (xcycles > Pico.t.timer_b_next_oflow)\r
+ Pico.t.timer_b_next_oflow += Pico.t.timer_b_step;\r
\r
if ((mode_old ^ mode_new) & 2)\r
{\r
if (mode_old & 2)\r
- timer_b_next_oflow = TIMER_NO_OFLOW;\r
+ Pico.t.timer_b_next_oflow = TIMER_NO_OFLOW;\r
else\r
- timer_b_next_oflow = xcycles + timer_b_step;\r
+ Pico.t.timer_b_next_oflow = xcycles + Pico.t.timer_b_step;\r
}\r
if (mode_new & 2)\r
- elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles);\r
+ elprintf(EL_YMTIMER, "timer b upd to %i @ %i", Pico.t.timer_b_next_oflow>>8, z80_cycles);\r
}\r
\r
// ym2612 DAC and timer I/O handlers for z80\r
if (a == 1 && ym2612.OPN.ST.address == 0x2a) /* DAC data */\r
{\r
int scanline = get_scanline(is_from_z80);\r
- //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", PsndDacLine, scanline, d, is_from_z80);\r
+ //elprintf(EL_STATUS, "%03i -> %03i dac w %08x z80 %i", Pico.snd.dac_line, scanline, d, is_from_z80);\r
ym2612.dacout = ((int)d - 0x80) << 6;\r
- if (PsndOut && ym2612.dacen && scanline >= PsndDacLine)\r
+ if (ym2612.dacen)\r
PsndDoDAC(scanline);\r
return 0;\r
}\r
ym2612.OPN.ST.address = d;\r
ym2612.addr_A1 = 0;\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
+ if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
#endif\r
return 0;\r
\r
ym2612.OPN.ST.TA = TAnew;\r
//ym2612.OPN.ST.TAC = (1024-TAnew)*18;\r
//ym2612.OPN.ST.TAT = 0;\r
- timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew);\r
+ Pico.t.timer_a_step = TIMER_A_TICK_ZCYCLES * (1024 - TAnew);\r
if (ym2612.OPN.ST.mode & 1) {\r
// this is not right, should really be done on overflow only\r
- int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
- timer_a_next_oflow = (cycles << 8) + timer_a_step;\r
+ int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();\r
+ Pico.t.timer_a_next_oflow = (cycles << 8) + Pico.t.timer_a_step;\r
}\r
- elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, timer_a_next_oflow>>8);\r
+ elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, Pico.t.timer_a_next_oflow>>8);\r
}\r
return 0;\r
}\r
ym2612.OPN.ST.TB = d;\r
//ym2612.OPN.ST.TBC = (256-d) * 288;\r
//ym2612.OPN.ST.TBT = 0;\r
- timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800\r
+ Pico.t.timer_b_step = TIMER_B_TICK_ZCYCLES * (256 - d); // 262800\r
if (ym2612.OPN.ST.mode & 2) {\r
- int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
- timer_b_next_oflow = (cycles << 8) + timer_b_step;\r
+ int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();\r
+ Pico.t.timer_b_next_oflow = (cycles << 8) + Pico.t.timer_b_step;\r
}\r
- elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, timer_b_next_oflow>>8);\r
+ elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, Pico.t.timer_b_next_oflow>>8);\r
}\r
return 0;\r
case 0x27: { /* mode, timer control */\r
int old_mode = ym2612.OPN.ST.mode;\r
- int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
+ int cycles = is_from_z80 ? z80_cyclesDone() : z80_cycles_from_68k();\r
ym2612.OPN.ST.mode = d;\r
\r
elprintf(EL_YMTIMER, "st mode %02x", d);\r
\r
if ((d ^ old_mode) & 0xc0) {\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
+ if (PicoIn.opt & POPT_EXT_FM) return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
#endif\r
return 1;\r
}\r
}\r
case 0x2b: { /* DAC Sel (YM2612) */\r
int scanline = get_scanline(is_from_z80);\r
- ym2612.dacen = d & 0x80;\r
- if (d & 0x80) PsndDacLine = scanline;\r
+ if (ym2612.dacen != (d & 0x80)) {\r
+ ym2612.dacen = d & 0x80;\r
+ Pico.snd.dac_line = scanline;\r
+ }\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);\r
+ if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);\r
#endif\r
return 0;\r
}\r
ym2612.OPN.ST.address = d;\r
ym2612.addr_A1 = 1;\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
+ if (PicoIn.opt & POPT_EXT_FM) YM2612Write_940(a, d, -1);\r
#endif\r
return 0;\r
\r
}\r
\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM)\r
+ if (PicoIn.opt & POPT_EXT_FM)\r
return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
#endif\r
return YM2612Write_(a, d);\r
\r
\r
#define ym2612_read_local() \\r
- if (xcycles >= timer_a_next_oflow) \\r
+ if (xcycles >= Pico.t.timer_a_next_oflow) \\r
ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \\r
- if (xcycles >= timer_b_next_oflow) \\r
+ if (xcycles >= Pico.t.timer_b_next_oflow) \\r
ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2\r
\r
static u32 ym2612_read_local_z80(void)\r
\r
ym2612_read_local();\r
\r
- elprintf(EL_YMTIMER, "timer z80 read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status,\r
- timer_a_next_oflow>>8, timer_b_next_oflow>>8, xcycles >> 8, (xcycles >> 8) / 228);\r
+ elprintf(EL_YMTIMER, "timer z80 read %i, sched %i, %i @ %i|%i",\r
+ ym2612.OPN.ST.status, Pico.t.timer_a_next_oflow >> 8,\r
+ Pico.t.timer_b_next_oflow >> 8, xcycles >> 8, (xcycles >> 8) / 228);\r
return ym2612.OPN.ST.status;\r
}\r
\r
static u32 ym2612_read_local_68k(void)\r
{\r
- int xcycles = cycles_68k_to_z80(SekCyclesDone()) << 8;\r
+ int xcycles = z80_cycles_from_68k() << 8;\r
\r
ym2612_read_local();\r
\r
- elprintf(EL_YMTIMER, "timer 68k read %i, sched %i, %i @ %i|%i", ym2612.OPN.ST.status,\r
- timer_a_next_oflow>>8, timer_b_next_oflow>>8, xcycles >> 8, (xcycles >> 8) / 228);\r
+ elprintf(EL_YMTIMER, "timer 68k read %i, sched %i, %i @ %i|%i",\r
+ ym2612.OPN.ST.status, Pico.t.timer_a_next_oflow >> 8,\r
+ Pico.t.timer_b_next_oflow >> 8, xcycles >> 8, (xcycles >> 8) / 228);\r
return ym2612.OPN.ST.status;\r
}\r
\r
int tac, tat = 0, tbc, tbt = 0;\r
tac = 1024 - ym2612.OPN.ST.TA;\r
tbc = 256 - ym2612.OPN.ST.TB;\r
- if (timer_a_next_oflow != TIMER_NO_OFLOW)\r
- tat = (int)((double)(timer_a_step - timer_a_next_oflow) / (double)timer_a_step * tac * 65536);\r
- if (timer_b_next_oflow != TIMER_NO_OFLOW)\r
- tbt = (int)((double)(timer_b_step - timer_b_next_oflow) / (double)timer_b_step * tbc * 65536);\r
+ if (Pico.t.timer_a_next_oflow != TIMER_NO_OFLOW)\r
+ tat = (int)((double)(Pico.t.timer_a_step - Pico.t.timer_a_next_oflow)\r
+ / (double)Pico.t.timer_a_step * tac * 65536);\r
+ if (Pico.t.timer_b_next_oflow != TIMER_NO_OFLOW)\r
+ tbt = (int)((double)(Pico.t.timer_b_step - Pico.t.timer_b_next_oflow)\r
+ / (double)Pico.t.timer_b_step * tbc * 65536);\r
elprintf(EL_YMTIMER, "save: timer a %i/%i", tat >> 16, tac);\r
elprintf(EL_YMTIMER, "save: timer b %i/%i", tbt >> 16, tbc);\r
\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM)\r
+ if (PicoIn.opt & POPT_EXT_FM)\r
YM2612PicoStateSave2_940(tat, tbt);\r
else\r
#endif\r
}\r
\r
#ifdef __GP2X__\r
- if (PicoOpt & POPT_EXT_FM)\r
+ if (PicoIn.opt & POPT_EXT_FM)\r
ret = YM2612PicoStateLoad2_940(&tat, &tbt);\r
else\r
#endif\r
tac = (1024 - ym2612.OPN.ST.TA) << 16;\r
tbc = (256 - ym2612.OPN.ST.TB) << 16;\r
if (ym2612.OPN.ST.mode & 1)\r
- timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * timer_a_step);\r
+ Pico.t.timer_a_next_oflow = (int)((double)(tac - tat) / (double)tac * Pico.t.timer_a_step);\r
else\r
- timer_a_next_oflow = TIMER_NO_OFLOW;\r
+ Pico.t.timer_a_next_oflow = TIMER_NO_OFLOW;\r
if (ym2612.OPN.ST.mode & 2)\r
- timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * timer_b_step);\r
+ Pico.t.timer_b_next_oflow = (int)((double)(tbc - tbt) / (double)tbc * Pico.t.timer_b_step);\r
else\r
- timer_b_next_oflow = TIMER_NO_OFLOW;\r
- elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, timer_a_next_oflow >> 8);\r
- elprintf(EL_YMTIMER, "load: %i/%i, timer_b_next_oflow %i", tbt>>16, tbc>>16, timer_b_next_oflow >> 8);\r
+ Pico.t.timer_b_next_oflow = TIMER_NO_OFLOW;\r
+ elprintf(EL_YMTIMER, "load: %i/%i, timer_a_next_oflow %i", tat>>16, tac>>16, Pico.t.timer_a_next_oflow >> 8);\r
+ elprintf(EL_YMTIMER, "load: %i/%i, timer_b_next_oflow %i", tbt>>16, tbc>>16, Pico.t.timer_b_next_oflow >> 8);\r
}\r
\r
#if defined(NO_32X) && defined(_ASM_MEMORY_C)\r
\r
static unsigned char z80_md_vdp_read(unsigned short a)\r
{\r
- // TODO?\r
+ z80_subCLeft(2);\r
+\r
+ if ((a & 0x00f0) == 0x0000) {\r
+ switch (a & 0x0d)\r
+ {\r
+ case 0x00: return PicoVideoRead8DataH();\r
+ case 0x01: return PicoVideoRead8DataL();\r
+ case 0x04: return PicoVideoRead8CtlH();\r
+ case 0x05: return PicoVideoRead8CtlL();\r
+ case 0x08:\r
+ case 0x0c: return get_scanline(1); // FIXME: make it proper\r
+ case 0x09:\r
+ case 0x0d: return Pico.m.rotate++;\r
+ }\r
+ }\r
+\r
elprintf(EL_ANOMALY, "z80 invalid r8 [%06x] %02x", a, 0xff);\r
return 0xff;\r
}\r
unsigned int addr68k;\r
unsigned char ret;\r
\r
- addr68k = Pico.m.z80_bank68k<<15;\r
- addr68k += a & 0x7fff;\r
+ z80_subCLeft(3);\r
+\r
+ addr68k = Pico.m.z80_bank68k << 15;\r
+ addr68k |= a & 0x7fff;\r
\r
ret = m68k_read8(addr68k);\r
\r
\r
static void z80_md_ym2612_write(unsigned int a, unsigned char data)\r
{\r
- if (PicoOpt & POPT_EN_FM)\r
- emustatus |= ym2612_write_local(a, data, 1) & 1;\r
+ if (PicoIn.opt & POPT_EN_FM)\r
+ Pico.m.status |= ym2612_write_local(a, data, 1) & 1;\r
}\r
\r
static void z80_md_vdp_br_write(unsigned int a, unsigned char data)\r
{\r
- // TODO: allow full VDP access\r
if ((a&0xfff9) == 0x7f11) // 7f11 7f13 7f15 7f17\r
{\r
- if (PicoOpt & POPT_EN_PSG)\r
- SN76496Write(data);\r
+ psg_write_z80(data);\r
return;\r
}\r
+ // at least VDP data writes hang my machine\r
\r
if ((a>>8) == 0x60)\r
{\r
\r
static void z80_mem_setup(void)\r
{\r
- z80_map_set(z80_read_map, 0x0000, 0x1fff, Pico.zram, 0);\r
- z80_map_set(z80_read_map, 0x2000, 0x3fff, Pico.zram, 0);\r
+ z80_map_set(z80_read_map, 0x0000, 0x1fff, PicoMem.zram, 0);\r
+ z80_map_set(z80_read_map, 0x2000, 0x3fff, PicoMem.zram, 0);\r
z80_map_set(z80_read_map, 0x4000, 0x5fff, ym2612_read_local_z80, 1);\r
z80_map_set(z80_read_map, 0x6000, 0x7fff, z80_md_vdp_read, 1);\r
z80_map_set(z80_read_map, 0x8000, 0xffff, z80_md_bank_read, 1);\r
\r
- z80_map_set(z80_write_map, 0x0000, 0x1fff, Pico.zram, 0);\r
- z80_map_set(z80_write_map, 0x2000, 0x3fff, Pico.zram, 0);\r
+ z80_map_set(z80_write_map, 0x0000, 0x1fff, PicoMem.zram, 0);\r
+ z80_map_set(z80_write_map, 0x2000, 0x3fff, PicoMem.zram, 0);\r
z80_map_set(z80_write_map, 0x4000, 0x5fff, z80_md_ym2612_write, 1);\r
z80_map_set(z80_write_map, 0x6000, 0x7fff, z80_md_vdp_br_write, 1);\r
z80_map_set(z80_write_map, 0x8000, 0xffff, z80_md_bank_write, 1);\r
drZ80.z80_out = z80_md_out;\r
#endif\r
#ifdef _USE_CZ80\r
- Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (FPTR)Pico.zram); // main RAM\r
- Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)Pico.zram); // mirror\r
+ Cz80_Set_Fetch(&CZ80, 0x0000, 0x1fff, (FPTR)PicoMem.zram); // main RAM\r
+ Cz80_Set_Fetch(&CZ80, 0x2000, 0x3fff, (FPTR)PicoMem.zram); // mirror\r
Cz80_Set_INPort(&CZ80, z80_md_in);\r
Cz80_Set_OUTPort(&CZ80, z80_md_out);\r
#endif\r
}\r
\r
+// vim:shiftwidth=2:ts=2:expandtab\r
notaz.gp2x.de / picodrive.git / blobdiff