mirror of
https://github.com/libretro/Mesen.git
synced 2025-01-08 09:52:02 +00:00
Debugger: Changed "Refresh watch while running" to "Refresh UI while running" (and refresh console status/memory mapping every 30 frames)
This commit is contained in:
Sour
parent
e2b9a7aa8e
commit
c85a09038d
@ -277,7 +277,7 @@ namespace Mesen.GUI.Config
|
||||
public bool AutoLoadCdlFiles = false;
|
||||
public bool DisableDefaultLabels = false;
|
||||
|
||||
public bool RefreshWatchWhileRunning = false;
|
||||
public bool RefreshWhileRunning = false;
|
||||
public bool ShowMemoryValuesInCodeWindow = true;
|
||||
|
||||
public bool BreakOnOpen = true;
|
||||
|
||||
@ -49,6 +49,8 @@
|
||||
this.txtXScroll = new System.Windows.Forms.TextBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.txtTmpAddr = new System.Windows.Forms.TextBox();
|
||||
this.lblFrameCount = new System.Windows.Forms.Label();
|
||||
this.txtFrameCount = new System.Windows.Forms.TextBox();
|
||||
this.grpControlMask = new System.Windows.Forms.GroupBox();
|
||||
this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel();
|
||||
this.chkDrawLeftSpr = new System.Windows.Forms.CheckBox();
|
||||
@ -77,9 +79,11 @@
|
||||
this.chkExternal = new System.Windows.Forms.CheckBox();
|
||||
this.chkNMI = new System.Windows.Forms.CheckBox();
|
||||
this.chkDMC = new System.Windows.Forms.CheckBox();
|
||||
this.chkBreak = new System.Windows.Forms.CheckBox();
|
||||
this.chkNegative = new System.Windows.Forms.CheckBox();
|
||||
this.chkOverflow = new System.Windows.Forms.CheckBox();
|
||||
this.chkDecimal = new System.Windows.Forms.CheckBox();
|
||||
this.chkReserved = new System.Windows.Forms.CheckBox();
|
||||
this.txtStatus = new System.Windows.Forms.TextBox();
|
||||
this.chkInterrupt = new System.Windows.Forms.CheckBox();
|
||||
this.lblStatus = new System.Windows.Forms.Label();
|
||||
@ -121,8 +125,6 @@
|
||||
this.mnuGoToPlayHandler = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.mnuGoToProgramCounter = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.chkReserved = new System.Windows.Forms.CheckBox();
|
||||
this.chkBreak = new System.Windows.Forms.CheckBox();
|
||||
this.tableLayoutPanel2.SuspendLayout();
|
||||
this.grpPPUStatus.SuspendLayout();
|
||||
this.tableLayoutPanel8.SuspendLayout();
|
||||
@ -214,6 +216,8 @@
|
||||
this.tableLayoutPanel7.Controls.Add(this.txtXScroll, 1, 4);
|
||||
this.tableLayoutPanel7.Controls.Add(this.label1, 2, 2);
|
||||
this.tableLayoutPanel7.Controls.Add(this.txtTmpAddr, 3, 2);
|
||||
this.tableLayoutPanel7.Controls.Add(this.lblFrameCount, 2, 0);
|
||||
this.tableLayoutPanel7.Controls.Add(this.txtFrameCount, 3, 0);
|
||||
this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.tableLayoutPanel7.Location = new System.Drawing.Point(3, 3);
|
||||
this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
@ -420,11 +424,33 @@
|
||||
//
|
||||
// txtTmpAddr
|
||||
//
|
||||
this.txtTmpAddr.Location = new System.Drawing.Point(128, 40);
|
||||
this.txtTmpAddr.Location = new System.Drawing.Point(137, 40);
|
||||
this.txtTmpAddr.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtTmpAddr.Name = "txtTmpAddr";
|
||||
this.txtTmpAddr.Size = new System.Drawing.Size(45, 20);
|
||||
this.txtTmpAddr.TabIndex = 14;
|
||||
this.txtTmpAddr.TextChanged += new System.EventHandler(this.OnOptionChanged);
|
||||
//
|
||||
// lblFrameCount
|
||||
//
|
||||
this.lblFrameCount.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.lblFrameCount.AutoSize = true;
|
||||
this.lblFrameCount.Location = new System.Drawing.Point(111, 3);
|
||||
this.lblFrameCount.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.lblFrameCount.Name = "lblFrameCount";
|
||||
this.lblFrameCount.Size = new System.Drawing.Size(26, 13);
|
||||
this.lblFrameCount.TabIndex = 15;
|
||||
this.lblFrameCount.Text = "Fr#:";
|
||||
this.lblFrameCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
// txtFrameCount
|
||||
//
|
||||
this.txtFrameCount.Location = new System.Drawing.Point(137, 0);
|
||||
this.txtFrameCount.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtFrameCount.Name = "txtFrameCount";
|
||||
this.txtFrameCount.Size = new System.Drawing.Size(52, 20);
|
||||
this.txtFrameCount.TabIndex = 16;
|
||||
this.txtFrameCount.TextChanged += new System.EventHandler(this.OnOptionChanged);
|
||||
//
|
||||
// grpControlMask
|
||||
//
|
||||
@ -822,6 +848,19 @@
|
||||
this.chkDMC.UseVisualStyleBackColor = true;
|
||||
this.chkDMC.Click += new System.EventHandler(this.OnOptionChanged);
|
||||
//
|
||||
// chkBreak
|
||||
//
|
||||
this.chkBreak.AutoSize = true;
|
||||
this.chkBreak.Enabled = false;
|
||||
this.chkBreak.Location = new System.Drawing.Point(49, 17);
|
||||
this.chkBreak.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkBreak.Name = "chkBreak";
|
||||
this.chkBreak.Size = new System.Drawing.Size(54, 17);
|
||||
this.chkBreak.TabIndex = 4;
|
||||
this.chkBreak.Text = "Break";
|
||||
this.chkBreak.UseVisualStyleBackColor = true;
|
||||
this.chkBreak.Click += new System.EventHandler(this.chkCpuFlag_Click);
|
||||
//
|
||||
// chkNegative
|
||||
//
|
||||
this.chkNegative.AutoSize = true;
|
||||
@ -858,6 +897,19 @@
|
||||
this.chkDecimal.UseVisualStyleBackColor = true;
|
||||
this.chkDecimal.Click += new System.EventHandler(this.chkCpuFlag_Click);
|
||||
//
|
||||
// chkReserved
|
||||
//
|
||||
this.chkReserved.AutoSize = true;
|
||||
this.chkReserved.Enabled = false;
|
||||
this.chkReserved.Location = new System.Drawing.Point(103, 17);
|
||||
this.chkReserved.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkReserved.Name = "chkReserved";
|
||||
this.chkReserved.Size = new System.Drawing.Size(72, 17);
|
||||
this.chkReserved.TabIndex = 5;
|
||||
this.chkReserved.Text = "Reserved";
|
||||
this.chkReserved.UseVisualStyleBackColor = true;
|
||||
this.chkReserved.Click += new System.EventHandler(this.chkCpuFlag_Click);
|
||||
//
|
||||
// txtStatus
|
||||
//
|
||||
this.txtStatus.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
@ -1314,32 +1366,6 @@
|
||||
this.mnuGoToProgramCounter.ToolTipText = "Alt+*";
|
||||
this.mnuGoToProgramCounter.Click += new System.EventHandler(this.mnuGoToProgramCounter_Click);
|
||||
//
|
||||
// chkReserved
|
||||
//
|
||||
this.chkReserved.AutoSize = true;
|
||||
this.chkReserved.Enabled = false;
|
||||
this.chkReserved.Location = new System.Drawing.Point(103, 17);
|
||||
this.chkReserved.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkReserved.Name = "chkReserved";
|
||||
this.chkReserved.Size = new System.Drawing.Size(72, 17);
|
||||
this.chkReserved.TabIndex = 5;
|
||||
this.chkReserved.Text = "Reserved";
|
||||
this.chkReserved.UseVisualStyleBackColor = true;
|
||||
this.chkReserved.Click += new System.EventHandler(this.chkCpuFlag_Click);
|
||||
//
|
||||
// chkBreak
|
||||
//
|
||||
this.chkBreak.AutoSize = true;
|
||||
this.chkBreak.Enabled = false;
|
||||
this.chkBreak.Location = new System.Drawing.Point(49, 17);
|
||||
this.chkBreak.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.chkBreak.Name = "chkBreak";
|
||||
this.chkBreak.Size = new System.Drawing.Size(54, 17);
|
||||
this.chkBreak.TabIndex = 4;
|
||||
this.chkBreak.Text = "Break";
|
||||
this.chkBreak.UseVisualStyleBackColor = true;
|
||||
this.chkBreak.Click += new System.EventHandler(this.chkCpuFlag_Click);
|
||||
//
|
||||
// ctrlConsoleStatus
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@ -1483,5 +1509,7 @@
|
||||
private System.Windows.Forms.TextBox txtStack;
|
||||
private System.Windows.Forms.CheckBox chkBreak;
|
||||
private System.Windows.Forms.CheckBox chkReserved;
|
||||
private System.Windows.Forms.Label lblFrameCount;
|
||||
private System.Windows.Forms.TextBox txtFrameCount;
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,6 +96,7 @@ namespace Mesen.GUI.Debugger
|
||||
|
||||
txtCycle.Text = state.Cycle.ToString();
|
||||
txtScanline.Text = state.Scanline.ToString();
|
||||
txtFrameCount.Text = state.FrameCount.ToString();
|
||||
|
||||
txtVRAMAddr.Text = state.State.VideoRamAddr.ToString("X4");
|
||||
txtTmpAddr.Text = state.State.TmpVideoRamAddr.ToString("X4");
|
||||
@ -161,6 +162,10 @@ namespace Mesen.GUI.Debugger
|
||||
Int32 scanline = 0;
|
||||
Int32.TryParse(txtScanline.Text, out scanline);
|
||||
state.PPU.Scanline = scanline;
|
||||
|
||||
UInt32 frameCount = 0;
|
||||
UInt32.TryParse(txtFrameCount.Text, out frameCount);
|
||||
state.PPU.FrameCount = frameCount;
|
||||
|
||||
Int32 xScroll = 0;
|
||||
Int32.TryParse(txtXScroll.Text, out xScroll);
|
||||
|
||||
@ -42,13 +42,13 @@ namespace Mesen.GUI.Debugger
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateWatch()
|
||||
public void UpdateWatch(bool autoResizeColumns = true)
|
||||
{
|
||||
List<WatchValueInfo> watchContent = WatchManager.GetWatchContent(mnuHexDisplay.Checked);
|
||||
|
||||
lstWatch.BeginUpdate();
|
||||
|
||||
bool updating = false;
|
||||
if(watchContent.Count != lstWatch.Items.Count - 1) {
|
||||
lstWatch.BeginUpdate();
|
||||
lstWatch.Items.Clear();
|
||||
|
||||
List<ListViewItem> itemsToAdd = new List<ListViewItem>();
|
||||
@ -62,21 +62,34 @@ namespace Mesen.GUI.Debugger
|
||||
lastItem.SubItems.Add("");
|
||||
itemsToAdd.Add(lastItem);
|
||||
lstWatch.Items.AddRange(itemsToAdd.ToArray());
|
||||
updating = true;
|
||||
} else {
|
||||
for(int i = 0; i < watchContent.Count; i++) {
|
||||
ListViewItem item = lstWatch.Items[i];
|
||||
item.SubItems[0].Text = watchContent[i].Expression;
|
||||
item.SubItems[1].Text = watchContent[i].Value.ToString();
|
||||
item.SubItems[1].ForeColor = watchContent[i].HasChanged ? Color.Red : Color.Black;
|
||||
bool needUpdate = (
|
||||
item.SubItems[0].Text != watchContent[i].Expression ||
|
||||
item.SubItems[1].Text != watchContent[i].Value ||
|
||||
item.SubItems[1].ForeColor != (watchContent[i].HasChanged ? Color.Red : Color.Black)
|
||||
);
|
||||
if(needUpdate) {
|
||||
updating = true;
|
||||
item.SubItems[0].Text = watchContent[i].Expression;
|
||||
item.SubItems[1].Text = watchContent[i].Value;
|
||||
item.SubItems[1].ForeColor = watchContent[i].HasChanged ? Color.Red : Color.Black;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
lstWatch.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent);
|
||||
if(colValue.Width < 100) {
|
||||
colValue.Width = 100;
|
||||
}
|
||||
if(updating) {
|
||||
if(autoResizeColumns) {
|
||||
lstWatch.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.ColumnContent);
|
||||
}
|
||||
if(colValue.Width < 100) {
|
||||
colValue.Width = 100;
|
||||
}
|
||||
|
||||
lstWatch.EndUpdate();
|
||||
lstWatch.EndUpdate();
|
||||
}
|
||||
|
||||
if(_currentSelection >= 0 && lstWatch.Items.Count > _currentSelection) {
|
||||
lstWatch.FocusedItem = lstWatch.Items[_currentSelection];
|
||||
|
||||
100
GUI.NET/Debugger/frmDebugger.Designer.cs
generated
100
GUI.NET/Debugger/frmDebugger.Designer.cs
generated
@ -130,6 +130,8 @@ namespace Mesen.GUI.Debugger
|
||||
this.mnuBreakOnUnofficialOpcodes = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuBreakOnBrk = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuBreakOnCrash = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem25 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.mnuBreakOnDecayedOamRead = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuBreakOnUninitMemoryRead = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.mnuBreakOnOpen = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@ -168,7 +170,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.mnuPpuPartialDraw = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuPpuShowPreviousFrame = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem19 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.mnuRefreshWatchWhileRunning = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuRefreshWhileRunning = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.mnuPreferences = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@ -204,8 +206,6 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlPpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping();
|
||||
this.ctrlCpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping();
|
||||
this.tsToolbar = new Mesen.GUI.Controls.ctrlMesenToolStrip();
|
||||
this.toolStripMenuItem25 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.mnuBreakOnDecayedOamRead = new System.Windows.Forms.ToolStripMenuItem();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
|
||||
this.splitContainer.Panel1.SuspendLayout();
|
||||
this.splitContainer.Panel2.SuspendLayout();
|
||||
@ -232,7 +232,7 @@ namespace Mesen.GUI.Debugger
|
||||
//
|
||||
// tmrCdlRatios
|
||||
//
|
||||
this.tmrCdlRatios.Interval = 300;
|
||||
this.tmrCdlRatios.Interval = 1000;
|
||||
this.tmrCdlRatios.Tick += new System.EventHandler(this.tmrCdlRatios_Tick);
|
||||
//
|
||||
// splitContainer
|
||||
@ -255,7 +255,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel10);
|
||||
this.splitContainer.Panel2MinSize = 100;
|
||||
this.splitContainer.Size = new System.Drawing.Size(1075, 570);
|
||||
this.splitContainer.SplitterDistance = 435;
|
||||
this.splitContainer.SplitterDistance = 432;
|
||||
this.splitContainer.SplitterWidth = 7;
|
||||
this.splitContainer.TabIndex = 1;
|
||||
this.splitContainer.TabStop = false;
|
||||
@ -279,7 +279,7 @@ namespace Mesen.GUI.Debugger
|
||||
//
|
||||
this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists);
|
||||
this.ctrlSplitContainerTop.Panel2MinSize = 150;
|
||||
this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 435);
|
||||
this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 432);
|
||||
this.ctrlSplitContainerTop.SplitterDistance = 750;
|
||||
this.ctrlSplitContainerTop.SplitterWidth = 7;
|
||||
this.ctrlSplitContainerTop.TabIndex = 3;
|
||||
@ -300,8 +300,8 @@ namespace Mesen.GUI.Debugger
|
||||
this.tlpTop.Name = "tlpTop";
|
||||
this.tlpTop.RowCount = 1;
|
||||
this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 435F));
|
||||
this.tlpTop.Size = new System.Drawing.Size(750, 435);
|
||||
this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 432F));
|
||||
this.tlpTop.Size = new System.Drawing.Size(750, 432);
|
||||
this.tlpTop.TabIndex = 2;
|
||||
//
|
||||
// panel1
|
||||
@ -312,7 +312,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.panel1.Location = new System.Drawing.Point(3, 0);
|
||||
this.panel1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(286, 435);
|
||||
this.panel1.Size = new System.Drawing.Size(286, 432);
|
||||
this.panel1.TabIndex = 5;
|
||||
//
|
||||
// ctrlSourceViewer
|
||||
@ -321,7 +321,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlSourceViewer.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlSourceViewer.Location = new System.Drawing.Point(0, 0);
|
||||
this.ctrlSourceViewer.Name = "ctrlSourceViewer";
|
||||
this.ctrlSourceViewer.Size = new System.Drawing.Size(286, 435);
|
||||
this.ctrlSourceViewer.Size = new System.Drawing.Size(286, 432);
|
||||
this.ctrlSourceViewer.SymbolProvider = null;
|
||||
this.ctrlSourceViewer.TabIndex = 7;
|
||||
this.ctrlSourceViewer.Visible = false;
|
||||
@ -335,7 +335,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlDebuggerCode.Location = new System.Drawing.Point(0, 0);
|
||||
this.ctrlDebuggerCode.Name = "ctrlDebuggerCode";
|
||||
this.ctrlDebuggerCode.ShowMemoryValues = false;
|
||||
this.ctrlDebuggerCode.Size = new System.Drawing.Size(286, 435);
|
||||
this.ctrlDebuggerCode.Size = new System.Drawing.Size(286, 432);
|
||||
this.ctrlDebuggerCode.SymbolProvider = null;
|
||||
this.ctrlDebuggerCode.TabIndex = 2;
|
||||
this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode);
|
||||
@ -349,7 +349,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.panel2.Location = new System.Drawing.Point(292, 0);
|
||||
this.panel2.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.panel2.Name = "panel2";
|
||||
this.panel2.Size = new System.Drawing.Size(1, 435);
|
||||
this.panel2.Size = new System.Drawing.Size(1, 432);
|
||||
this.panel2.TabIndex = 6;
|
||||
//
|
||||
// ctrlSourceViewerSplit
|
||||
@ -358,7 +358,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlSourceViewerSplit.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlSourceViewerSplit.Location = new System.Drawing.Point(0, 0);
|
||||
this.ctrlSourceViewerSplit.Name = "ctrlSourceViewerSplit";
|
||||
this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 435);
|
||||
this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 432);
|
||||
this.ctrlSourceViewerSplit.SymbolProvider = null;
|
||||
this.ctrlSourceViewerSplit.TabIndex = 8;
|
||||
this.ctrlSourceViewerSplit.Visible = false;
|
||||
@ -372,7 +372,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(0, 0);
|
||||
this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit";
|
||||
this.ctrlDebuggerCodeSplit.ShowMemoryValues = false;
|
||||
this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 435);
|
||||
this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 432);
|
||||
this.ctrlDebuggerCodeSplit.SymbolProvider = null;
|
||||
this.ctrlDebuggerCodeSplit.TabIndex = 4;
|
||||
this.ctrlDebuggerCodeSplit.Visible = false;
|
||||
@ -392,7 +392,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.tableLayoutPanel1.RowCount = 2;
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 435);
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 432);
|
||||
this.tableLayoutPanel1.TabIndex = 7;
|
||||
//
|
||||
// ctrlConsoleStatus
|
||||
@ -416,7 +416,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.tlpVerticalLayout.Name = "tlpVerticalLayout";
|
||||
this.tlpVerticalLayout.RowCount = 1;
|
||||
this.tlpVerticalLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
||||
this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 35);
|
||||
this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 32);
|
||||
this.tlpVerticalLayout.TabIndex = 4;
|
||||
//
|
||||
// tlpFunctionLabelLists
|
||||
@ -432,16 +432,16 @@ namespace Mesen.GUI.Debugger
|
||||
this.tlpFunctionLabelLists.RowCount = 2;
|
||||
this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
||||
this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
||||
this.tlpFunctionLabelLists.Size = new System.Drawing.Size(318, 435);
|
||||
this.tlpFunctionLabelLists.Size = new System.Drawing.Size(318, 432);
|
||||
this.tlpFunctionLabelLists.TabIndex = 5;
|
||||
//
|
||||
// grpLabels
|
||||
//
|
||||
this.grpLabels.Controls.Add(this.ctrlLabelList);
|
||||
this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpLabels.Location = new System.Drawing.Point(3, 220);
|
||||
this.grpLabels.Location = new System.Drawing.Point(3, 219);
|
||||
this.grpLabels.Name = "grpLabels";
|
||||
this.grpLabels.Size = new System.Drawing.Size(312, 212);
|
||||
this.grpLabels.Size = new System.Drawing.Size(312, 210);
|
||||
this.grpLabels.TabIndex = 6;
|
||||
this.grpLabels.TabStop = false;
|
||||
this.grpLabels.Text = "Labels";
|
||||
@ -451,7 +451,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlLabelList.Location = new System.Drawing.Point(3, 16);
|
||||
this.ctrlLabelList.Name = "ctrlLabelList";
|
||||
this.ctrlLabelList.Size = new System.Drawing.Size(306, 193);
|
||||
this.ctrlLabelList.Size = new System.Drawing.Size(306, 191);
|
||||
this.ctrlLabelList.TabIndex = 0;
|
||||
this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence);
|
||||
this.ctrlLabelList.OnLabelSelected += new System.EventHandler(this.ctrlLabelList_OnLabelSelected);
|
||||
@ -462,7 +462,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpFunctions.Location = new System.Drawing.Point(3, 3);
|
||||
this.grpFunctions.Name = "grpFunctions";
|
||||
this.grpFunctions.Size = new System.Drawing.Size(312, 211);
|
||||
this.grpFunctions.Size = new System.Drawing.Size(312, 210);
|
||||
this.grpFunctions.TabIndex = 5;
|
||||
this.grpFunctions.TabStop = false;
|
||||
this.grpFunctions.Text = "Functions";
|
||||
@ -472,7 +472,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16);
|
||||
this.ctrlFunctionList.Name = "ctrlFunctionList";
|
||||
this.ctrlFunctionList.Size = new System.Drawing.Size(306, 192);
|
||||
this.ctrlFunctionList.Size = new System.Drawing.Size(306, 191);
|
||||
this.ctrlFunctionList.TabIndex = 0;
|
||||
this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence);
|
||||
this.ctrlFunctionList.OnFunctionSelected += new System.EventHandler(this.ctrlFunctionList_OnFunctionSelected);
|
||||
@ -503,7 +503,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||
this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 128);
|
||||
this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 131);
|
||||
this.tableLayoutPanel10.TabIndex = 0;
|
||||
//
|
||||
// grpWatch
|
||||
@ -512,7 +512,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpWatch.Location = new System.Drawing.Point(3, 3);
|
||||
this.grpWatch.Name = "grpWatch";
|
||||
this.grpWatch.Size = new System.Drawing.Size(352, 122);
|
||||
this.grpWatch.Size = new System.Drawing.Size(352, 125);
|
||||
this.grpWatch.TabIndex = 2;
|
||||
this.grpWatch.TabStop = false;
|
||||
this.grpWatch.Text = "Watch";
|
||||
@ -522,7 +522,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlWatch.Location = new System.Drawing.Point(3, 16);
|
||||
this.ctrlWatch.Name = "ctrlWatch";
|
||||
this.ctrlWatch.Size = new System.Drawing.Size(346, 103);
|
||||
this.ctrlWatch.Size = new System.Drawing.Size(346, 106);
|
||||
this.ctrlWatch.TabIndex = 0;
|
||||
//
|
||||
// grpBreakpoints
|
||||
@ -531,7 +531,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.grpBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpBreakpoints.Location = new System.Drawing.Point(361, 3);
|
||||
this.grpBreakpoints.Name = "grpBreakpoints";
|
||||
this.grpBreakpoints.Size = new System.Drawing.Size(352, 122);
|
||||
this.grpBreakpoints.Size = new System.Drawing.Size(352, 125);
|
||||
this.grpBreakpoints.TabIndex = 3;
|
||||
this.grpBreakpoints.TabStop = false;
|
||||
this.grpBreakpoints.Text = "Breakpoints";
|
||||
@ -541,7 +541,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlBreakpoints.Location = new System.Drawing.Point(3, 16);
|
||||
this.ctrlBreakpoints.Name = "ctrlBreakpoints";
|
||||
this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 103);
|
||||
this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 106);
|
||||
this.ctrlBreakpoints.TabIndex = 0;
|
||||
this.ctrlBreakpoints.BreakpointNavigation += new System.EventHandler(this.ctrlBreakpoints_BreakpointNavigation);
|
||||
//
|
||||
@ -551,7 +551,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.grpCallstack.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.grpCallstack.Location = new System.Drawing.Point(719, 3);
|
||||
this.grpCallstack.Name = "grpCallstack";
|
||||
this.grpCallstack.Size = new System.Drawing.Size(353, 122);
|
||||
this.grpCallstack.Size = new System.Drawing.Size(353, 125);
|
||||
this.grpCallstack.TabIndex = 4;
|
||||
this.grpCallstack.TabStop = false;
|
||||
this.grpCallstack.Text = "Call Stack";
|
||||
@ -561,7 +561,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.ctrlCallstack.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.ctrlCallstack.Location = new System.Drawing.Point(3, 16);
|
||||
this.ctrlCallstack.Name = "ctrlCallstack";
|
||||
this.ctrlCallstack.Size = new System.Drawing.Size(347, 103);
|
||||
this.ctrlCallstack.Size = new System.Drawing.Size(347, 106);
|
||||
this.ctrlCallstack.TabIndex = 0;
|
||||
this.ctrlCallstack.FunctionSelected += new System.EventHandler(this.ctrlCallstack_FunctionSelected);
|
||||
//
|
||||
@ -1037,7 +1037,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.mnuPpuPartialDraw,
|
||||
this.mnuPpuShowPreviousFrame,
|
||||
this.toolStripMenuItem19,
|
||||
this.mnuRefreshWatchWhileRunning,
|
||||
this.mnuRefreshWhileRunning,
|
||||
this.toolStripMenuItem6,
|
||||
this.mnuPreferences});
|
||||
this.mnuOptions.Name = "mnuOptions";
|
||||
@ -1211,6 +1211,19 @@ namespace Mesen.GUI.Debugger
|
||||
this.mnuBreakOnCrash.Text = "Break on CPU crash";
|
||||
this.mnuBreakOnCrash.Click += new System.EventHandler(this.mnuBreakOnCrash_Click);
|
||||
//
|
||||
// toolStripMenuItem25
|
||||
//
|
||||
this.toolStripMenuItem25.Name = "toolStripMenuItem25";
|
||||
this.toolStripMenuItem25.Size = new System.Drawing.Size(258, 6);
|
||||
//
|
||||
// mnuBreakOnDecayedOamRead
|
||||
//
|
||||
this.mnuBreakOnDecayedOamRead.CheckOnClick = true;
|
||||
this.mnuBreakOnDecayedOamRead.Name = "mnuBreakOnDecayedOamRead";
|
||||
this.mnuBreakOnDecayedOamRead.Size = new System.Drawing.Size(261, 22);
|
||||
this.mnuBreakOnDecayedOamRead.Text = "Break on decayed OAM read";
|
||||
this.mnuBreakOnDecayedOamRead.Click += new System.EventHandler(this.mnuBreakOnDecayedOamRead_Click);
|
||||
//
|
||||
// mnuBreakOnUninitMemoryRead
|
||||
//
|
||||
this.mnuBreakOnUninitMemoryRead.CheckOnClick = true;
|
||||
@ -1509,13 +1522,13 @@ namespace Mesen.GUI.Debugger
|
||||
this.toolStripMenuItem19.Name = "toolStripMenuItem19";
|
||||
this.toolStripMenuItem19.Size = new System.Drawing.Size(263, 6);
|
||||
//
|
||||
// mnuRefreshWatchWhileRunning
|
||||
// mnuRefreshWhileRunning
|
||||
//
|
||||
this.mnuRefreshWatchWhileRunning.CheckOnClick = true;
|
||||
this.mnuRefreshWatchWhileRunning.Name = "mnuRefreshWatchWhileRunning";
|
||||
this.mnuRefreshWatchWhileRunning.Size = new System.Drawing.Size(266, 22);
|
||||
this.mnuRefreshWatchWhileRunning.Text = "Refresh watch while running";
|
||||
this.mnuRefreshWatchWhileRunning.Click += new System.EventHandler(this.mnuRefreshWatchWhileRunning_Click);
|
||||
this.mnuRefreshWhileRunning.CheckOnClick = true;
|
||||
this.mnuRefreshWhileRunning.Name = "mnuRefreshWhileRunning";
|
||||
this.mnuRefreshWhileRunning.Size = new System.Drawing.Size(266, 22);
|
||||
this.mnuRefreshWhileRunning.Text = "Refresh UI while running";
|
||||
this.mnuRefreshWhileRunning.Click += new System.EventHandler(this.mnuRefreshWhileRunning_Click);
|
||||
//
|
||||
// toolStripMenuItem6
|
||||
//
|
||||
@ -1803,19 +1816,6 @@ namespace Mesen.GUI.Debugger
|
||||
this.tsToolbar.Text = "toolStrip1";
|
||||
this.tsToolbar.Visible = false;
|
||||
//
|
||||
// toolStripMenuItem25
|
||||
//
|
||||
this.toolStripMenuItem25.Name = "toolStripMenuItem25";
|
||||
this.toolStripMenuItem25.Size = new System.Drawing.Size(258, 6);
|
||||
//
|
||||
// mnuBreakOnDecayedOamRead
|
||||
//
|
||||
this.mnuBreakOnDecayedOamRead.CheckOnClick = true;
|
||||
this.mnuBreakOnDecayedOamRead.Name = "mnuBreakOnDecayedOamRead";
|
||||
this.mnuBreakOnDecayedOamRead.Size = new System.Drawing.Size(261, 22);
|
||||
this.mnuBreakOnDecayedOamRead.Text = "Break on decayed OAM read";
|
||||
this.mnuBreakOnDecayedOamRead.Click += new System.EventHandler(this.mnuBreakOnDecayedOamRead_Click);
|
||||
//
|
||||
// frmDebugger
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@ -1968,7 +1968,7 @@ namespace Mesen.GUI.Debugger
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem14;
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuAssembler;
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuCode;
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuRefreshWatchWhileRunning;
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuRefreshWhileRunning;
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuBreakOptions;
|
||||
private System.Windows.Forms.ToolStripMenuItem mnuBreakOnDebuggerFocus;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem15;
|
||||
|
||||
@ -113,7 +113,7 @@ namespace Mesen.GUI.Debugger
|
||||
this.mnuShowVerifiedData.Checked = ConfigManager.Config.DebugInfo.ShowVerifiedData;
|
||||
this.mnuShowUnidentifiedData.Checked = ConfigManager.Config.DebugInfo.ShowUnidentifiedData;
|
||||
|
||||
this.mnuRefreshWatchWhileRunning.Checked = ConfigManager.Config.DebugInfo.RefreshWatchWhileRunning;
|
||||
this.mnuRefreshWhileRunning.Checked = ConfigManager.Config.DebugInfo.RefreshWhileRunning;
|
||||
this.mnuShowMemoryValues.Checked = ConfigManager.Config.DebugInfo.ShowMemoryValuesInCodeWindow;
|
||||
ctrlDebuggerCode.ShowMemoryValues = mnuShowMemoryValues.Checked;
|
||||
ctrlDebuggerCodeSplit.ShowMemoryValues = mnuShowMemoryValues.Checked;
|
||||
@ -446,8 +446,19 @@ namespace Mesen.GUI.Debugger
|
||||
{
|
||||
switch(e.NotificationType) {
|
||||
case InteropEmu.ConsoleNotificationType.PpuFrameDone:
|
||||
if(ConfigManager.Config.DebugInfo.RefreshWatchWhileRunning) {
|
||||
this.BeginInvoke((MethodInvoker)(() => ctrlWatch.UpdateWatch()));
|
||||
if(ConfigManager.Config.DebugInfo.RefreshWhileRunning) {
|
||||
DebugState state = new DebugState();
|
||||
InteropEmu.DebugGetState(ref state);
|
||||
|
||||
this.BeginInvoke((MethodInvoker)(() => {
|
||||
if(state.PPU.FrameCount % 30 == 0) {
|
||||
//Update UI every 30 frames, since this is a relatively slow operation
|
||||
ctrlCpuMemoryMapping.UpdateCpuRegions(state.Cartridge);
|
||||
ctrlPpuMemoryMapping.UpdatePpuRegions(state.Cartridge);
|
||||
ctrlConsoleStatus.UpdateStatus(ref state);
|
||||
}
|
||||
ctrlWatch.UpdateWatch(false);
|
||||
}));
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1124,9 +1135,9 @@ namespace Mesen.GUI.Debugger
|
||||
ConfigManager.ApplyChanges();
|
||||
}
|
||||
|
||||
private void mnuRefreshWatchWhileRunning_Click(object sender, EventArgs e)
|
||||
private void mnuRefreshWhileRunning_Click(object sender, EventArgs e)
|
||||
{
|
||||
ConfigManager.Config.DebugInfo.RefreshWatchWhileRunning = mnuRefreshWatchWhileRunning.Checked;
|
||||
ConfigManager.Config.DebugInfo.RefreshWhileRunning = mnuRefreshWhileRunning.Checked;
|
||||
ConfigManager.ApplyChanges();
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user