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

Atari 2600 - make MapperBase abstract and make HardReset() abstract since we need implementations to properly reset variables (we can't get rid of hard reset so easily, since HardReset is the mechanism that multi-cart roms use

This commit is contained in:
adelikat 2020-03-18 15:58:53 -05:00
parent db6bbe22bb
commit f10b51558b
31 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/MapperBase.cs
View File

@ -2,9 +2,9 @@
namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
public class MapperBase
public abstract class MapperBase
{
public MapperBase(Atari2600 core)
protected MapperBase(Atari2600 core)
{
Core = core;
}
@ -33,11 +33,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
}
public virtual void HardReset()
{
}
public abstract void HardReset();
// This is here purely for mapper 3E because it needs the 13th bit to determine bankswitching (but only receives the first 12 on read memory)
public bool Bit13 { get; set; }
public bool Bit13 { protected get; set; }
}
}

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m0840.cs
View File

@ -38,7 +38,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_bank4K = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m2K.cs
View File

@ -6,6 +6,8 @@
{
}
public override void HardReset() { }
public override byte ReadMemory(ushort addr)
{
if (addr < 0x1000)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3E.cs
View File

@ -48,7 +48,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_ramBank1K = 0;
_hasRam = false;
_ram = new byte[256 * 1024];
base.HardReset();
}
public override byte ReadMemory(ushort addr)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m3F.cs
View File

@ -37,7 +37,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_lowBank2K = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr)

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs
View File

@ -126,8 +126,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_sliceHigh = 0;
_sliceLow = 0;
_sliceMiddle = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4K.cs
View File

@ -6,6 +6,8 @@
{
}
public override void HardReset() { }
public override byte ReadMemory(ushort addr)
{
if (addr < 0x1000)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs
View File

@ -155,7 +155,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_elapsedCycles = 0;
InitializeSettings();
base.HardReset();
}
public override void SyncState(Serializer ser)

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCM.cs
View File

@ -203,8 +203,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_column = 0;
_funcKey = false;
_shiftKey = false;
base.HardReset();
}
public override void SyncState(Serializer ser)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mCV.cs
View File

@ -34,7 +34,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_ram = new byte[1024];
base.HardReset();
}
public override byte ReadMemory(ushort addr)

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPC.cs
View File

@ -276,8 +276,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_currentRandomVal = 0;
_elapsedCycles = 85;
_fractionalClocks = 0;
base.HardReset();
}
public override void ClockCpu()

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mDPCPlus.cs
View File

@ -65,8 +65,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_currentRandomVal = 0;
_elapsedCycles = 85;
_fractionalClocks = 0;
base.HardReset();
}
public override void ClockCpu()

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE0.cs
View File

@ -45,7 +45,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_toggle1 = 0;
_toggle2 = 0;
_toggle3 = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mE7.cs
View File

@ -54,7 +54,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_ramBank1Toggle = 0;
_ram = new byte[2048];
_enableRam0 = false;
base.HardReset();
}
public override byte[] CartRam => _ram;

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEF.cs
View File

@ -28,7 +28,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_toggle = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mEFSC.cs
View File

@ -29,7 +29,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
_bank4K = 0;
_ram = new byte[128];
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF0.cs
View File

@ -34,7 +34,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_bank = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4.cs
View File

@ -26,7 +26,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_toggle = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF4SC.cs
View File

@ -28,7 +28,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
_bank4K = 0;
_ram = new byte[128];
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6.cs
View File

@ -28,7 +28,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_toggle = 0;
base.HardReset();
}
private byte ReadMem(ushort addr, bool peek)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF6SC.cs
View File

@ -28,7 +28,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
_bank4K = 0;
_ram = new byte[128];
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8.cs
View File

@ -36,7 +36,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_bank4K = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8SC.cs
View File

@ -21,7 +21,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
_bank4K = 0;
_ram = new byte[128];
base.HardReset();
}
public override void SyncState(Serializer ser)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mF8_sega.cs
View File

@ -25,7 +25,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_bank4K = 1;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA.cs
View File

@ -35,7 +35,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
_toggle = 0;
_ram = new byte[256];
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFA2.cs
View File

@ -30,7 +30,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
_bank4K = 0;
_ram = new byte[256];
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mFE.cs
View File

@ -60,6 +60,8 @@
{
}
public override void HardReset() { }
public override byte ReadMemory(ushort addr)
{
if (addr < 0x1000)

2
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mMC.cs
View File

@ -64,5 +64,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
throw new NotImplementedException();
}
public override void HardReset() { }
}
}

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mSB.cs
View File

@ -25,7 +25,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_bank4K = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr)

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mUA.cs
View File

@ -28,7 +28,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_toggle = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);

1
BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mX07.cs
View File

@ -50,7 +50,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public override void HardReset()
{
_romBank2K = 0;
base.HardReset();
}
public override byte ReadMemory(ushort addr) => ReadMem(addr, false);