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

Fix A2600 memory domains similarly to the PCE fix in 4b165089fd

This commit is contained in:
adelikat 2016-08-22 12:55:53 -04:00
parent 54bd6b90fe
commit 4d03651526
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IMemoryDomains.cs
View File

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Atari.Atari2600
@ -6,15 +8,17 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public partial class Atari2600
{
internal IMemoryDomains MemoryDomains;
private readonly Dictionary<string, MemoryDomainByteArray> _byteArrayDomains = new Dictionary<string, MemoryDomainByteArray>();
private bool _memoryDomainsInit = false;
private void SetupMemoryDomains()
{
var domains = new List<MemoryDomain>
{
new MemoryDomainByteArray(
"Main RAM",
MemoryDomain.Endian.Little,
Ram, true, 1),
//new MemoryDomainByteArray(
// "Main RAM",
// MemoryDomain.Endian.Little,
// Ram, true, 1),
new MemoryDomainDelegate(
"TIA",
16,
@ -35,12 +39,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
(addr, value) => _mapper.PokeMemory((ushort) addr, value), 1)
};
if (_mapper is mDPC) // TODO: also mDPCPlus
{
domains.Add(new MemoryDomainByteArray(
"DPC",
MemoryDomain.Endian.Little,(_mapper as mDPC).DspData, true, 1));
}
//if (_mapper is mDPC) // TODO: also mDPCPlus
//{
// domains.Add(new MemoryDomainByteArray(
// "DPC",
// MemoryDomain.Endian.Little,(_mapper as mDPC).DspData, true, 1));
//}
if (_mapper.HasCartRam)
{
@ -52,8 +56,38 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
(addr, value) => _mapper.CartRam[(int)addr] = value, 1));
}
MemoryDomains = new MemoryDomainList(domains);
SyncAllByteArrayDomains();
MemoryDomains = new MemoryDomainList(_byteArrayDomains.Values.Concat(domains).ToList());
MemoryDomains.MainMemory = _byteArrayDomains["Main RAM"];
(ServiceProvider as BasicServiceProvider).Register<IMemoryDomains>(MemoryDomains);
_memoryDomainsInit = true;
}
private void SyncAllByteArrayDomains()
{
SyncByteArrayDomain("Main RAM", Ram);
if (_mapper is mDPC)
{
SyncByteArrayDomain("DPC", (_mapper as mDPC).DspData);
}
}
private void SyncByteArrayDomain(string name, byte[] data)
{
if (_memoryDomainsInit)
{
var m = _byteArrayDomains[name];
m.Data = data;
}
else
{
var m = new MemoryDomainByteArray(name, MemoryDomain.Endian.Little, data, true, 1);
_byteArrayDomains.Add(name, m);
}
}
}
}

5
BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.IStatable.cs
View File

@ -56,6 +56,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_mapper.SyncState(ser);
ser.EndSection();
ser.EndSection();
if (ser.IsReader)
{
SyncAllByteArrayDomains();
}
}
}
}