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

Fix coleco memory domains similarly to previous commit, also clean up previous commit

This commit is contained in:
adelikat 2016-08-22 13:14:47 -04:00
parent 4d03651526
commit ccc2ee1ba9
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,10 +15,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
var domains = new List<MemoryDomain>
{
//new MemoryDomainByteArray(
// "Main RAM",
// MemoryDomain.Endian.Little,
// Ram, true, 1),
new MemoryDomainDelegate(
"TIA",
16,
@ -39,13 +35,6 @@ 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.HasCartRam)
{
domains.Add(new MemoryDomainDelegate(
@ -59,8 +48,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
SyncAllByteArrayDomains();
MemoryDomains = new MemoryDomainList(_byteArrayDomains.Values.Concat(domains).ToList());
MemoryDomains.MainMemory = _byteArrayDomains["Main RAM"];
(ServiceProvider as BasicServiceProvider).Register<IMemoryDomains>(MemoryDomains);
_memoryDomainsInit = true;

42
BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BizHawk.Emulation.Common;
@ -8,13 +9,14 @@ namespace BizHawk.Emulation.Cores.ColecoVision
public partial class ColecoVision
{
private MemoryDomainList memoryDomains;
private readonly Dictionary<string, MemoryDomainByteArray> _byteArrayDomains = new Dictionary<string, MemoryDomainByteArray>();
private bool _memoryDomainsInit = false;
private void SetupMemoryDomains()
{
var domains = new List<MemoryDomain>(3);
var MainMemoryDomain = new MemoryDomainByteArray("Main RAM", MemoryDomain.Endian.Little, Ram, true, 1);
var VRamDomain = new MemoryDomainByteArray("Video RAM", MemoryDomain.Endian.Little, VDP.VRAM, true, 1);
var SystemBusDomain = new MemoryDomainDelegate("System Bus", 0x10000, MemoryDomain.Endian.Little,
var domains = new List<MemoryDomain>
{
new MemoryDomainDelegate("System Bus", 0x10000, MemoryDomain.Endian.Little,
(addr) =>
{
if (addr < 0 || addr >= 65536)
@ -32,13 +34,35 @@ namespace BizHawk.Emulation.Cores.ColecoVision
}
Cpu.WriteMemory((ushort)addr, value);
}, 1);
}, 1)
};
domains.Add(MainMemoryDomain);
domains.Add(VRamDomain);
domains.Add(SystemBusDomain);
memoryDomains = new MemoryDomainList(domains);
SyncAllByteArrayDomains();
memoryDomains = new MemoryDomainList(_byteArrayDomains.Values.Concat(domains).ToList());
(ServiceProvider as BasicServiceProvider).Register<IMemoryDomains>(memoryDomains);
_memoryDomainsInit = true;
}
private void SyncAllByteArrayDomains()
{
SyncByteArrayDomain("Main RAM", Ram);
SyncByteArrayDomain("Video RAM", VDP.VRAM);
}
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/Coleco/ColecoVision.IStatable.cs
View File

@ -64,6 +64,11 @@ namespace BizHawk.Emulation.Cores.ColecoVision
ser.Sync("LagCount", ref _lagCount);
ser.Sync("IsLag", ref _isLag);
ser.EndSection();
if (ser.IsReader)
{
SyncAllByteArrayDomains();
}
}
private byte[] _stateBuffer;