ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Z80 Interrupts - remove unnecessary public property

This commit is contained in:
adelikat 2020-04-29 17:21:26 -05:00
parent bee7f4f059
commit 96a85d4442
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
View File

@ -22,15 +22,10 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
public bool NonMaskableInterrupt public bool NonMaskableInterrupt
{ {
get => nonMaskableInterrupt; get => nonMaskableInterrupt;
set { if (value && !nonMaskableInterrupt) NonMaskableInterruptPending = true; nonMaskableInterrupt = value; } set { if (value && !nonMaskableInterrupt) nonMaskableInterruptPending = true; nonMaskableInterrupt = value; }
} }
private bool nonMaskableInterruptPending; private bool nonMaskableInterruptPending;
public bool NonMaskableInterruptPending
{
get => nonMaskableInterruptPending;
set => nonMaskableInterruptPending = value;
}
private int interruptMode; private int interruptMode;
public int InterruptMode public int InterruptMode
@ -144,7 +139,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
IFF1 = false; IFF1 = false;
IFF2 = false; IFF2 = false;
NonMaskableInterrupt = false; NonMaskableInterrupt = false;
NonMaskableInterruptPending = false; nonMaskableInterruptPending = false;
FlagI = false; FlagI = false;
InterruptMode = 1; InterruptMode = 1;
} }

4
BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
View File

@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision
VdpAddress &= 0x3FFF; VdpAddress &= 0x3FFF;
} }
void WriteRegister(int reg, byte data) private void WriteRegister(int reg, byte data)
{ {
if (reg >= 8) return; if (reg >= 8) return;
@ -106,7 +106,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision
case 5: // Sprite Attribute Table Base Address case 5: // Sprite Attribute Table Base Address
TmsSpriteAttributeBase = (Registers[5] << 7) & 0x3F80; TmsSpriteAttributeBase = (Registers[5] << 7) & 0x3F80;
break; break;
case 6: // Sprite Pattern Generator Base Adderss case 6: // Sprite Pattern Generator Base Address
SpritePatternGeneratorBase = (Registers[6] << 11) & 0x3800; SpritePatternGeneratorBase = (Registers[6] << 11) & 0x3800;
break; break;
} }

1
BizHawk.sln.DotSettings
View File

@ -396,6 +396,7 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mainform/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Mainform/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mainmemory/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=mainmemory/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mame/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=mame/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Maskable/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Matroska/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Matroska/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Medna/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=Medna/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mednadisc/@EntryIndexedValue">True</s:Boolean> <s:Boolean x:Key="/Default/UserDictionary/Words/=mednadisc/@EntryIndexedValue">True</s:Boolean>