Debugger: Added option to select which CPU to debug (VS DualSystem) (hidden from menu because issues exist)

SourMesen · SourMesen · commit 7a62b2af80c6 · 2018-07-08T10:28:48.000-04:00
diff --git a/Core/Console.cpp b/Core/Console.cpp
@@ -49,10 +49,6 @@ Console::Console(shared_ptr<Console> master)
 {
 	_master = master;
 	_model = NesModel::NTSC;
-
-	if(_master) {
-		_master->_notificationManager->SendNotification(ConsoleNotificationType::VsDualSystemStarted);
-	}
 }
 
 Console::~Console()
@@ -73,6 +69,10 @@ void Console::Init()
 
 	_soundMixer.reset(new SoundMixer(shared_from_this()));
 	_soundMixer->SetNesModel(_model);
+
+	if(_master) {
+		_emulationThreadId = _master->_emulationThreadId;
+	}
 }
 
 void Console::Release(bool forShutdown)
@@ -385,6 +385,10 @@ bool Console::Initialize(VirtualFile &romFile, VirtualFile &patchFile)
 					MessageManager::DisplayMessage("ClockRate", std::to_string(EmulationSettings::GetOverclockRate()) + "%");
 				}
 				EmulationSettings::ClearFlags(EmulationFlags::ForceMaxSpeed);
+
+				if(_slave) {
+					_notificationManager->SendNotification(ConsoleNotificationType::VsDualSystemStarted);
+				}
 			}
 			Resume();
 			return true;
@@ -667,6 +671,9 @@ void Console::Run()
 	_stopLock.Acquire();
 
 	_emulationThreadId = std::this_thread::get_id();
+	if(_slave) {
+		_slave->_emulationThreadId = std::this_thread::get_id();
+	}
 
 	targetTime = GetFrameDelay();
 
diff --git a/Core/Console.h b/Core/Console.h
@@ -4,8 +4,6 @@
 #include <atomic>
 #include "../Utilities/SimpleLock.h"
 #include "VirtualFile.h"
-#include "RomData.h"
-#include "Debugger.h"
 
 class BaseMapper;
 class RewindManager;
@@ -26,8 +24,13 @@ class VideoRenderer;
 class DebugHud;
 class SoundMixer;
 class NotificationManager;
+class Debugger;
 
 struct HdPackData;
+struct HashInfo;
+struct MapperInfo;
+
+enum class MemoryOperationType;
 enum class NesModel;
 enum class ScaleFilterType;
 enum class ConsoleFeatures;
diff --git a/GUI.NET/Config/DebugInfo.cs b/GUI.NET/Config/DebugInfo.cs
@@ -119,6 +119,8 @@ public class DebugInfo
 		public DebugViewInfo LeftView;
 		public DebugViewInfo RightView;
 
+		public InteropEmu.ConsoleId DebugConsoleId = InteropEmu.ConsoleId.Master;
+
 		public string FontFamily = BaseControl.MonospaceFontFamily;
 		public FontStyle FontStyle = FontStyle.Regular;
 		public float FontSize = BaseControl.DefaultFontSize;
diff --git a/GUI.NET/Debugger/DebugWindowManager.cs b/GUI.NET/Debugger/DebugWindowManager.cs
@@ -77,6 +77,14 @@ public static frmMemoryViewer GetMemoryViewer()
 			return _openedWindows.ToList().Find((form) => form.GetType() == typeof(frmMemoryViewer)) as frmMemoryViewer;
 		}
 
+		public static bool HasOpenedWindow
+		{
+			get
+			{
+				return _openedWindows.Count > 0;
+			}
+		}
+
 		public static void CloseAll()
 		{
 			List<Form> openedWindows = new List<Form>(_openedWindows);
diff --git a/GUI.NET/Debugger/frmDebugger.cs b/GUI.NET/Debugger/frmDebugger.cs
@@ -158,7 +158,7 @@ protected override void OnLoad(EventArgs e)
 				"[MyLabel, 4]: Display 4 bytes starting from the address the specified label (MyLabel) refers to"
 			);
 
-			_notifListener = new InteropEmu.NotificationListener();
+			_notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);
 			_notifListener.OnNotification += _notifListener_OnNotification;
 
 			InteropEmu.DebugInitialize();
