Emulation/Mesen
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen.git synced 2025-04-02 10:52:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Debugger: Added option to hide "unused" addresses in memory access counters

Browse source
This commit is contained in:
Sour 2018-03-30 18:38:14 -04:00
parent d3c5074b24
commit 37c633da14
2 changed files with 57 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
GUI.NET/Debugger/Controls/ctrlMemoryAccessCounters.Designer.cs generated
View file

@ -42,6 +42,7 @@
this.lblSort = new System.Windows.Forms.Label();
this.cboSort = new System.Windows.Forms.ComboBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.chkHideUnusedAddresses = new System.Windows.Forms.CheckBox();
this.flowLayoutPanel1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
@ -77,11 +78,6 @@
//
this.cboMemoryType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboMemoryType.FormattingEnabled = true;
this.cboMemoryType.Items.AddRange(new object[] {
"CPU Memory",
"PRG ROM",
"Save RAM",
"Work RAM"});
this.cboMemoryType.Location = new System.Drawing.Point(42, 3);
this.cboMemoryType.Name = "cboMemoryType";
this.cboMemoryType.Size = new System.Drawing.Size(121, 21);
@ -112,21 +108,26 @@
// ctrlScrollableTextbox
//
this.ctrlScrollableTextbox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ctrlScrollableTextbox.CodeHighlightingEnabled = true;
this.tableLayoutPanel1.SetColumnSpan(this.ctrlScrollableTextbox, 2);
this.ctrlScrollableTextbox.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlScrollableTextbox.HideSelection = false;
this.ctrlScrollableTextbox.Location = new System.Drawing.Point(0, 27);
this.ctrlScrollableTextbox.Margin = new System.Windows.Forms.Padding(0);
this.ctrlScrollableTextbox.Name = "ctrlScrollableTextbox";
this.ctrlScrollableTextbox.ShowCompactPrgAddresses = false;
this.ctrlScrollableTextbox.ShowContentNotes = false;
this.ctrlScrollableTextbox.ShowLineNumberNotes = false;
this.ctrlScrollableTextbox.ShowMemoryValues = false;
this.ctrlScrollableTextbox.ShowScrollbars = true;
this.ctrlScrollableTextbox.ShowSingleContentLineNotes = true;
this.ctrlScrollableTextbox.ShowSingleLineLineNumberNotes = false;
this.ctrlScrollableTextbox.Size = new System.Drawing.Size(514, 251);
this.ctrlScrollableTextbox.Size = new System.Drawing.Size(514, 233);
this.ctrlScrollableTextbox.TabIndex = 0;
//
// btnReset
//
this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnReset.Location = new System.Drawing.Point(436, 281);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(75, 23);
@ -141,23 +142,25 @@
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.Controls.Add(this.picHelp, 1, 0);
this.tableLayoutPanel3.Controls.Add(this.chkHighlightUninitRead, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.picHelp, 1, 1);
this.tableLayoutPanel3.Controls.Add(this.chkHighlightUninitRead, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.chkHideUnusedAddresses, 0, 0);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 278);
this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 260);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 1;
this.tableLayoutPanel3.RowCount = 3;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(433, 29);
this.tableLayoutPanel3.Size = new System.Drawing.Size(433, 47);
this.tableLayoutPanel3.TabIndex = 2;
//
// picHelp
//
this.picHelp.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.picHelp.Image = global::Mesen.GUI.Properties.Resources.Help;
this.picHelp.Location = new System.Drawing.Point(201, 6);
this.picHelp.Location = new System.Drawing.Point(201, 26);
this.picHelp.Name = "picHelp";
this.picHelp.Size = new System.Drawing.Size(16, 16);
this.picHelp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -168,13 +171,13 @@
//
this.chkHighlightUninitRead.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.chkHighlightUninitRead.AutoSize = true;
this.chkHighlightUninitRead.Location = new System.Drawing.Point(3, 6);
this.chkHighlightUninitRead.Location = new System.Drawing.Point(3, 26);
this.chkHighlightUninitRead.Name = "chkHighlightUninitRead";
this.chkHighlightUninitRead.Size = new System.Drawing.Size(192, 17);
this.chkHighlightUninitRead.TabIndex = 4;
this.chkHighlightUninitRead.Text = "Highlight uninitialized memory reads";
this.chkHighlightUninitRead.UseVisualStyleBackColor = true;
this.chkHighlightUninitRead.CheckedChanged += new System.EventHandler(this.chkHighlightUninitRead_CheckedChanged);
this.chkHighlightUninitRead.CheckedChanged += new System.EventHandler(this.chkOption_CheckedChanged);
//
// tableLayoutPanel2
//
@ -242,6 +245,18 @@
this.toolTip.InitialDelay = 10;
this.toolTip.ReshowDelay = 10;
//
// chkHideUnusedAddresses
//
this.chkHideUnusedAddresses.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.chkHideUnusedAddresses.AutoSize = true;
this.chkHideUnusedAddresses.Location = new System.Drawing.Point(3, 3);
this.chkHideUnusedAddresses.Name = "chkHideUnusedAddresses";
this.chkHideUnusedAddresses.Size = new System.Drawing.Size(137, 17);
this.chkHideUnusedAddresses.TabIndex = 6;
this.chkHideUnusedAddresses.Text = "Hide unused addresses";
this.chkHideUnusedAddresses.UseVisualStyleBackColor = true;
this.chkHideUnusedAddresses.CheckedChanged += new System.EventHandler(this.chkOption_CheckedChanged);
//
// ctrlMemoryAccessCounters
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -281,5 +296,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.PictureBox picHelp;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.CheckBox chkHideUnusedAddresses;
}
}

