RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

vdp, some finetuning, cleanup

Browse source
This commit is contained in:
kub 2021-06-08 22:26:24 +02:00
parent 6f9993a461
commit df18e715ac
1 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

73
pico/videoport.c
View file

@ -19,13 +19,24 @@ enum { clkdiv = 2 }; // CPU clock granularity: one of 1,2,4,8
// forum/viewtopic.php?f=22&t=851&sid=d5701a71396ee7f700c74fb7cd85cb09 // forum/viewtopic.php?f=22&t=851&sid=d5701a71396ee7f700c74fb7cd85cb09
// Thank you very much for the great work, Nemesis! // Thank you very much for the great work, Nemesis!
// Slot clock is sysclock/20 for h32 and sysclock/16 for h40.
// One scanline is 63.7us/63.5us (h32/h40) long which is 488.6/487.4 68k cycles.
// Assume 488 for everything.
// 1 slot is 488/171 = 2.8538 68k cycles in h32, and 488/210 = 2.3238 in h40. // 1 slot is 488/171 = 2.8538 68k cycles in h32, and 488/210 = 2.3238 in h40.
enum { slcpu = 488 };
// VDP has a slot counter running from 0x00 to 0xff every scanline, but it has // VDP has a slot counter running from 0x00 to 0xff every scanline, but it has
// a gap depending on the video mode. The slot in which a horizontal interrupt // a gap depending on the video mode. The slot in which a horizontal interrupt
// is generated also depends on the video mode. // is generated also depends on the video mode.
enum { hint32 = 0x84, gapstart32 = 0x94, gapend32 = 0xe9 }; enum { hint32 = 0x85, gapstart32 = 0x94, gapend32 = 0xe9};
enum { hint40 = 0xa4, gapstart40 = 0xb7, gapend40 = 0xe5 }; enum { hint40 = 0xa5, gapstart40 = 0xb7, gapend40 = 0xe5};
// The horizontal sync period (HBLANK) is 30/37 slots (h32/h40):
// h32: 4 slots front porch (1.49us), 13 HSYNC (4.84us), 13 back porch (4.84us)
// h40: 5 slots front porch (1.49us), 16 HSYNC (4.77us), 16 back porch (4.77us)
// HBLANK starts in slot 0x93/0xb4, according to Nemesis' measurements.
enum { hboff32 = 0x93-hint32, hblen32 = 0xf8-(gapend32-gapstart32)-hint32};//30
enum { hboff40 = 0xb4-hint40, hblen40 = 0xf8-(gapend40-gapstart40)-hint40};//37
// number of slots in a scanline // number of slots in a scanline
#define slots32 (0x100-(gapend32-gapstart32)) // 171 #define slots32 (0x100-(gapend32-gapstart32)) // 171
@ -46,16 +57,17 @@ static u8 refslots40[] =
{ 250, 26, 58, 90, 122, 154 }; { 250, 26, 58, 90, 122, 154 };
// table sizes // table sizes
enum { cycsz = 488/clkdiv }; enum { cycsz = slcpu/clkdiv };
enum { sl32blsz=slots32-sizeof(refslots32)+1, sl32acsz=sizeof(dmaslots32)+1 }; enum { sl32blsz=slots32-sizeof(refslots32)+1, sl32acsz=sizeof(dmaslots32)+1 };
enum { sl40blsz=slots40-sizeof(refslots40)+1, sl40acsz=sizeof(dmaslots40)+1 }; enum { sl40blsz=slots40-sizeof(refslots40)+1, sl40acsz=sizeof(dmaslots40)+1 };
// Tables must be considerably larger than one scanline, since 68k emulation // Tables must be considerably larger than one scanline, since 68k emulation
// isn't stopping in the middle of an operation. If the last op is a 32 bit // isn't stopping in the middle of an operation. If the last op is a 32 bit
// VDP write 2 slots may need to be taken from the next scanline, which can be // VDP access 2 slots may need to be taken from the next scanline, which can be
// more than 100 CPU cycles. For safety just cover 2 scanlines. // more than 100 CPU cycles. For safety just cover 2 scanlines.
// table for mapping hvcounter reads // table for hvcounter mapping. check: Sonic 3D Blast bonus, Cannon Fodder,
// Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune
static u8 hcounts_32[2*cycsz], hcounts_40[2*cycsz]; static u8 hcounts_32[2*cycsz], hcounts_40[2*cycsz];
// tables mapping cycles to slots // tables mapping cycles to slots
static u16 vdpcyc2sl_32_bl[2*cycsz],vdpcyc2sl_40_bl[2*cycsz]; static u16 vdpcyc2sl_32_bl[2*cycsz],vdpcyc2sl_40_bl[2*cycsz];
@ -69,7 +81,7 @@ static u16 vdpsl2cyc_32_ac[2*sl32acsz],vdpsl2cyc_40_ac[2*sl40acsz];
// calculate timing tables for one mode (H32 or H40) // calculate timing tables for one mode (H32 or H40)
// NB tables aligned to HINT, since the main loop uses HINT as synchronization // NB tables aligned to HINT, since the main loop uses HINT as synchronization
#define INITTABLES(s) { \ #define INITTABLES(s) { \
float factor = 488./slots##s; \ float factor = (float)slcpu/slots##s; \
int ax, bx, rx, ac, bc; \ int ax, bx, rx, ac, bc; \
int i, n; \ int i, n; \
\ \
@ -77,9 +89,8 @@ static u16 vdpsl2cyc_32_ac[2*sl32acsz],vdpsl2cyc_40_ac[2*sl40acsz];
for (i = 0; i < cycsz; i++) { \ for (i = 0; i < cycsz; i++) { \
n = hint##s + i*clkdiv/factor; \ n = hint##s + i*clkdiv/factor; \
if (n >= gapstart##s) n += gapend##s-gapstart##s; \ if (n >= gapstart##s) n += gapend##s-gapstart##s; \
hcounts_##s[i] = n % 256; \ hcounts_##s[i] = n % 256; \
} \ } \
memcpy(hcounts_##s+cycsz, hcounts_##s, ARRAY_SIZE(hcounts_##s)-cycsz);\
\ \
ax = bx = ac = bc = rx = 0; \ ax = bx = ac = bc = rx = 0; \
for (i = 0; i < cycsz; i++) { \ for (i = 0; i < cycsz; i++) { \
@ -103,12 +114,14 @@ static u16 vdpsl2cyc_32_ac[2*sl32acsz],vdpsl2cyc_40_ac[2*sl40acsz];
vdpcyc2sl_##s##_ac[ac] = ARRAY_SIZE(dmaslots##s), ac++; \ vdpcyc2sl_##s##_ac[ac] = ARRAY_SIZE(dmaslots##s), ac++; \
while (bc < cycsz) \ while (bc < cycsz) \
vdpcyc2sl_##s##_bl[bc] = slots##s-ARRAY_SIZE(refslots##s), bc++; \ vdpcyc2sl_##s##_bl[bc] = slots##s-ARRAY_SIZE(refslots##s), bc++; \
\
/* extend tables for 2nd scanline */ \ /* extend tables for 2nd scanline */ \
memcpy(hcounts_##s+cycsz, hcounts_##s, ARRAY_SIZE(hcounts_##s)-cycsz);\
i = ARRAY_SIZE(dmaslots##s); \ i = ARRAY_SIZE(dmaslots##s); \
while (ac < ARRAY_SIZE(vdpcyc2sl_##s##_ac)) \ while (ac < ARRAY_SIZE(vdpcyc2sl_##s##_ac)) \
vdpcyc2sl_##s##_ac[ac] = vdpcyc2sl_##s##_ac[ac-cycsz]+i, ac++; \ vdpcyc2sl_##s##_ac[ac] = vdpcyc2sl_##s##_ac[ac-cycsz]+i, ac++; \
while (ax < ARRAY_SIZE(vdpsl2cyc_##s##_ac)-1) ax++, \ while (ax < ARRAY_SIZE(vdpsl2cyc_##s##_ac)-1) ax++, \
vdpsl2cyc_##s##_ac[ax] = vdpsl2cyc_##s##_ac[ax-i]+cycsz;\ vdpsl2cyc_##s##_ac[ax] = vdpsl2cyc_##s##_ac[ax-i]+cycsz; \
i = slots##s - ARRAY_SIZE(refslots##s); \ i = slots##s - ARRAY_SIZE(refslots##s); \
while (bc < ARRAY_SIZE(vdpcyc2sl_##s##_bl)) \ while (bc < ARRAY_SIZE(vdpcyc2sl_##s##_bl)) \
vdpcyc2sl_##s##_bl[bc] = vdpcyc2sl_##s##_bl[bc-cycsz]+i, bc++; \ vdpcyc2sl_##s##_bl[bc] = vdpcyc2sl_##s##_bl[bc-cycsz]+i, bc++; \
@ -198,7 +211,8 @@ static __inline int AdvanceFIFOEntry(struct VdpFIFO *vf, struct PicoVideo *pv, i
if (l > cnt) if (l > cnt)
l = cnt; l = cnt;
if (!(vf->fifo_queue[vf->fifo_qx] & FQ_BGDMA)) if (!(vf->fifo_queue[vf->fifo_qx] & FQ_BGDMA))
if ((vf->fifo_total -= ((cnt & b) + l) >> b) < 0) vf->fifo_total = 0; vf->fifo_total -= ((cnt & b) + l) >> b;
if (vf->fifo_total < 0) vf->fifo_total = 0;
cnt -= l; cnt -= l;
// if entry has been processed... // if entry has been processed...
@ -371,7 +385,7 @@ int PicoVideoFIFOWrite(int count, int flags, unsigned sr_mask,unsigned sr_flags)
// update FIFO state if it was empty // update FIFO state if it was empty
if (!(pv->status & PVS_FIFORUN)) { if (!(pv->status & PVS_FIFORUN)) {
vf->fifo_slot = Cyc2Sl(vf, lc+5); // FIFO latency ~3 vdp slots vf->fifo_slot = Cyc2Sl(vf, lc+7); // FIFO latency ~3 vdp slots
pv->status |= PVS_FIFORUN; pv->status |= PVS_FIFORUN;
pv->fifo_cnt = count << (flags & FQ_BYTE); pv->fifo_cnt = count << (flags & FQ_BYTE);
} }
@ -829,8 +843,8 @@ PICO_INTERNAL_ASM void PicoVideoWrite(u32 a,unsigned short d)
case 0x00: // Data port 0 or 2 case 0x00: // Data port 0 or 2
// try avoiding the sync.. // try avoiding the sync..
if (Pico.m.scanline < (pvid->reg[1]&0x08 ? 240 : 224) && (pvid->reg[1]&0x40) && if (Pico.m.scanline < (pvid->reg[1]&0x08 ? 240 : 224) && (pvid->reg[1]&0x40) &&
!(!pvid->pending && !(!pvid->pending && ((pvid->command & 0xc00000f0) == 0x40000010 &&
((pvid->command & 0xc00000f0) == 0x40000010 && PicoMem.vsram[pvid->addr>>1] == (d & 0x7ff))) PicoMem.vsram[(pvid->addr>>1) & 0x3f] == (d & 0x7ff)))
) )
DrawSync(0); // XXX it's unclear when vscroll data is fetched from vsram? DrawSync(0); // XXX it's unclear when vscroll data is fetched from vsram?
@ -988,10 +1002,10 @@ update_irq:
static u32 VideoSr(const struct PicoVideo *pv) static u32 VideoSr(const struct PicoVideo *pv)
{ {
unsigned int hp = pv->reg[12]&1 ? 15*488/210+1 : 15*488/171+1; // HBLANK start unsigned int hp = pv->reg[12]&1 ? hboff40*488/slots40 : hboff32*488/slots32;
unsigned int hl = pv->reg[12]&1 ? 37*488/210+1 : 28*488/171+1; // HBLANK len unsigned int hl = pv->reg[12]&1 ? hblen40*488/slots40 : hblen32*488/slots32;
unsigned int c; unsigned int c;
u32 d = pv->status; u32 d = (u16)pv->status;
c = SekCyclesDone() - Pico.t.m68c_line_start; c = SekCyclesDone() - Pico.t.m68c_line_start;
if (c - hp < hl) if (c - hp < hl)
@ -1021,32 +1035,17 @@ PICO_INTERNAL_ASM u32 PicoVideoRead(u32 a)
return d; return d;
} }
// H-counter info (based on Generator):
// frame:
// | <- hblank? -> |
// start <416> hint <36> hdisplay <38> end // CPU cycles
// |---------...---------|------------|-------------|
// 0 B6 E4 FF // 40 cells
// 0 93 E8 FF // 32 cells
// Gens (?) v-render
// start <hblank=84> hint hdisplay <404> |
// |---------------------|--------------------------|
// E4 (hc[0x43]==0) 07 B1 // 40
// E8 (hc[0x45]==0) 05 91 // 32
// check: Sonic 3D Blast bonus, Cannon Fodder, Chase HQ II, 3 Ninjas kick back, Road Rash 3, Skitchin', Wheel of Fortune
if ((a&0x1c)==0x08) if ((a&0x1c)==0x08)
{ {
unsigned int c; unsigned int c;
u32 d; u32 d;
c = (SekCyclesDone() - Pico.t.m68c_line_start) & 0x1ff; // FIXME c = SekCyclesDone() - Pico.t.m68c_line_start;
if (Pico.video.reg[0]&2) if (Pico.video.reg[0]&2)
d = Pico.video.hv_latch; d = Pico.video.hv_latch;
else if (Pico.video.reg[12]&1) else if (Pico.video.reg[12]&1)
d = hcounts_40[c/2] | (Pico.video.v_counter << 8); d = hcounts_40[c/clkdiv] | (Pico.video.v_counter << 8);
else d = hcounts_32[c/2] | (Pico.video.v_counter << 8); else d = hcounts_32[c/clkdiv] | (Pico.video.v_counter << 8);
elprintf(EL_HVCNT, "hv: %02x %02x [%u] @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc); elprintf(EL_HVCNT, "hv: %02x %02x [%u] @ %06x", d, Pico.video.v_counter, SekCyclesDone(), SekPc);
return d; return d;
@ -1103,12 +1102,12 @@ unsigned char PicoVideoRead8HV_H(int is_from_z80)
// FIXME: broken // FIXME: broken
unsigned char PicoVideoRead8HV_L(int is_from_z80) unsigned char PicoVideoRead8HV_L(int is_from_z80)
{ {
u32 d = (SekCyclesDone() - Pico.t.m68c_line_start) & 0x1ff; // FIXME u32 d = SekCyclesDone() - Pico.t.m68c_line_start;
if (Pico.video.reg[0]&2) if (Pico.video.reg[0]&2)
d = Pico.video.hv_latch; d = Pico.video.hv_latch;
else if (Pico.video.reg[12]&1) else if (Pico.video.reg[12]&1)
d = hcounts_40[d/2]; d = hcounts_40[d/clkdiv];
else d = hcounts_32[d/2]; else d = hcounts_32[d/clkdiv];
elprintf(EL_HVCNT, "hcounter: %02x [%u] @ %06x", d, SekCyclesDone(), SekPc); elprintf(EL_HVCNT, "hcounter: %02x [%u] @ %06x", d, SekCyclesDone(), SekPc);
return d; return d;
} }