empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Event Viewer - Added "List View" tab (list of all events shown in the ppu view tab)

Browse source
This commit is contained in:
Sour 2018-06-14 20:05:07 -04:00
parent 7528c1fd06
commit ad5449b422
8 changed files with 467 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
GUI.NET/Debugger/Controls/ctrlEventViewerListView.Designer.cs generated Normal file
View file

@ -0,0 +1,141 @@
namespace Mesen.GUI.Debugger.Controls
{
partial class ctrlEventViewerListView
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if(disposing && (components != null)) {
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.lstEvents = new Mesen.GUI.Controls.DoubleBufferedListView();
this.colProgramCounter = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colScanline = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colCycle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colEventType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colAddress = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colValue = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colDetails = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.ctxMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mnuCopy = new System.Windows.Forms.ToolStripMenuItem();
this.ctxMenu.SuspendLayout();
this.SuspendLayout();
//
// lstEvents
//
this.lstEvents.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.colProgramCounter,
this.colScanline,
this.colCycle,
this.colEventType,
this.colAddress,
this.colValue,
this.colDetails});
this.lstEvents.ContextMenuStrip = this.ctxMenu;
this.lstEvents.Dock = System.Windows.Forms.DockStyle.Fill;
this.lstEvents.FullRowSelect = true;
this.lstEvents.Location = new System.Drawing.Point(0, 0);
this.lstEvents.Name = "lstEvents";
this.lstEvents.Size = new System.Drawing.Size(749, 205);
this.lstEvents.TabIndex = 0;
this.lstEvents.UseCompatibleStateImageBehavior = false;
this.lstEvents.View = System.Windows.Forms.View.Details;
this.lstEvents.VirtualMode = true;
this.lstEvents.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.lstEvents_ColumnClick);
this.lstEvents.RetrieveVirtualItem += new System.Windows.Forms.RetrieveVirtualItemEventHandler(this.lstEvents_RetrieveVirtualItem);
//
// colProgramCounter
//
this.colProgramCounter.Text = "PC";
this.colProgramCounter.Width = 50;
//
// colScanline
//
this.colScanline.Text = "Scanline";
//
// colCycle
//
this.colCycle.Text = "Cycle";
this.colCycle.Width = 45;
//
// colEventType
//
this.colEventType.Text = "Type";
this.colEventType.Width = 135;
//
// colAddress
//
this.colAddress.Text = "Address";
this.colAddress.Width = 65;
//
// colValue
//
this.colValue.Text = "Value";
this.colValue.Width = 51;
//
// colDetails
//
this.colDetails.Text = "Details";
this.colDetails.Width = 289;
//
// ctxMenu
//
this.ctxMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mnuCopy});
this.ctxMenu.Name = "ctxMenu";
this.ctxMenu.Size = new System.Drawing.Size(170, 48);
//
// mnuCopy
//
this.mnuCopy.Image = global::Mesen.GUI.Properties.Resources.Copy;
this.mnuCopy.Name = "mnuCopy";
this.mnuCopy.Size = new System.Drawing.Size(169, 22);
this.mnuCopy.Text = "Copy List Content";
this.mnuCopy.Click += new System.EventHandler(this.mnuCopy_Click);
//
// ctrlEventViewerListView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lstEvents);
this.Name = "ctrlEventViewerListView";
this.Size = new System.Drawing.Size(749, 205);
this.ctxMenu.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private GUI.Controls.DoubleBufferedListView lstEvents;
private System.Windows.Forms.ColumnHeader colScanline;
private System.Windows.Forms.ColumnHeader colCycle;
private System.Windows.Forms.ColumnHeader colEventType;
private System.Windows.Forms.ColumnHeader colDetails;
private System.Windows.Forms.ColumnHeader colAddress;
private System.Windows.Forms.ColumnHeader colValue;
private System.Windows.Forms.ColumnHeader colProgramCounter;
private System.Windows.Forms.ContextMenuStrip ctxMenu;
private System.Windows.Forms.ToolStripMenuItem mnuCopy;
}
}

159
GUI.NET/Debugger/Controls/ctrlEventViewerListView.cs Normal file
View file

