C64: BA and raster IRQ cleanup

This commit is contained in:
SaxxonPike 2019-07-09 22:41:12 -05:00
parent 3a135c7c26
commit 0a7dc52aa0
2 changed files with 4 additions and 7 deletions

View File

@ -336,10 +336,10 @@
}
// perform BA flag manipulation
_ba = true;
switch (_parseBa)
{
case BaTypeNone:
_ba = true;
break;
case BaTypeCharacter:
_ba = !_badline;
@ -348,10 +348,9 @@
_parseCycleBaSprite0 = _parseBa & BaTypeMaskSprite0;
_parseCycleBaSprite1 = (_parseBa & BaTypeMaskSprite1) >> 4;
_parseCycleBaSprite2 = (_parseBa & BaTypeMaskSprite2) >> 8;
if ((_parseCycleBaSprite0 < 8 && _sprites[_parseCycleBaSprite0].Dma) ||
_ba = !((_parseCycleBaSprite0 < 8 && _sprites[_parseCycleBaSprite0].Dma) ||
(_parseCycleBaSprite1 < 8 && _sprites[_parseCycleBaSprite1].Dma) ||
(_parseCycleBaSprite2 < 8 && _sprites[_parseCycleBaSprite2].Dma))
_ba = false;
(_parseCycleBaSprite2 < 8 && _sprites[_parseCycleBaSprite2].Dma));
break;
}

View File

@ -254,12 +254,10 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
// start of rasterline
if ((_cycle == RasterIrqLineXCycle && _rasterLine > 0) || (_cycle == RasterIrqLine0Cycle && _rasterLine == 0))
{
//_rasterInterruptTriggered = false;
if (_rasterLine == LastDmaLine)
_badlineEnable = false;
// IRQ compares are done here
// raster compares are done here
if (_rasterLine == _rasterInterruptLine)
{
_intRaster = true;