- Feature mosa#828

tgiphil · Jan 4, 2021 · cd71d50 · cd71d50
1 parent ea66054
commit cd71d50
Show file tree

Hide file tree

Showing 73 changed files with 1,102 additions and 818 deletions.
diff --git a/Source/Mosa.Tool.Debugger/DebugDockContent.cs b/Source/Mosa.Tool.Debugger/DebugDockContent.cs
@@ -98,5 +98,10 @@ protected virtual void UpdateDisplay()
 		protected virtual void ClearDisplay()
 		{
 		}
+
+		public static string ToHex(ulong address)
+		{
+			return $"0x{address.ToString((address <= uint.MaxValue) ? "X4" : "X8")}"; ;
+		}
 	}
 }
diff --git a/Source/Mosa.Tool.Debugger/MainForm.cs b/Source/Mosa.Tool.Debugger/MainForm.cs
@@ -806,8 +806,33 @@ public static string CalculateFileHash(string filename)
 			}
 		}
 
-		private void toolStripButton3_Click(object sender, EventArgs e)
+		public void SetFocus(ulong instructionPointer, ulong stackFrame, ulong stackPointer)
 		{
+			sourceView.InstructionPointer = instructionPointer;
+			sourceView.StackFrame = stackFrame;
+			sourceView.StackPointer = stackPointer;
+
+			methodView.InstructionPointer = instructionPointer;
+			methodView.StackFrame = stackFrame;
+			methodView.StackPointer = stackPointer;
+
+			instructionView.InstructionPointer = instructionPointer;
+			instructionView.StackFrame = stackFrame;
+			instructionView.StackPointer = stackPointer;
+
+			methodParametersView.InstructionPointer = instructionPointer;
+			methodParametersView.StackFrame = stackFrame;
+			methodParametersView.StackPointer = stackPointer;
+
+			stackFrameView.InstructionPointer = instructionPointer;
+			stackFrameView.StackFrame = stackFrame;
+			stackFrameView.StackPointer = stackPointer;
+
+			methodView.OnPause();
+			instructionView.OnPause();
+			sourceView.OnPause();
+			methodParametersView.OnPause();
+			stackFrameView.OnPause();
 		}
 	}
 }
diff --git a/Source/Mosa.Tool.Debugger/Mosa.Tool.Debugger.csproj b/Source/Mosa.Tool.Debugger/Mosa.Tool.Debugger.csproj
@@ -139,12 +139,6 @@
     <EmbeddedResource Update="Views\BreakpointView.resx">
       <DependentUpon>BreakpointView.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Update="Views\CallStackView.resx">
-      <DependentUpon>CallStackView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Views\ControlView.resx">
-      <DependentUpon>ControlView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Update="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/Source/Mosa.Tool.Debugger/Properties/Resources.Designer.cs b/Source/Mosa.Tool.Debugger/Properties/Resources.Designer.cs