@ -0,0 +1,159 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using Mesen.GUI.Controls;
using Mesen.GUI.Forms;
using Mesen.GUI.Config;
using System.Collections.ObjectModel;
namespace Mesen.GUI.Debugger.Controls
{
public partial class ctrlEventViewerListView : BaseControl
{
private List<DebugEventInfo> _debugEvents = new List<DebugEventInfo>();
private ReadOnlyCollection<Breakpoint> _breakpoints = null;
private eSortColumn _sortColumn = eSortColumn.Scanline;
private bool _sortAscending = true;
public ctrlEventViewerListView()
{
InitializeComponent();
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
if(!IsDesignMode) {
mnuCopy.InitShortcut(this, nameof(DebuggerShortcutsConfig.Copy));
}
}
public void GetData()
{
DebugEventInfo[] eventInfoArray;
byte[] pictureData;
_breakpoints = BreakpointManager.Breakpoints;
InteropEmu.DebugGetDebugEvents(out pictureData, out eventInfoArray);
this.BeginInvoke((Action)(() => {
lstEvents.BeginUpdate();
_debugEvents.Clear();
_debugEvents.AddRange(eventInfoArray);
SortData();
lstEvents.VirtualListSize = _debugEvents.Count;
lstEvents.EndUpdate();
}));
}
private ListViewItem CreateListViewItem(int index)
{
DebugEventInfo eventInfo = _debugEvents[index];
string details = "";
if(eventInfo.PpuLatch >= 1) {
details += "2nd Write";
}
bool isReadWrite = (
eventInfo.Type == DebugEventType.MapperRegisterRead ||
eventInfo.Type == DebugEventType.MapperRegisterWrite ||
eventInfo.Type == DebugEventType.PpuRegisterRead ||
eventInfo.Type == DebugEventType.PpuRegisterWrite
);
if(eventInfo.Type == DebugEventType.Breakpoint) {
if(eventInfo.BreakpointId >= 0 && eventInfo.BreakpointId < _breakpoints.Count) {
Breakpoint bp = _breakpoints[eventInfo.BreakpointId];
details += " Type: " + bp.ToReadableType();
details += " Addresses: " + bp.GetAddressString(true);
if(bp.Condition.Length > 0) {
details += " Condition: " + bp.Condition;
}
}
}
return new ListViewItem(new string[] {
eventInfo.ProgramCounter.ToString("X4"),
eventInfo.Scanline.ToString(),
eventInfo.Cycle.ToString(),
ResourceHelper.GetEnumText(eventInfo.Type),
isReadWrite ? ("$" + eventInfo.Address.ToString("X4")) : "",
isReadWrite ? ("$" + eventInfo.Value.ToString("X2")) : "",
details
});
}
private void lstEvents_RetrieveVirtualItem(object sender, RetrieveVirtualItemEventArgs e)
{
e.Item = CreateListViewItem(e.ItemIndex);
}
private void lstEvents_ColumnClick(object sender, ColumnClickEventArgs e)
{
eSortColumn sortColumn = (eSortColumn)e.Column;
if(sortColumn == _sortColumn) {
_sortAscending = !_sortAscending;
} else {
_sortColumn = sortColumn;
_sortAscending = true;
}
SortData();
}
private void SortData()
{
int sortOrder = _sortAscending ? 1 : -1;
_debugEvents.Sort((DebugEventInfo a, DebugEventInfo b) => {
int result = 0;
switch(_sortColumn) {
case eSortColumn.PC: result = ((int)a.ProgramCounter - (int)b.ProgramCounter); break;
case eSortColumn.Scanline: result = ((int)a.Scanline - (int)b.Scanline); break;
case eSortColumn.Cycle: result = ((int)a.Cycle - (int)b.Cycle); break;
case eSortColumn.Type: result = ((int)a.Type - (int)b.Type); break;
case eSortColumn.Address: result = ((int)a.Address - (int)b.Address); break;
case eSortColumn.Value: result = ((int)a.Value - (int)b.Value); break;
}
if(result == 0) {
result = ((int)a.Cycle - (int)b.Cycle);
}
return _sortAscending ? result : -result;
});
}
private void CopyList()
{
StringBuilder sb = new StringBuilder();
for(int i = 0; i < _debugEvents.Count; i++) {
foreach(ListViewItem.ListViewSubItem subItem in CreateListViewItem(i).SubItems) {
sb.Append(subItem.Text);
sb.Append("\t");
}
sb.AppendLine();
}
Clipboard.SetText(sb.ToString());
}
private void mnuCopy_Click(object sender, EventArgs e)
{
CopyList();
}
private enum eSortColumn
{
PC,
Scanline,
Cycle,
Type,
Address,
Value
}
}
}

123
GUI.NET/Debugger/Controls/ctrlEventViewerListView.resx Normal file
View file

@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="ctxMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

3
GUI.NET/Debugger/Controls/ctrlEventViewerPpuView.cs
View file

@ -21,8 +21,7 @@ namespace Mesen.GUI.Debugger.Controls
private byte[] _pictureData = null;
private Dictionary<int, List<DebugEventInfo>> _debugEventsByCycle = new Dictionary<int, List<DebugEventInfo>>();
private DebugEventInfo[] _debugEvents = new DebugEventInfo[0];
public ctrlEventViewerPpuView()
{
InitializeComponent();

1
GUI.NET/Debugger/DebugWindowManager.cs
View file

@ -92,7 +92,6 @@ namespace Mesen.GUI.Debugger
case DebugWindow.Assembler: return _openedWindows.ToList().Find((form) => form.GetType() == typeof(frmAssembler));
case DebugWindow.Debugger: return _openedWindows.ToList().Find((form) => form.GetType() == typeof(frmDebugger));
case DebugWindow.ApuViewer: return _openedWindows.ToList().Find((form) => form.GetType() == typeof(frmApuViewer));
case DebugWindow.EventViewer: return _openedWindows.ToList().Find((form) => form.GetType() == typeof(frmEventViewer));
}
return null;

