6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

atari8: added VDELAY, fixed p-p collisions

This commit is contained in:
Steven Hugg 2022-09-03 10:24:49 -05:00
parent afe73e23e3
commit 56e8fca270
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/machine/atari8.ts
View File

@ -190,7 +190,8 @@ export class Atari800 extends BasicScanlineMachine {
// update ANTIC // update ANTIC
if (this.antic.clockPulse()) { if (this.antic.clockPulse()) {
// ANTIC DMA cycle, update GTIA // ANTIC DMA cycle, update GTIA
this.gtia.updateGfx(this.antic.h - 1, this.lastdmabyte); // HALT pin if (this.antic.h < 8)
this.gtia.updateGfx(this.antic.h - 1, this.antic.v, this.lastdmabyte); // HALT pin
this.probe.logClocks(1); this.probe.logClocks(1);
} else { } else {
super.advanceCPU(); super.advanceCPU();

27
src/machine/chips/gtia.ts
View File

@ -74,6 +74,7 @@ export class GTIA {
gtiacol = 0; gtiacol = 0;
gtiacol2 = 0; gtiacol2 = 0;
hbias = HOFFSET; hbias = HOFFSET;
pmDebugMask = -1;
reset() { reset() {
this.regs.fill(0); this.regs.fill(0);
@ -113,13 +114,19 @@ export class GTIA {
setBias(b: number) { setBias(b: number) {
this.hbias = HOFFSET + b; this.hbias = HOFFSET + b;
} }
updateGfx(h: number, data: number) { updateGfx(h: number, v: number, data: number) {
switch (h) { switch (h) {
case 0: case 0:
if (this.regs[GRACTL] & 1) { this.regs[GRAFM] = data; } if (this.regs[GRACTL] & 1) {
// TODO: VDELAY
this.regs[GRAFM] = data;
}
break; break;
case 2: case 3: case 4: case 5: case 2: case 3: case 4: case 5:
if (this.regs[GRACTL] & 2) { this.regs[GRAFP0 - 2 + h] = data; } if (this.regs[GRACTL] & 2) {
if (!(v&1) || !(this.regs[VDELAY] & (1<<(h+2))))
this.regs[GRAFP0 - 2 + h] = data;
}
break; break;
} }
} }
@ -172,7 +179,6 @@ export class GTIA {
let pfset = this.an - 4; // TODO? let pfset = this.an - 4; // TODO?
let topobj = -1; let topobj = -1;
let ppmask = 0; let ppmask = 0;
let ppcount = 0;
// players // players
for (let i = 0; i < 4; i++) { for (let i = 0; i < 4; i++) {
let bit = this.shiftObject(i); let bit = this.shiftObject(i);
@ -181,7 +187,6 @@ export class GTIA {
this.readregs[P0PF + i] |= 1 << pfset; this.readregs[P0PF + i] |= 1 << pfset;
} }
ppmask |= 1 << i; ppmask |= 1 << i;
ppcount++;
let prio = PRIOR_TABLE[i + priobias]; let prio = PRIOR_TABLE[i + priobias];
if (prio < topprio) { if (prio < topprio) {
topobj = i; topobj = i;
@ -205,12 +210,11 @@ export class GTIA {
} }
} }
// set player-player collision flags // set player-player collision flags
if (ppcount > 1) { // TODO: either as a player or a GTIA mode 2 color
this.readregs[P0PL + 0] |= ppmask & ~1; if (ppmask & 1) this.readregs[P0PL + 0] |= ppmask & ~1;
this.readregs[P0PL + 1] |= ppmask & ~2; if (ppmask & 2) this.readregs[P0PL + 1] |= ppmask & ~2;
this.readregs[P0PL + 2] |= ppmask & ~4; if (ppmask & 4) this.readregs[P0PL + 2] |= ppmask & ~4;
this.readregs[P0PL + 3] |= ppmask & ~8; if (ppmask & 8) this.readregs[P0PL + 3] |= ppmask & ~8;
}
this.pmcol = topobj >= 0 ? this.getObjectColor(topobj) : -1; this.pmcol = topobj >= 0 ? this.getObjectColor(topobj) : -1;
} }
shiftObject(i: number) { shiftObject(i: number) {
@ -230,6 +234,7 @@ export class GTIA {
} }
triggerObject(i: number) { triggerObject(i: number) {
let size, data; let size, data;
if (!(this.pmDebugMask & (1<<i))) return;
if (i < 4) { if (i < 4) {
size = this.regs[SIZEP0 + i] & 3; size = this.regs[SIZEP0 + i] & 3;
data = this.regs[GRAFP0 + i]; data = this.regs[GRAFP0 + i];