diff --git a/GUI.NET/Debugger/frmEventViewer.cs b/GUI.NET/Debugger/frmEventViewer.cs
@@ -50,7 +50,7 @@ protected override void OnLoad(EventArgs e)
 					this.Location = ConfigManager.Config.DebugInfo.EventViewerLocation;
 				}
 
-				this._notifListener = new InteropEmu.NotificationListener();
+				this._notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);
 				this._notifListener.OnNotification += this._notifListener_OnNotification;
 			}
 		}
diff --git a/GUI.NET/Debugger/frmMemoryViewer.cs b/GUI.NET/Debugger/frmMemoryViewer.cs
@@ -81,7 +81,7 @@ protected override void OnLoad(EventArgs e)
 			UpdateImportButton();
 			InitMemoryTypeDropdown(true);
 
-			_notifListener = new InteropEmu.NotificationListener();
+			_notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);
 			_notifListener.OnNotification += _notifListener_OnNotification;
 
 			this.mnuShowCharacters.CheckedChanged += this.mnuShowCharacters_CheckedChanged;
diff --git a/GUI.NET/Debugger/frmPpuViewer.cs b/GUI.NET/Debugger/frmPpuViewer.cs
@@ -56,7 +56,7 @@ protected override void OnLoad(EventArgs e)
  			base.OnLoad(e);
 
 			if(!this.DesignMode) {
-				this._notifListener = new InteropEmu.NotificationListener();
+				this._notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);
 				this._notifListener.OnNotification += this._notifListener_OnNotification;
 
 				this.ctrlScanlineCycle.Initialize(_ppuViewerId, ConfigManager.Config.DebugInfo.PpuDisplayScanline, ConfigManager.Config.DebugInfo.PpuDisplayCycle);
diff --git a/GUI.NET/Debugger/frmScript.cs b/GUI.NET/Debugger/frmScript.cs
@@ -120,7 +120,7 @@ public frmScript(bool forceBlank = false)
 		protected override void OnLoad(EventArgs e)
 		{
 			base.OnLoad(e);
-			this._notifListener = new InteropEmu.NotificationListener();
+			this._notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);
 			this._notifListener.OnNotification += this._notifListener_OnNotification;
 
 			this.InitShortcuts();
diff --git a/GUI.NET/Debugger/frmTextHooker.cs b/GUI.NET/Debugger/frmTextHooker.cs
@@ -77,7 +77,7 @@ protected override void OnLoad(EventArgs e)
 				this.ctrlTextHooker.SetCharacterMappings(_charMappings);
 				this.ctrlCharacterMappings.SetCharacterMappings(_charMappings);
 
-				this._notifListener = new InteropEmu.NotificationListener();
+				this._notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);
 				this._notifListener.OnNotification += this._notifListener_OnNotification;
 
 				this.ctrlTextHooker.GetData();
diff --git a/GUI.NET/Forms/frmMain.Designer.cs b/GUI.NET/Forms/frmMain.Designer.cs
diff --git a/GUI.NET/Forms/frmMain.Tools.cs b/GUI.NET/Forms/frmMain.Tools.cs
@@ -346,5 +346,28 @@ private void mnuTextHooker_Click(object sender, EventArgs e)
 		{
 			DebugWindowManager.OpenDebugWindow(DebugWindow.TextHooker);
 		}
+
+		private void mnuDebugDualSystemSecondaryCpu_Click(object sender, EventArgs e)
+		{
+			bool switchCpu = false;
+
+			if(!DebugWindowManager.HasOpenedWindow) {
+				switchCpu = true;
+			} else {
+				if(MessageBox.Show("Warning: Changing this setting will close all currently opened debug tools!", "Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK) {
+					DebugWindowManager.CloseAll();
+					if(!DebugWindowManager.HasOpenedWindow) {
+						switchCpu = true;
+					}
+				}
+			}
+
+			if(switchCpu) {
+				mnuDebugDualSystemSecondaryCpu.Checked = !mnuDebugDualSystemSecondaryCpu.Checked;
+				ConfigManager.Config.DebugInfo.DebugConsoleId = mnuDebugDualSystemSecondaryCpu.Checked ? InteropEmu.ConsoleId.Slave : InteropEmu.ConsoleId.Master;
+				ConfigManager.ApplyChanges();
+				InteropEmu.DebugSetDebuggerConsole(ConfigManager.Config.DebugInfo.DebugConsoleId == InteropEmu.ConsoleId.Slave ? 1 : 0);
+			}
+		}
 	}
 }
