From f4d3b7046987519ae02f03f4bf9f8fc8f011d126 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 28 Sep 2014 16:39:53 +0000 Subject: [PATCH] Ram Watch - fix issue with stale memory domains when rebooting a core, some cores were unaffected, cores like atari 2600 were affected by this bug --- BizHawk.Client.Common/tools/Watch.cs | 4 ++-- BizHawk.Client.Common/tools/WatchList.cs | 23 ++++++++++++++----- .../tools/Watch/RamWatch.cs | 16 ++++++++----- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/BizHawk.Client.Common/tools/Watch.cs b/BizHawk.Client.Common/tools/Watch.cs index 2fdc45d000..d60feb9487 100644 --- a/BizHawk.Client.Common/tools/Watch.cs +++ b/BizHawk.Client.Common/tools/Watch.cs @@ -64,9 +64,9 @@ namespace BizHawk.Client.Common public virtual DisplayType Type { get { return _type; } set { _type = value; } } public virtual bool BigEndian { get { return _bigEndian; } set { _bigEndian = value; } } - public MemoryDomain Domain { get { return _domain; } } + public MemoryDomain Domain { get { return _domain; } set { _domain = value; } } - public string DomainName { get { return _domain != null ? _domain.Name : String.Empty; } } + public string DomainName { get { return _domain != null ? _domain.Name : string.Empty; } } public virtual int? Address { get { return _address; } } diff --git a/BizHawk.Client.Common/tools/WatchList.cs b/BizHawk.Client.Common/tools/WatchList.cs index 8a56f850cd..f9ecd3069b 100644 --- a/BizHawk.Client.Common/tools/WatchList.cs +++ b/BizHawk.Client.Common/tools/WatchList.cs @@ -12,7 +12,7 @@ namespace BizHawk.Client.Common { public class WatchList : IList { - private readonly IMemoryDomains Core; + private IMemoryDomains _core; private List _watchList = new List(); private MemoryDomain _domain; private string _currentFilename = string.Empty; @@ -27,9 +27,20 @@ namespace BizHawk.Client.Common public WatchList(IMemoryDomains core, MemoryDomain domain) { - Core = core; + _core = core; _domain = domain; } + + public void RefreshDomans(IMemoryDomains core, MemoryDomain domain) + { + _core = core; + _domain = domain; + + _watchList.ForEach(w => + { + w.Domain = _core.MemoryDomains[w.Domain.Name]; + }); + } public enum WatchPrevDef { LastSearch, Original, LastFrame, LastChange } @@ -473,7 +484,7 @@ namespace BizHawk.Client.Common // Temporary, rename if kept int addr; - var memDomain = Core.MemoryDomains.MainMemory; + var memDomain = _core.MemoryDomains.MainMemory; var temp = line.Substring(0, line.IndexOf('\t')); try @@ -511,7 +522,7 @@ namespace BizHawk.Client.Common startIndex = line.IndexOf('\t') + 1; line = line.Substring(startIndex, line.Length - startIndex); // Domain temp = line.Substring(0, line.IndexOf('\t')); - memDomain = Core.MemoryDomains[temp] ?? Core.MemoryDomains.MainMemory; + memDomain = _core.MemoryDomains[temp] ?? _core.MemoryDomains.MainMemory; } startIndex = line.IndexOf('\t') + 1; @@ -525,10 +536,10 @@ namespace BizHawk.Client.Common type, notes, bigEndian)); - _domain = Core.MemoryDomains[domain]; + _domain = _core.MemoryDomains[domain]; } - Domain = Core.MemoryDomains[domain] ?? Core.MemoryDomains.MainMemory; + Domain = _core.MemoryDomains[domain] ?? _core.MemoryDomains.MainMemory; _currentFilename = path; } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 17d48ae6a1..c651d0709e 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -29,8 +29,8 @@ namespace BizHawk.Client.EmuHawk { WatchList.NOTES, 128 }, }; - private readonly WatchList _watches; - private readonly IMemoryDomains Core; + private WatchList _watches; + private IMemoryDomains _core; private int _defaultWidth; @@ -41,8 +41,8 @@ namespace BizHawk.Client.EmuHawk public RamWatch() { - Core = (IMemoryDomains)Global.Emulator; // Cast is intentional, better to get a cast exception than a null reference exception later - _watches = new WatchList(Core, Core.MemoryDomains.MainMemory); + _core = (IMemoryDomains)Global.Emulator; // Cast is intentional, better to get a cast exception than a null reference exception later + _watches = new WatchList(_core, _core.MemoryDomains.MainMemory); InitializeComponent(); WatchListView.QueryItemText += WatchListView_QueryItemText; WatchListView.QueryItemBkColor += WatchListView_QueryItemBkColor; @@ -200,13 +200,17 @@ namespace BizHawk.Client.EmuHawk Close(); } + _core = (IMemoryDomains)Global.Emulator; // Cast is intentional, better to get a cast exception than a null reference exception later + if (!string.IsNullOrWhiteSpace(_watches.CurrentFileName)) { _watches.Reload(); UpdateStatusBar(); + _watches.RefreshDomans(_core, _core.MemoryDomains.MainMemory); } else { + _watches = new WatchList(_core, _core.MemoryDomains.MainMemory); NewWatchList(true); } } @@ -568,7 +572,7 @@ namespace BizHawk.Client.EmuHawk private void SetMemoryDomain(string name) { - _watches.Domain = Core.MemoryDomains[name]; + _watches.Domain = _core.MemoryDomains[name]; SetPlatformAndMemoryDomainLabel(); Update(); } @@ -749,7 +753,7 @@ namespace BizHawk.Client.EmuHawk { MemoryDomainsSubMenu.DropDownItems.Clear(); MemoryDomainsSubMenu.DropDownItems.AddRange( - Core.MemoryDomains.MenuItems(SetMemoryDomain, _watches.Domain.Name) + _core.MemoryDomains.MenuItems(SetMemoryDomain, _watches.Domain.Name) .ToArray()); }