\r
\r
#include "PicoInt.h"\r
-#include "sound/sound.h"\r
#include "sound/ym2612.h"\r
\r
-int PicoVer=0x0110;\r
+int PicoVer=0x0133;\r
struct Pico Pico;\r
int PicoOpt=0; // disable everything by default\r
int PicoSkipFrame=0; // skip rendering frame?\r
void (*PicoWriteSound)(int len) = 0; // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
\r
struct PicoSRAM SRam;\r
-int z80startCycle = 0, z80stopCycle = 0; // in 68k cycles\r
+int z80startCycle, z80stopCycle; // in 68k cycles\r
//int z80ExtraCycles = 0;\r
int PicoPad[2]; // Joypads, format is SACB RLDU\r
int PicoMCD = 0; // mega CD status: scd_started, reset_pending\r
\r
PicoInitMCD();\r
\r
- // notaz: sram\r
SRam.data=0;\r
SRam.resize=1;\r
\r
PicoExitMCD();\r
z80_exit();\r
\r
- // notaz: sram\r
if(SRam.data) free(SRam.data); SRam.data=0;\r
}\r
\r
return 0;\r
}\r
\r
-\r
- // notaz: sram\r
if(SRam.resize) {\r
int sram_size = 0;\r
if(SRam.data) free(SRam.data); SRam.data=0;\r
\r
if(*(Pico.rom+0x1B1) == 'R' && *(Pico.rom+0x1B0) == 'A') {\r
if(*(Pico.rom+0x1B2) & 0x40) {\r
- // EEPROM SRAM\r
+ // EEPROM\r
// what kind of EEPROMs are actually used? X24C02? X24C04? (X24C01 has only 128), but we will support up to 8K\r
SRam.start = PicoRead32(0x1B4) & ~1; // zero address is used for clock by some games\r
SRam.end = PicoRead32(0x1B8);\r
// Dino Dini's Soccer malfunctions if SRAM is not filled with 0xff\r
if (strncmp((char *)Pico.rom+0x150, "IDOND NI'I", 10) == 0)\r
memset(SRam.data, 0xff, sram_size);\r
- dprintf("sram: det: %i; eeprom: %i; start: %06x; end: %06x\n",\r
+ elprintf(EL_STATUS, "sram: det: %i; eeprom: %i; start: %06x; end: %06x",\r
(Pico.m.sram_reg>>4)&1, (Pico.m.sram_reg>>2)&1, SRam.start, SRam.end);\r
}\r
\r
return 0;\r
}\r
\r
-static int dma_timings[] = {\r
+// dma2vram settings are just hacks to unglitch Legend of Galahad (needs <= 104 to work)\r
+// same for Outrunners (92-121, when active is set to 24)\r
+static const int dma_timings[] = {\r
83, 167, 166, 83, // vblank: 32cell: dma2vram dma2[vs|c]ram vram_fill vram_copy\r
102, 205, 204, 102, // vblank: 40cell:\r
-8, 16, 15, 8, // active: 32cell:\r
-9, 18, 17, 9 // ...\r
+16, 16, 15, 8, // active: 32cell:\r
+24, 18, 17, 9 // ...\r
};\r
\r
-static int dma_bsycles[] = {\r
-(488<<8)/83, (488<<8)/167, (488<<8)/166, (488<<8)/83,\r
+static const int dma_bsycles[] = {\r
+(488<<8)/82, (488<<8)/167, (488<<8)/166, (488<<8)/83,\r
(488<<8)/102, (488<<8)/205, (488<<8)/204, (488<<8)/102,\r
-(488<<8)/8, (488<<8)/16, (488<<8)/15, (488<<8)/8,\r
-(488<<8)/9, (488<<8)/18, (488<<8)/17, (488<<8)/9\r
+(488<<8)/16, (488<<8)/16, (488<<8)/15, (488<<8)/8,\r
+(488<<8)/24, (488<<8)/18, (488<<8)/17, (488<<8)/9\r
};\r
\r
-//static\r
-int CheckDMA(void)\r
+PICO_INTERNAL int CheckDMA(void)\r
{\r
- int burn = 0, bytes_can = 0, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes\r
- int bytes = Pico.m.dma_bytes;\r
+ int burn = 0, xfers_can, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes\r
+ int xfers = Pico.m.dma_xfers;\r
int dma_op1;\r
\r
if(!(dma_op&2)) dma_op = (Pico.video.type==1) ? 0 : 1; // setting dma_timings offset here according to Gens\r
dma_op1 = dma_op;\r
if(Pico.video.reg[12] & 1) dma_op |= 4; // 40 cell mode?\r
if(!(Pico.video.status&8)&&(Pico.video.reg[1]&0x40)) dma_op|=8; // active display?\r
- bytes_can = dma_timings[dma_op];\r
-\r
- if(bytes <= bytes_can) {\r
+ xfers_can = dma_timings[dma_op];\r
+ if(xfers <= xfers_can) {\r
if(dma_op&2) Pico.video.status&=~2; // dma no longer busy\r
else {\r
- burn = bytes * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..\r
- //SekCycleCnt-=Pico.m.dma_endcycles;\r
- //Pico.m.dma_endcycles = 0;\r
+ burn = xfers * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..\r
}\r
- Pico.m.dma_bytes = 0;\r
+ Pico.m.dma_xfers = 0;\r
} else {\r
if(!(dma_op&2)) burn = 488;\r
- Pico.m.dma_bytes -= bytes_can;\r
+ Pico.m.dma_xfers -= xfers_can;\r
}\r
\r
- //SekCycleCnt+=burn;\r
- dprintf("~Dma %i op=%i can=%i burn=%i [%i|%i]", Pico.m.dma_bytes, dma_op1, bytes_can, burn, Pico.m.scanline, SekCyclesDone());\r
+ elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%i]", Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());\r
//dprintf("~aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);\r
return burn;\r
}\r
{\r
int cyc_do;\r
SekCycleAim+=cyc;\r
- //dprintf("aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);\r
+ //printf("aim: %i, cnt: %i\n", SekCycleAim, SekCycleCnt);\r
if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;\r
- //dprintf("cyc_do: %i", cyc_do);\r
+ //printf("cyc_do: %i\n", cyc_do);\r
#if defined(EMU_C68K) && defined(EMU_M68K)\r
// this means we do run-compare Cyclone vs Musashi\r
SekCycleCnt+=CM_compareRun(cyc_do);\r
static int curr_pos = 0;\r
\r
if(y == 224) {\r
- //dprintf("sta%i: %i [%i]", (emustatus & 2), emustatus, y);\r
if(emustatus & 2)\r
curr_pos += sound_render(curr_pos, PsndLen-PsndLen/2);\r
else curr_pos = sound_render(0, PsndLen);\r
}\r
}\r
\r
-//extern UINT32 mz80GetRegisterValue(void *, UINT32);\r
+\r
+#if 1*0\r
+int vint_delay = 205/*68*/, as_delay = 18/*148*/;\r
\r
// Accurate but slower frame which does hints\r
static int PicoFrameHints(void)\r
hint=pv->reg[10]; // Load H-Int counter\r
//dprintf("-hint: %i", hint);\r
\r
+ //SekRun(as_delay);\r
+ SekRun(148);\r
+\r
for (y=0;y<lines;y++)\r
{\r
Pico.m.scanline=(short)y;\r
\r
+ // VDP FIFO\r
+ pv->lwrite_cnt -= 12;\r
+ if (pv->lwrite_cnt < 0) pv->lwrite_cnt=0;\r
+ if (pv->lwrite_cnt == 0)\r
+ Pico.video.status|=0x200;\r
+\r
// pad delay (for 6 button pads)\r
if(PicoOpt&0x20) {\r
if(Pico.m.padDelay[0]++ > 25) Pico.m.padTHPhase[0]=0;\r
//dprintf("rhint:old @ %06x", SekPc);\r
hint=pv->reg[10]; // Reload H-Int counter\r
pv->pending_ints|=0x10;\r
- if (pv->reg[0]&0x10) SekInterrupt(4);\r
- //dprintf("rhint: %i @ %06x [%i|%i]", hint, SekPc, y, SekCycleCnt);\r
+ if (pv->reg[0]&0x10) {\r
+ elprintf(EL_INTS, "hint: @ %06x [%i]", SekPc, SekCycleCnt);\r
+ SekInterrupt(4);\r
+ }\r
//dprintf("hint_routine: %x", (*(unsigned short*)(Pico.ram+0x0B84)<<16)|*(unsigned short*)(Pico.ram+0x0B86));\r
}\r
\r
// V-Interrupt:\r
if (y == lines_vis)\r
{\r
- dprintf("vint: @ %06x [%i|%i], aim=%i cnt=%i", SekPc, y, SekCycleCnt, SekCycleAim, SekCycleCnt);\r
pv->status|=0x08; // go into vblank\r
- if(!Pico.m.dma_bytes||(Pico.video.reg[0x17]&0x80)) {\r
+ //pv->status|=0x80; // V-Int happened\r
+ //if(!Pico.m.dma_bytes||(Pico.video.reg[0x17]&0x80)) {\r
// there must be a gap between H and V ints, also after vblank bit set (Mazin Saga, Bram Stoker's Dracula)\r
- SekRun(128); SekCycleAim-=128; // 128; ?\r
- }\r
- dprintf("[%i|%i], aim=%i cnt=%i @ %x", y, SekCycleCnt, SekCycleAim, SekCycleCnt, SekPc);\r
- pv->status|=0x80; // V-Int happened\r
+ SekRun(68); SekCycleAim-=68; // 128; ?\r
+ SekCycleAim-=148;\r
+// SekRun(vint_delay); SekCycleAim-=vint_delay; // 128; ?\r
+// SekCycleAim-=as_delay;\r
+ //}\r
pv->pending_ints|=0x20;\r
- if(pv->reg[1]&0x20) SekInterrupt(6);\r
+ if(pv->reg[1]&0x20) {\r
+ elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt);\r
+ SekInterrupt(6);\r
+ }\r
if(Pico.m.z80Run && (PicoOpt&4)) // ?\r
z80_int();\r
//dprintf("zint: [%i|%i] zPC=%04x", Pico.m.scanline, SekCyclesDone(), mz80GetRegisterValue(NULL, 0));\r
getSamples(y);\r
\r
// Run scanline:\r
- if (Pico.m.dma_bytes) SekCyclesBurn(CheckDMA());\r
+ if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA());\r
SekRun(cycles_68k);\r
if ((PicoOpt&4) && Pico.m.z80Run) {\r
if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80;\r
\r
return 0;\r
}\r
+#else\r
+#include "PicoFrameHints.c"\r
+#endif\r
\r
// helper z80 runner\r
static void PicoRunZ80Simple(int line_from, int line_to)\r
{\r
int line_from_r=line_from, line_to_r=line_to, line = line_from;\r
int line_sample = Pico.m.pal ? 68 : 93;\r
- extern const unsigned short vcounts[];\r
\r
if(!(PicoOpt&4) || Pico.m.z80Run == 0) { line_from_r = line_to_r; line_to_r = 0; }\r
\r
- if(z80startCycle != 0) {\r
- line_from_r = vcounts[z80startCycle>>8]+1;\r
- z80startCycle = 0;\r
- }\r
- if(z80stopCycle != 0) {\r
- line_to_r = vcounts[z80stopCycle>>8]+1;\r
- z80stopCycle = 0;\r
- }\r
-\r
if(PicoOpt&1) {\r
// we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers\r
for(; line < line_to; line++) {\r
int y=0,line=0,lines=0,lines_step=0,sects;\r
int cycles_68k_vblock,cycles_68k_block;\r
\r
- // we don't emulate DMA timing in this mode\r
- if (Pico.m.dma_bytes) {\r
- Pico.m.dma_bytes=0;\r
- Pico.video.status&=~2;\r
- }\r
-\r
if (Pico.m.pal) {\r
// M68k cycles/frame: 152009.78\r
if(pv->reg[1]&8) { // 240 lines\r
lines_step = 14;\r
}\r
\r
+ // we don't emulate DMA timing in this mode\r
+ if (Pico.m.dma_xfers) {\r
+ Pico.m.dma_xfers=0;\r
+ Pico.video.status&=~2;\r
+ }\r
+\r
+ // VDP FIFO too\r
+ pv->lwrite_cnt = 0;\r
+ Pico.video.status|=0x200;\r
+\r
Pico.m.scanline=-1;\r
\r
SekCyclesReset();\r
\r
- if(PicoOpt&4)\r
- z80_resetCycles();\r
-\r
// 6 button pad: let's just say it timed out now\r
Pico.m.padTHPhase[0]=Pico.m.padTHPhase[1]=0;\r
\r
// ---- Active Scan ----\r
- pv->status&=~88; // clear V-Int, come out of vblank\r
+ pv->status&=~0x88; // clear V-Int, come out of vblank\r
\r
// Run in sections:\r
for(sects=16; sects; sects--)\r
//dprintf("vint: @ %06x [%i]", SekPc, SekCycleCnt);\r
pv->pending_ints|=0x20;\r
if (pv->reg[1]&0x20) SekInterrupt(6); // Set IRQ\r
- pv->status|=0x88; // V-Int happened / go into vblank\r
+ pv->status|=8; // go into vblank\r
if(Pico.m.z80Run && (PicoOpt&4)) // ?\r
z80_int();\r
\r
return 0;\r
}\r
\r
+void PicoFrameDrawOnly(void)\r
+{\r
+ int y;\r
+ PicoFrameStart();\r
+ for (y=0;y<224;y++) PicoLine(y);\r
+}\r
+\r
// callback to output message from emu\r
void (*PicoMessage)(const char *msg)=NULL;\r
\r
-#if defined(__DEBUG_PRINT) || defined(WIN32)\r
+#if defined(__DEBUG_PRINT) || defined(__GP2X__)\r
// tmp debug: dump some stuff\r
#define bit(r, x) ((r>>x)&1)\r
void z80_debug(char *dstr);\r
-char *debugString()\r
+char *debugString(void)\r
{\r
#if 1\r
static char dstr[1024];\r
- unsigned char *reg=Pico.video.reg, r;\r
-\r
- // dump some info\r
- sprintf(dstr, "mode set 1: %02x\n", (r=reg[0]));\r
- sprintf(dstr, "%sdisplay_disable: %i, M3: %i, palette: %i, ?, hints: %i\n\n", dstr, bit(r,0), bit(r,1), bit(r,2), bit(r,4));\r
- sprintf(dstr, "%smode set 2: %02x\n", dstr, (r=reg[1]));\r
- sprintf(dstr, "%sSMS/genesis: %i, pal: %i, dma: %i, vints: %i, disp: %i, TMS9918: %i\n\n",dstr, bit(r,2), bit(r,3), bit(r,4), bit(r,5), bit(r,6), bit(r,7));\r
- sprintf(dstr, "%smode set 3: %02x\n", dstr, (r=reg[0xB]));\r
- sprintf(dstr, "%sLSCR: %i, HSCR: %i, 2cell vscroll: %i, IE2: %i\n\n", dstr, bit(r,0), bit(r,1), bit(r,2), bit(r,3));\r
- sprintf(dstr, "%smode set 4: %02x\n", dstr, (r=reg[0xC]));\r
- sprintf(dstr, "%sinterlace: %i%i; cells: %i; shadow: %i\n\n", dstr, bit(r,2), bit(r,1), (r&0x80) ? 40 : 32, bit(r,3));\r
- sprintf(dstr, "%sscroll size: w: %i; h: %i\n\n", dstr, reg[0x10]&3, (reg[0x10]&0x30)>>4);\r
- sprintf(dstr, "%sSRAM: det: %i; eeprom: %i\n", dstr, bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2));\r
- sprintf(dstr, "%sCPU state: PC: %06x cycles: %i\n", dstr, SekPc, SekCyclesDoneT());\r
+ struct PicoVideo *pv=&Pico.video;\r
+ unsigned char *reg=pv->reg, r;\r
+ char *dstrp;\r
+\r
+ dstrp = dstr;\r
+ sprintf(dstrp, "mode set 1: %02x\n", (r=reg[0])); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "display_disable: %i, M3: %i, palette: %i, ?, hints: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,4));\r
+ dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "mode set 2: %02x\n", (r=reg[1])); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "SMS/gen: %i, pal: %i, dma: %i, vints: %i, disp: %i, TMS: %i\n", bit(r,2), bit(r,3), bit(r,4),\r
+ bit(r,5), bit(r,6), bit(r,7)); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "mode set 3: %02x\n", (r=reg[0xB])); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "LSCR: %i, HSCR: %i, 2cell vscroll: %i, IE2: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,3)); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "mode set 4: %02x\n", (r=reg[0xC])); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "interlace: %i%i, cells: %i, shadow: %i\n", bit(r,2), bit(r,1), (r&0x80) ? 40 : 32, bit(r,3));\r
+ dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "scroll size: w: %i, h: %i SRAM: %i; eeprom: %i\n", reg[0x10]&3, (reg[0x10]&0x30)>>4,\r
+ bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2)); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status);\r
+ dstrp+=strlen(dstrp);\r
#ifdef EMU_C68K\r
- for(r=0; r < 8; r++)\r
- sprintf(dstr, "%sd%i=%08x, a%i=%08x\n", dstr, r, PicoCpu.d[r], r, PicoCpu.a[r]);\r
+ sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpu.state_flags, SekCyclesDoneT());\r
+ dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpu.d[0], PicoCpu.a[0], PicoCpu.osp, PicoCpu.irq); dstrp+=strlen(dstrp);\r
+ sprintf(dstrp, "d1=%08x, a1=%08x, sr=%04x\n", PicoCpu.d[1], PicoCpu.a[1], CycloneGetSr(&PicoCpu)); dstrp+=strlen(dstrp);\r
+ for(r=2; r < 8; r++) {\r
+ sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpu.d[r], r, PicoCpu.a[r]); dstrp+=strlen(dstrp);\r
+ }\r
#endif\r
- z80_debug(dstr);\r
+ sprintf(dstrp, "z80Run: %i, pal: %i, frame#: %i\n", Pico.m.z80Run, Pico.m.pal, Pico.m.frame_count); dstrp+=strlen(dstrp);\r
+ z80_debug(dstrp); dstrp+=strlen(dstrp);\r
+ if (strlen(dstr) > sizeof(dstr))\r
+ printf("warning: debug buffer overflow (%i/%i)\n", strlen(dstr), sizeof(dstr));\r
\r
#else\r
struct PicoVideo *pvid=&Pico.video;\r
code2 = sprite[1];\r
sx = (code2>>16)&0x1ff;\r
\r
- dprintf("#%02i x: %03i y: %03i %ix%i", u, sx, sy, ((code>>26)&3)+1, height);\r
+ printf("#%02i x: %03i y: %03i %ix%i\n", u, sx, sy, ((code>>26)&3)+1, height);\r
\r
link=(code>>16)&0x7f;\r
if(!link) break; // End of sprites\r
notaz.gp2x.de / picodrive.git / blobdiff