40
GUI.NET/Debugger/Controls/ctrlMemoryAccessCounters.cs
View file

@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Mesen.GUI.Controls;
using Mesen.GUI.Forms;
namespace Mesen.GUI.Debugger.Controls
{
@ -25,6 +26,17 @@ namespace Mesen.GUI.Debugger.Controls
bool designMode = (LicenseManager.UsageMode == LicenseUsageMode.Designtime);
if(!designMode) {
cboMemoryType.Items.Add(ResourceHelper.GetEnumText(AddressType.InternalRam));
if(InteropEmu.DebugGetMemorySize(DebugMemoryType.PrgRom) > 0) {
cboMemoryType.Items.Add(ResourceHelper.GetEnumText(AddressType.PrgRom));
}
if(InteropEmu.DebugGetMemorySize(DebugMemoryType.WorkRam) > 0) {
cboMemoryType.Items.Add(ResourceHelper.GetEnumText(AddressType.WorkRam));
}
if(InteropEmu.DebugGetMemorySize(DebugMemoryType.SaveRam) > 0) {
cboMemoryType.Items.Add(ResourceHelper.GetEnumText(AddressType.SaveRam));
}
cboMemoryType.SelectedIndex = 0;
cboSort.SelectedIndex = 0;
}
@ -41,8 +53,8 @@ namespace Mesen.GUI.Debugger.Controls
int[] uninitReads = InteropEmu.DebugGetMemoryAccessCounts(_memoryType, MemoryOperationType.Read, true);
int[] addresses = new int[readCounts.Length];
string[] content = new string[readCounts.Length];
List<int> addresses = new List<int>(readCounts.Length);
List<string> content = new List<string>(readCounts.Length);
if(_data == null || _data.Length != readCounts.Length) {
_data = new MemoryCountData[readCounts.Length];
@ -70,9 +82,12 @@ namespace Mesen.GUI.Debugger.Controls
case SortType.UninitRead: Array.Sort(data.Select((e) => e.UninitRead ? -e.ReadCount : (Int32.MaxValue - e.ReadCount)).ToArray<int>(), data); break;
}
bool hideUnusedAddresses = chkHideUnusedAddresses.Checked;
for(int i = 0; i < readCounts.Length; i++) {
addresses[i] = data[i].Address;
content[i] = data[i].Content;
if(!hideUnusedAddresses || !data[i].Empty) {
addresses.Add(data[i].Address);
content.Add(data[i].Content);
}
}
if(chkHighlightUninitRead.Checked) {
@ -81,8 +96,8 @@ namespace Mesen.GUI.Debugger.Controls
ctrlScrollableTextbox.StyleProvider = null;
}
ctrlScrollableTextbox.Header = "Read".PadRight(12) + "Write".PadRight(12) + "Execute".PadRight(12);
ctrlScrollableTextbox.LineNumbers = addresses;
ctrlScrollableTextbox.TextLines = content;
ctrlScrollableTextbox.LineNumbers = addresses.ToArray();
ctrlScrollableTextbox.TextLines = content.ToArray();
}
private class LineStyleProvider : ctrlTextbox.ILineStyleProvider
@ -110,14 +125,7 @@ namespace Mesen.GUI.Debugger.Controls
private void cboMemoryType_SelectedIndexChanged(object sender, EventArgs e)
{
switch(this.cboMemoryType.SelectedIndex) {
default:
case 0: _memoryType = AddressType.InternalRam; break;
case 1: _memoryType = AddressType.PrgRom; break;
case 2: _memoryType = AddressType.SaveRam; break;
case 3: _memoryType = AddressType.WorkRam; break;
}
_memoryType = cboMemoryType.GetEnumValue<AddressType>();
RefreshData();
}
@ -127,7 +135,7 @@ namespace Mesen.GUI.Debugger.Controls
RefreshData();
}
private void chkHighlightUninitRead_CheckedChanged(object sender, EventArgs e)
private void chkOption_CheckedChanged(object sender, EventArgs e)
{
RefreshData();
}
@ -193,6 +201,8 @@ namespace Mesen.GUI.Debugger.Controls
}
}
public bool Empty { get { return ReadCount == 0 && WriteCount == 0 && ExecCount == 0; } }
public string Content
{
get