26
GUI.NET/Debugger/frmEventViewer.Designer.cs generated
View file

@ -46,6 +46,8 @@
this.chkShowPpuRegisterWrites = new System.Windows.Forms.CheckBox();
this.chkShowMapperRegisterWrites = new System.Windows.Forms.CheckBox();
this.chkShowSpriteZero = new System.Windows.Forms.CheckBox();
this.tpgListView = new System.Windows.Forms.TabPage();
this.ctrlEventViewerListView = new Mesen.GUI.Debugger.Controls.ctrlEventViewerListView();
this.menuStrip1 = new Mesen.GUI.Controls.ctrlMesenMenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnuClose = new System.Windows.Forms.ToolStripMenuItem();
@ -59,12 +61,14 @@
this.panel1.SuspendLayout();
this.grpShow.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.tpgListView.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
// tabMain
//
this.tabMain.Controls.Add(this.tpgPpuView);
this.tabMain.Controls.Add(this.tpgListView);
this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMain.Location = new System.Drawing.Point(0, 24);
this.tabMain.Name = "tabMain";
@ -263,6 +267,25 @@
this.chkShowSpriteZero.UseVisualStyleBackColor = true;
this.chkShowSpriteZero.Click += new System.EventHandler(this.chkShowSpriteZero_Click);
//
// tpgListView
//
this.tpgListView.Controls.Add(this.ctrlEventViewerListView);
this.tpgListView.Location = new System.Drawing.Point(4, 22);
this.tpgListView.Name = "tpgListView";
this.tpgListView.Padding = new System.Windows.Forms.Padding(3);
this.tpgListView.Size = new System.Drawing.Size(921, 538);
this.tpgListView.TabIndex = 1;
this.tpgListView.Text = "List View";
this.tpgListView.UseVisualStyleBackColor = true;
//
// ctrlEventViewerListView
//
this.ctrlEventViewerListView.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlEventViewerListView.Location = new System.Drawing.Point(3, 3);
this.ctrlEventViewerListView.Name = "ctrlEventViewerListView";
this.ctrlEventViewerListView.Size = new System.Drawing.Size(915, 532);
this.ctrlEventViewerListView.TabIndex = 0;
//
// menuStrip1
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -338,6 +361,7 @@
this.grpShow.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.tableLayoutPanel2.PerformLayout();
this.tpgListView.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
@ -369,5 +393,7 @@
private System.Windows.Forms.GroupBox grpShow;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem mnuRefreshOnBreak;
private System.Windows.Forms.TabPage tpgListView;
private Controls.ctrlEventViewerListView ctrlEventViewerListView;
}
}

9
GUI.NET/Debugger/frmEventViewer.cs
View file

@ -16,6 +16,7 @@ namespace Mesen.GUI.Debugger
{
private DateTime _lastUpdate = DateTime.MinValue;
private InteropEmu.NotificationListener _notifListener;
private bool _inListViewTab = false;
private bool _refreshing = false;
public frmEventViewer()
@ -86,7 +87,11 @@ namespace Mesen.GUI.Debugger
private void GetData()
{
ctrlEventViewerPpuView.GetData();
if(_inListViewTab) {
ctrlEventViewerListView.GetData();
} else {
ctrlEventViewerPpuView.GetData();
}
}
private void RefreshViewer()
@ -103,6 +108,8 @@ namespace Mesen.GUI.Debugger
private void tabMain_SelectedIndexChanged(object sender, EventArgs e)
{
_inListViewTab = tabMain.SelectedTab == tpgListView;
GetData();
}
private void mnuRefreshOnBreak_Click(object sender, EventArgs e)

9
GUI.NET/GUI.NET.csproj
View file

@ -401,6 +401,12 @@
<Compile Include="Debugger\Controls\ctrlDbgShortcuts.Designer.cs">
<DependentUpon>ctrlDbgShortcuts.cs</DependentUpon>
</Compile>
<Compile Include="Debugger\Controls\ctrlEventViewerListView.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Debugger\Controls\ctrlEventViewerListView.Designer.cs">
<DependentUpon>ctrlEventViewerListView.cs</DependentUpon>
</Compile>
<Compile Include="Debugger\Controls\ctrlFindOccurrences.cs">
<SubType>UserControl</SubType>
</Compile>
@ -1246,6 +1252,9 @@
<EmbeddedResource Include="Debugger\Controls\ctrlDbgShortcuts.resx">
<DependentUpon>ctrlDbgShortcuts.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Debugger\Controls\ctrlEventViewerListView.resx">
<DependentUpon>ctrlEventViewerListView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Debugger\Controls\ctrlFindOccurrences.resx">
<DependentUpon>ctrlFindOccurrences.cs</DependentUpon>
</EmbeddedResource>