-// PicoDrive\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006-2008 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2010\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
\r
#include "pico_int.h"\r
#include "sound/ym2612.h"\r
int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
int PicoPadInt[2]; // internal copy\r
int PicoAHW; // active addon hardware: PAHW_*\r
+int PicoQuirks; // game-specific quirks\r
int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
int PicoAutoRgnOrder;\r
\r
\r
if (SRam.data)\r
free(SRam.data);\r
+ pevt_dump();\r
}\r
\r
void PicoPower(void)\r
Pico.m.frame_count = 0;\r
\r
// clear all memory of the emulated machine\r
- memset(&Pico.ram,0,(unsigned int)&Pico.rom-(unsigned int)&Pico.ram);\r
+ memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);\r
\r
memset(&Pico.video,0,sizeof(Pico.video));\r
memset(&Pico.m,0,sizeof(Pico.m));\r
Pico.video.pending_ints=0;\r
z80_reset();\r
\r
+ // my MD1 VA6 console has this in IO\r
+ Pico.ioports[1] = Pico.ioports[2] = Pico.ioports[3] = 0xff;\r
+\r
// default VDP register values (based on Fusion)\r
Pico.video.reg[0] = Pico.video.reg[1] = 0x04;\r
Pico.video.reg[0xc] = 0x81;\r
if (PicoAHW & PAHW_MCD)\r
PicoPowerMCD();\r
\r
- if (!(PicoOpt & POPT_DIS_32X))\r
+ if (PicoOpt & POPT_EN_32X)\r
PicoPower32x();\r
\r
PicoReset();\r
if (Pico.romsize <= 0)\r
return 1;\r
\r
+#if defined(CPU_CMP_R) || defined(CPU_CMP_W) || defined(DRC_CMP)\r
+ PicoOpt |= POPT_DIS_VDP_FIFO|POPT_DIS_IDLE_DET;\r
+#endif\r
+\r
/* must call now, so that banking is reset, and correct vectors get fetched */\r
if (PicoResetHook)\r
PicoResetHook();\r
SekReset();\r
// s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
SekSetRealTAS(PicoAHW & PAHW_MCD);\r
- SekCycleCntT=0;\r
+ SekCycleCnt = SekCycleAim = 0;\r
\r
if (PicoAHW & PAHW_MCD)\r
// needed for MCD to reset properly, probably some bug hides behind this..\r
if (!(PicoOpt & POPT_DIS_IDLE_DET))\r
SekInitIdleDet();\r
\r
- if (!(PicoOpt & POPT_DIS_32X)) {\r
+ if (PicoOpt & POPT_EN_32X)\r
PicoReset32x();\r
- return 0;\r
- }\r
\r
// reset sram state; enable sram access by default if it doesn't overlap with ROM\r
Pico.m.sram_reg = 0;\r
return 0;\r
}\r
\r
-// flush cinfig changes before emu loop starts\r
+// flush config changes before emu loop starts\r
void PicoLoopPrepare(void)\r
{\r
if (PicoRegionOverride)\r
\r
// FIXME: PAL has 313 scanlines..\r
scanlines_total = Pico.m.pal ? 312 : 262;\r
+\r
+ Pico.m.dirtyPal = 1;\r
+ rendstatus_old = -1;\r
}\r
\r
\r
return burn;\r
}\r
\r
-static __inline void SekRunM68k(int cyc)\r
-{\r
- int cyc_do;\r
- SekCycleAim+=cyc;\r
- if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;\r
-#if defined(EMU_CORE_DEBUG)\r
- // this means we do run-compare\r
- SekCycleCnt+=CM_compareRun(cyc_do, 0);\r
-#elif defined(EMU_C68K)\r
- PicoCpuCM68k.cycles=cyc_do;\r
- CycloneRun(&PicoCpuCM68k);\r
- SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;\r
-#elif defined(EMU_M68K)\r
- SekCycleCnt+=m68k_execute(cyc_do);\r
-#elif defined(EMU_F68K)\r
- SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);\r
-#endif\r
-}\r
-\r
#include "pico_cmn.c"\r
\r
-int z80stopCycle;\r
-int z80_cycle_cnt; /* 'done' z80 cycles before z80_run() */\r
+unsigned int last_z80_sync; /* in 68k cycles */\r
+int z80_cycle_cnt;\r
int z80_cycle_aim;\r
int z80_scanline;\r
int z80_scanline_cycles; /* cycles done until z80_scanline */\r
\r
/* sync z80 to 68k */\r
-PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)\r
+PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)\r
{\r
int cnt;\r
- z80_cycle_aim = cycles_68k_to_z80(m68k_cycles_done);\r
+ z80_cycle_aim += cycles_68k_to_z80(m68k_cycles_done - last_z80_sync);\r
cnt = z80_cycle_aim - z80_cycle_cnt;\r
+ last_z80_sync = m68k_cycles_done;\r
\r
- elprintf(EL_BUSREQ, "z80 sync %i (%i|%i -> %i|%i)", cnt, z80_cycle_cnt, z80_cycle_cnt / 228,\r
- z80_cycle_aim, z80_cycle_aim / 228);\r
+ pprof_start(z80);\r
+\r
+ elprintf(EL_BUSREQ, "z80 sync %i (%u|%u -> %u|%u)", cnt,\r
+ z80_cycle_cnt, z80_cycle_cnt / 288,\r
+ z80_cycle_aim, z80_cycle_aim / 288);\r
\r
if (cnt > 0)\r
z80_cycle_cnt += z80_run(cnt);\r
+\r
+ pprof_end(z80);\r
}\r
\r
\r
void PicoFrame(void)\r
{\r
+ pprof_start(frame);\r
+\r
Pico.m.frame_count++;\r
\r
if (PicoAHW & PAHW_SMS) {\r
PicoFrameMS();\r
- return;\r
+ goto end;\r
}\r
\r
// TODO: MCD+32X\r
if (PicoAHW & PAHW_MCD) {\r
PicoFrameMCD();\r
- return;\r
+ goto end;\r
}\r
\r
if (PicoAHW & PAHW_32X) {\r
PicoFrame32x();\r
- return;\r
+ goto end;\r
}\r
\r
//if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode\r
\r
PicoFrameStart();\r
PicoFrameHints();\r
+\r
+end:\r
+ pprof_end(frame);\r
}\r
\r
void PicoFrameDrawOnly(void)\r