#endif\r
\r
\r
-static u32 PicoCheckPc(u32 pc)\r
+PICO_INTERNAL u32 PicoCheckPc(u32 pc)\r
{\r
u32 ret=0;\r
#if defined(EMU_C68K)\r
#endif // EMU_M68K\r
\r
\r
+// -----------------------------------------------------------------\r
+\r
+extern const unsigned short vcounts[];\r
+\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
+ }\r
+\r
+ if (Pico.m.scanline != -1)\r
+ return Pico.m.scanline;\r
+\r
+ return vcounts[SekCyclesDone()>>8];\r
+}\r
+\r
+/* probably not should be in this file, but it's near related code here */\r
+void ym2612_sync_timers(int z80_cycles, int mode_old, int mode_new)\r
+{\r
+ int xcycles = z80_cycles << 8;\r
+\r
+ /* check for overflows */\r
+ if ((mode_old & 4) && xcycles > timer_a_next_oflow)\r
+ ym2612.OPN.ST.status |= 1;\r
+\r
+ if ((mode_old & 8) && xcycles > 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
+\r
+ if ((mode_old ^ mode_new) & 1) // turning on/off\r
+ {\r
+ if (mode_old & 1) {\r
+ timer_a_offset = timer_a_next_oflow - xcycles;\r
+ timer_a_next_oflow = TIMER_NO_OFLOW;\r
+ }\r
+ else\r
+ timer_a_next_oflow = xcycles + timer_a_offset;\r
+ }\r
+ if (mode_new & 1)\r
+ elprintf(EL_YMTIMER, "timer a upd to %i @ %i", 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
+\r
+ if ((mode_old ^ mode_new) & 2)\r
+ {\r
+ if (mode_old & 2) {\r
+ timer_b_offset = timer_b_next_oflow - xcycles;\r
+ timer_b_next_oflow = TIMER_NO_OFLOW;\r
+ }\r
+ else\r
+ timer_b_next_oflow = xcycles + timer_b_offset;\r
+ }\r
+ if (mode_new & 2)\r
+ elprintf(EL_YMTIMER, "timer b upd to %i @ %i", timer_b_next_oflow>>8, z80_cycles);\r
+}\r
+\r
+// ym2612 DAC and timer I/O handlers for z80\r
+int ym2612_write_local(u32 a, u32 d, int is_from_z80)\r
+{\r
+ int addr;\r
+\r
+ a &= 3;\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
+ ym2612.dacout = ((int)d - 0x80) << 6;\r
+ if (PsndOut && ym2612.dacen && scanline >= PsndDacLine)\r
+ PsndDoDAC(scanline);\r
+ return 0;\r
+ }\r
+\r
+ switch (a)\r
+ {\r
+ case 0: /* address port 0 */\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
+#endif\r
+ return 0;\r
+\r
+ case 1: /* data port 0 */\r
+ if (ym2612.addr_A1 != 0)\r
+ return 0;\r
+\r
+ addr = ym2612.OPN.ST.address;\r
+ ym2612.REGS[addr] = d;\r
+\r
+ switch (addr)\r
+ {\r
+ case 0x24: // timer A High 8\r
+ case 0x25: { // timer A Low 2\r
+ int TAnew = (addr == 0x24) ? ((ym2612.OPN.ST.TA & 0x03)|(((int)d)<<2))\r
+ : ((ym2612.OPN.ST.TA & 0x3fc)|(d&3));\r
+ if (ym2612.OPN.ST.TA != TAnew)\r
+ {\r
+ //elprintf(EL_STATUS, "timer a set %i", TAnew);\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_offset = 16466 * (1024 - TAnew);\r
+ if (ym2612.OPN.ST.mode & 1) {\r
+ int cycles = is_from_z80 ? z80_cyclesDone() : cycles_68k_to_z80(SekCyclesDone());\r
+ timer_a_next_oflow = (cycles << 8) + timer_a_step;\r
+ }\r
+ elprintf(EL_YMTIMER, "timer a set to %i, %i", 1024 - TAnew, timer_a_next_oflow>>8);\r
+ }\r
+ return 0;\r
+ }\r
+ case 0x26: // timer B\r
+ if (ym2612.OPN.ST.TB != d) {\r
+ //elprintf(EL_STATUS, "timer b set %i", d);\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_offset = 262800 * (256 - d); // 262881\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
+ }\r
+ elprintf(EL_YMTIMER, "timer b set to %i, %i", 256 - d, 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
+ ym2612.OPN.ST.mode = d;\r
+\r
+ elprintf(EL_YMTIMER, "st mode %02x", d);\r
+ ym2612_sync_timers(cycles, old_mode, d);\r
+\r
+ /* reset Timer a flag */\r
+ if (d & 0x10)\r
+ ym2612.OPN.ST.status &= ~1;\r
+\r
+ /* reset Timer b flag */\r
+ if (d & 0x20)\r
+ ym2612.OPN.ST.status &= ~2;\r
+\r
+ if ((d ^ old_mode) & 0xc0) {\r
+#ifdef __GP2X__\r
+ if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, get_scanline(is_from_z80));\r
+#endif\r
+ return 1;\r
+ }\r
+ return 0;\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
+#ifdef __GP2X__\r
+ if (PicoOpt & POPT_EXT_FM) YM2612Write_940(a, d, scanline);\r
+#endif\r
+ return 0;\r
+ }\r
+ }\r
+ break;\r
+\r
+ case 2: /* address port 1 */\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
+#endif\r
+ return 0;\r
+\r
+ case 3: /* data port 1 */\r
+ if (ym2612.addr_A1 != 1)\r
+ return 0;\r
+\r
+ addr = ym2612.OPN.ST.address | 0x100;\r
+ ym2612.REGS[addr] = d;\r
+ break;\r
+ }\r
+\r
+#ifdef __GP2X__\r
+ if (PicoOpt & POPT_EXT_FM)\r
+ return YM2612Write_940(a, d, get_scanline(is_from_z80));\r
+#endif\r
+ return YM2612Write_(a, d);\r
+}\r
+\r
+\r
+#define ym2612_read_local() \\r
+ if (xcycles >= timer_a_next_oflow) \\r
+ ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 1; \\r
+ if (xcycles >= timer_b_next_oflow) \\r
+ ym2612.OPN.ST.status |= (ym2612.OPN.ST.mode >> 2) & 2\r
+\r
+u32 ym2612_read_local_z80(void)\r
+{\r
+ int xcycles = z80_cyclesDone() << 8;\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
+ return ym2612.OPN.ST.status;\r
+}\r
+\r
+u32 ym2612_read_local_68k(void)\r
+{\r
+ int xcycles = cycles_68k_to_z80(SekCyclesDone()) << 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
+ return ym2612.OPN.ST.status;\r
+}\r
+\r
+void ym2612_pack_state(void)\r
+{\r
+ // timers are saved as tick counts, in 16.16 int format\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
+ 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
+ /*YM2612PicoStateSave2_940(tat, tbt)*/;\r
+ else\r
+#endif\r
+ YM2612PicoStateSave2(tat, tbt);\r
+}\r
+\r
+void ym2612_unpack_state(void)\r
+{\r
+ int i, ret, tac, tat, tbc, tbt;\r
+ YM2612PicoStateLoad();\r
+\r
+ // feed all the registers and update internal state\r
+ for (i = 0x20; i < 0xB8; i++) {\r
+ ym2612_write_local(0, i, 0);\r
+ ym2612_write_local(1, ym2612.REGS[i], 0);\r
+ }\r
+ for (i = 0x30; i < 0xB8; i++) {\r
+ ym2612_write_local(2, i, 0);\r
+ ym2612_write_local(3, ym2612.REGS[i|0x100], 0);\r
+ }\r
+\r
+#ifdef __GP2X__\r
+ if (PicoOpt & POPT_EXT_FM)\r
+ /*ret = YM2612PicoStateLoad2_940(&tat, &tbt)*/;\r
+ else\r
+#endif\r
+ ret = YM2612PicoStateLoad2(&tat, &tbt);\r
+ if (ret != 0) return; // no saved timers\r
+\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 = (double)(tac - tat) / (double)tac * timer_a_step;\r
+ else\r
+ timer_a_next_oflow = TIMER_NO_OFLOW;\r
+ if (ym2612.OPN.ST.mode & 2)\r
+ timer_b_next_oflow = (double)(tbc - tbt) / (double)tbc * 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
+}\r
+\r
// -----------------------------------------------------------------\r
// z80 memhandlers\r
\r
\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
{\r
- if (PicoOpt&POPT_EN_FM) ret = (u8) YM2612Read();\r
+ if (PicoOpt&POPT_EN_FM) ret = ym2612_read_local_z80();\r
return ret;\r
}\r
\r
addr68k=Pico.m.z80_bank68k<<15;\r
addr68k+=a&0x7fff;\r
\r
+ if (addr68k < Pico.romsize) { ret = Pico.rom[addr68k^1]; goto bnkend; }\r
+ elprintf(EL_ANOMALY, "z80->68k upper read [%06x] %02x", addr68k, ret);\r
if (PicoAHW & PAHW_MCD)\r
ret = PicoReadM68k8(addr68k);\r
else ret = PicoRead8(addr68k);\r
+bnkend:\r
elprintf(EL_Z80BNK, "z80->68k r8 [%06x] %02x", addr68k, ret);\r
return ret;\r
}\r
{\r
if ((a>>13)==2) // 0x4000-0x5fff (Charles MacDonald)\r
{\r
- if(PicoOpt&POPT_EN_FM) emustatus|=YM2612Write(a, data) & 1;\r
+ if(PicoOpt&POPT_EN_FM) emustatus|=ym2612_write_local(a, data, 1) & 1;\r
return;\r
}\r
\r
notaz.gp2x.de / picodrive.git / blobdiff