diff --git a/GUI.NET/Forms/frmMain.cs b/GUI.NET/Forms/frmMain.cs
@@ -153,7 +153,7 @@ protected override void OnLoad(EventArgs e)
 #endif
 			InitializeCore();
 
-			_notifListener = new InteropEmu.NotificationListener();
+			_notifListener = new InteropEmu.NotificationListener(InteropEmu.ConsoleId.Master);
 			_notifListener.OnNotification += _notifListener_OnNotification;
 
 			menuTimer.Start();
@@ -204,6 +204,9 @@ protected override void OnLoad(EventArgs e)
 			if(ConfigManager.Config.PreferenceInfo.DisableMouseResize) {
 				this.FormBorderStyle = FormBorderStyle.Fixed3D;
 			}
+
+			mnuDebugDualSystemSecondaryCpu.Checked = ConfigManager.Config.DebugInfo.DebugConsoleId == InteropEmu.ConsoleId.Slave;
+			InteropEmu.DebugSetDebuggerConsole(ConfigManager.Config.DebugInfo.DebugConsoleId == InteropEmu.ConsoleId.Slave ? 1 : 0);
 		}
 
 		private void ProcessFullscreenSwitch(List<string> switches)
@@ -1114,6 +1117,15 @@ private void UpdateMenus()
 					mnuTextHooker.Enabled = running;
 					mnuTraceLogger.Enabled = running;
 
+#if !HIDETESTMENU
+					//Keep this option hidden for now, until some remaining issues are fixed.
+					mnuDebugDualSystemSecondaryCpu.Visible = _isDualSystem;
+					sepDebugDualSystemSecondaryCpu.Visible = _isDualSystem;
+#else
+					mnuDebugDualSystemSecondaryCpu.Visible = false;
+					sepDebugDualSystemSecondaryCpu.Visible = false;
+#endif
+
 					mnuInstallHdPack.Enabled = running;
 					mnuHdPackEditor.Enabled = !netPlay && running;
 
diff --git a/GUI.NET/InteropEmu.cs b/GUI.NET/InteropEmu.cs
diff --git a/InteropDLL/ConsoleWrapper.cpp b/InteropDLL/ConsoleWrapper.cpp
diff --git a/InteropDLL/DebugWrapper.cpp b/InteropDLL/DebugWrapper.cpp
diff --git a/TestHelper/TestHelper.cpp b/TestHelper/TestHelper.cpp

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,14 @@ public static frmMemoryViewer GetMemoryViewer()`
`77`	`77`	`return _openedWindows.ToList().Find((form) => form.GetType() == typeof(frmMemoryViewer)) as frmMemoryViewer;`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ public static bool HasOpenedWindow`
	`81`	`+ {`
	`82`	`+ get`
	`83`	`+ {`
	`84`	`+ return _openedWindows.Count > 0;`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+`
`80`	`88`	`public static void CloseAll()`
`81`	`89`	`{`
`82`	`90`	`List<Form> openedWindows = new List<Form>(_openedWindows);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ protected override void OnLoad(EventArgs e)`
`50`	`50`	`this.Location = ConfigManager.Config.DebugInfo.EventViewerLocation;`
`51`	`51`	`}`
`52`	`52`
`53`		`- this._notifListener = new InteropEmu.NotificationListener();`
	`53`	`+ this._notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);`
`54`	`54`	`this._notifListener.OnNotification += this._notifListener_OnNotification;`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public frmScript(bool forceBlank = false)`
`120`	`120`	`protected override void OnLoad(EventArgs e)`
`121`	`121`	`{`
`122`	`122`	`base.OnLoad(e);`
`123`		`- this._notifListener = new InteropEmu.NotificationListener();`
	`123`	`+ this._notifListener = new InteropEmu.NotificationListener(ConfigManager.Config.DebugInfo.DebugConsoleId);`
`124`	`124`	`this._notifListener.OnNotification += this._notifListener_OnNotification;`
`125`	`125`
`126`	`126`	`this.InitShortcuts();`