int PicoAHW = 0; // active addon hardware: scd_active, 32x_active, svp_active, pico_active\r
int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
int PicoAutoRgnOrder = 0;\r
-int z80startCycle, z80stopCycle; // in 68k cycles\r
struct PicoSRAM SRam = {0,};\r
\r
void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware\r
\r
#include "PicoFrameHints.c"\r
\r
-// helper z80 runner. Runs only if z80 is enabled at this point\r
-// (z80WriteBusReq will handle the rest)\r
-static void PicoRunZ80Simple(int line_from, int line_to)\r
+\r
+int z80stopCycle;\r
+int z80_cycle_cnt; /* 'done' z80 cycles before z80_run() */\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
{\r
- int line_from_r=line_from, line_to_r=line_to, line=0;\r
- int line_sample = Pico.m.pal ? 68 : 93;\r
-\r
- if (!(PicoOpt&POPT_EN_Z80) || Pico.m.z80Run == 0) line_to_r = 0;\r
- else {\r
- extern const unsigned short vcounts[];\r
- if (z80startCycle) {\r
- line = vcounts[z80startCycle>>8];\r
- if (line > line_from)\r
- line_from_r = line;\r
- }\r
- z80startCycle = SekCyclesDone();\r
- }\r
+ int cnt;\r
+ z80_cycle_aim = cycles_68k_to_z80(m68k_cycles_done);\r
+ cnt = z80_cycle_aim - z80_cycle_cnt;\r
\r
- if (PicoOpt&POPT_EN_FM) {\r
- // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers\r
- for (line = line_from; line < line_to; line++) {\r
- Psnd_timers_and_dac(line);\r
- if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);\r
- if (line == 32 && PsndOut) emustatus &= ~1;\r
- if (line >= line_from_r && line < line_to_r)\r
- z80_run_nr(228);\r
- }\r
- } else if (line_to_r-line_from_r > 0) {\r
- z80_run_nr(228*(line_to_r-line_from_r));\r
- // samples will be taken by caller\r
- }\r
+ elprintf(EL_ANOMALY, "z80 sync %i (%i|%i -> %i|%i)", cnt, z80_cycle_cnt, z80_cycle_cnt / 228,\r
+ z80_cycle_aim, z80_cycle_aim / 228);\r
+\r
+ if (cnt > 0)\r
+ z80_cycle_cnt += z80_run(cnt);\r
}\r
\r
+\r
// Simple frame without H-Ints\r
static int PicoFrameSimple(void)\r
{\r
struct PicoVideo *pv=&Pico.video;\r
- int y=0,line=0,lines=0,lines_step=0,sects;\r
+ int y=0,lines_step=0,sects,line_last;\r
int cycles_68k_vblock,cycles_68k_block;\r
\r
// split to 16 run calls for active scan, for vblank split to 2 (ntsc), 3 (pal 240), 4 (pal 224)\r
- if (Pico.m.pal && (pv->reg[1]&8)) {\r
+ if (Pico.m.pal)\r
+ {\r
if(pv->reg[1]&8) { // 240 lines\r
- cycles_68k_block = 7329; // (488*240+148)/16.0, -4\r
- cycles_68k_vblock = 11640; // (72*488-148-68)/3.0, 0\r
+ cycles_68k_block = 7308;\r
+ cycles_68k_vblock = 11694;\r
lines_step = 15;\r
} else {\r
- cycles_68k_block = 6841; // (488*224+148)/16.0, -4\r
- cycles_68k_vblock = 10682; // (88*488-148-68)/4.0, 0\r
+ cycles_68k_block = 6821;\r
+ cycles_68k_vblock = 10719;\r
lines_step = 14;\r
}\r
+ line_last = 312-1;\r
} else {\r
// M68k cycles/frame: 127840.71\r
cycles_68k_block = 6841; // (488*224+148)/16.0, -4\r
cycles_68k_vblock = 9164; // (38*488-148-68)/2.0, 0\r
lines_step = 14;\r
+ line_last = 262-1;\r
}\r
\r
// a hack for VR, to get it running in fast mode\r
Pico.video.status|=0x200;\r
\r
Pico.m.scanline=-1;\r
- z80startCycle=0;\r
+ PsndDacLine = 0;\r
\r
SekCyclesReset();\r
+ z80_resetCycles();\r
+ timers_cycle();\r
\r
// 6 button pad: let's just say it timed out now\r
Pico.m.padTHPhase[0]=Pico.m.padTHPhase[1]=0;\r
pv->status&=~0x88; // clear V-Int, come out of vblank\r
\r
// Run in sections:\r
- for(sects=16; sects; sects--)\r
+ for (sects=16; sects; sects--)\r
{\r
if (CheckIdle()) break;\r
\r
- lines += lines_step;\r
SekRunM68k(cycles_68k_block);\r
-\r
- PicoRunZ80Simple(line, lines);\r
if (PicoLineHook) PicoLineHook(lines_step);\r
- line=lines;\r
}\r
\r
- // run Z80 for remaining sections\r
- if(sects) {\r
- int c = sects*cycles_68k_block;\r
-\r
- // this "run" is for approriate line counter, etc\r
- SekCycleCnt += c;\r
- SekCycleAim += c;\r
+ // do remaining sections without 68k\r
+ if (sects) {\r
+ SekCycleCnt += sects * cycles_68k_block;\r
+ SekCycleAim += sects * cycles_68k_block;\r
\r
- lines += sects*lines_step;\r
- PicoRunZ80Simple(line, lines);\r
if (PicoLineHook) PicoLineHook(sects*lines_step);\r
}\r
\r
#endif\r
}\r
\r
- // here we render sound if ym2612 is disabled\r
- if (!(PicoOpt&POPT_EN_FM) && PsndOut) {\r
- int len = PsndRender(0, PsndLen);\r
- if (PicoWriteSound) PicoWriteSound(len);\r
- // clear sound buffer\r
- PsndClear();\r
- }\r
-\r
// a gap between flags set and vint\r
pv->pending_ints|=0x20;\r
pv->status|=8; // go into vblank\r
SekRunM68k(68+4);\r
\r
+ if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))\r
+ PicoSyncZ80(SekCycleCnt);\r
+\r
+ // render sound\r
+ if (PsndOut)\r
+ {\r
+ int len;\r
+ if (ym2612.dacen && PsndDacLine <= lines_step*16)\r
+ PsndDoDAC(lines_step*16);\r
+ len = PsndRender(0, PsndLen);\r
+ if (PicoWriteSound) PicoWriteSound(len);\r
+ // clear sound buffer\r
+ PsndClear();\r
+ }\r
+\r
// ---- V-Blanking period ----\r
// fix line counts\r
if(Pico.m.pal) {\r
if(pv->reg[1]&8) { // 240 lines\r
- lines = line = 240;\r
sects = 3;\r
lines_step = 24;\r
} else {\r
- lines = line = 224;\r
sects = 4;\r
lines_step = 22;\r
}\r
} else {\r
- lines = line = 224;\r
sects = 2;\r
lines_step = 19;\r
}\r
if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))\r
z80_int();\r
\r
- while (sects)\r
+ while (1)\r
{\r
- lines += lines_step;\r
-\r
SekRunM68k(cycles_68k_vblock);\r
-\r
- PicoRunZ80Simple(line, lines);\r
if (PicoLineHook) PicoLineHook(lines_step);\r
- line=lines;\r
\r
sects--;\r
- if (sects && CheckIdle()) break;\r
+ if (sects == 0) break;\r
+ if (CheckIdle()) break;\r
}\r
\r
- // run Z80 for remaining sections\r
if (sects) {\r
- lines += sects*lines_step;\r
- PicoRunZ80Simple(line, lines);\r
+ SekCycleCnt += sects * cycles_68k_vblock;\r
+ SekCycleAim += sects * cycles_68k_vblock;\r
if (PicoLineHook) PicoLineHook(sects*lines_step);\r
}\r
\r
+ // must sync z80 before return, and extend last DAC sample\r
+ if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))\r
+ PicoSyncZ80(SekCycleCnt);\r
+ if (PsndOut && ym2612.dacen && PsndDacLine <= line_last)\r
+ PsndDoDAC(line_last);\r
+\r
return 0;\r
}\r
\r
void (*PicoMessage)(const char *msg)=NULL;\r
\r
#if 1 // defined(__DEBUG_PRINT)\r
-// tmp debug: dump some stuff\r
#define bit(r, x) ((r>>x)&1)\r
void z80_debug(char *dstr);\r
char *debugString(void)\r
notaz.gp2x.de / picodrive.git / blobdiff