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

Atari 2600 - implement mapper F8SC. Fix a potential crash in mappers AR and FA

This commit is contained in:
adelikat 2014-04-04 21:16:43 +00:00
parent af0cd39742
commit d79067c33c
4 changed files with 75 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
View File

@ -170,6 +170,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
case "F8":
mapper = new mF8();
break;
case "F8SC":
mapper = new mF8SC();
break;
case "F6":
mapper = new mF6();
break;

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

@ -50,7 +50,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
base.SyncState(ser);
ser.Sync("bank4k", ref _bank4k);
ser.Sync("ram", ref _ram);
ser.Sync("auxRam", ref _ram);
}
private void Address(ushort addr)

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

@ -1,4 +1,4 @@
using System;
using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
@ -8,9 +8,76 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
*/
internal class mF8SC : MapperBase
{
public mF8SC()
private int _bank_4K;
private ByteBuffer _ram = new ByteBuffer(128);
private byte ReadMem(ushort addr, bool peek)
{
throw new NotImplementedException();
if (!peek)
{
Address(addr);
}
if (addr < 0x1000)
{
return base.ReadMemory(addr);
}
//if (addr < 0x1080)
//{
// _ram[(addr & 0x7F)] = 0xFF; // Reading from the write port triggers an unwanted write of open bus
// return 0xFF; // 0xFF is used for deterministic emulation, in reality it would be a random value based on pins being high or low
//}
//else
if (addr < 0x1100)
{
return _ram[(addr & 0x7F)];
}
return core.rom[(_bank_4K << 12) + (addr & 0xFFF)];
}
public override byte ReadMemory(ushort addr)
{
return ReadMem(addr, false);
}
public override byte PeekMemory(ushort addr)
{
return ReadMem(addr, true);
}
public override void WriteMemory(ushort addr, byte value)
{
Address(addr);
if (addr < 0x1000)
{
base.WriteMemory(addr, value);
}
else if ((addr & 0x0FFF) < 0x80)
{
_ram[addr & 0x7F] = value;
}
}
public override void SyncState(Serializer ser)
{
base.SyncState(ser);
ser.Sync("bank_4k", ref _bank_4K);
ser.Sync("auxRam", ref _ram);
}
private void Address(ushort addr)
{
if (addr == 0x1FF8)
{
_bank_4K = 0;
}
else if (addr == 0x1FF9)
{
_bank_4K = 1;
}
}
}
}

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

@ -71,7 +71,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
base.SyncState(ser);
ser.Sync("toggle", ref _toggle);
ser.Sync("ram", ref _auxRam);
ser.Sync("auxRam", ref _auxRam);
}
private void Address(ushort addr)