libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2024-12-13 03:47:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debugger: Added DMC sample tracking to CDL files + a highlight option for it in the memory viewer

Browse Source
This commit is contained in:
Sour 2017-12-29 13:39:57 -05:00
parent 898824cd6d
commit 86e951dd31
9 changed files with 166 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/Debugger.cpp
View File

@ -417,6 +417,13 @@ bool Debugger::PrivateProcessRamOperation(MemoryOperationType type, uint16_t &ad
{
OperationInfo operationInfo { addr, (int16_t)value, type };
bool isDmcRead = false;
if(type == MemoryOperationType::DmcRead) {
//Used to flag the data in the CDL file
isDmcRead = true;
type = MemoryOperationType::Read;
}
ProcessCpuOperation(addr, value, type);
if(type == MemoryOperationType::ExecOpCode) {
@ -471,6 +478,9 @@ bool Debugger::PrivateProcessRamOperation(MemoryOperationType type, uint16_t &ad
_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::Code);
} else if(type == MemoryOperationType::Read) {
_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::Data);
if(isDmcRead) {
_codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::PcmData);
}
}
} else if(addr < 0x2000 || absoluteRamAddr >= 0) {
if(type == MemoryOperationType::Write) {

2
Core/DeltaModulationChannel.cpp
View File

@ -60,7 +60,7 @@ void DeltaModulationChannel::StartDmcTransfer()
void DeltaModulationChannel::FillReadBuffer()
{
if(_bytesRemaining > 0) {
_readBuffer = _memoryManager->Read(_currentAddr);
_readBuffer = _memoryManager->Read(_currentAddr, MemoryOperationType::DmcRead);
_bufferEmpty = false;
_currentAddr++;

3
Core/Types.h
View File

@ -15,7 +15,8 @@ enum class MemoryOperationType
ExecOpCode = 2,
ExecOperand = 3,
PpuRenderingRead = 4,
DummyRead = 5
DummyRead = 5,
DmcRead = 6
};
struct State

2
GUI.NET/Config/DebugInfo.cs
View File

@ -138,12 +138,14 @@ namespace Mesen.GUI.Config
public bool RamHighlightChrReadBytes = false;
public bool RamHighlightCodeBytes = false;
public bool RamHighlightDataBytes = false;
public bool RamHighlightDmcDataBytes = false;
public XmlColor RamReadColor = Color.Blue;
public XmlColor RamWriteColor = Color.Red;
public XmlColor RamExecColor = Color.Green;
public XmlColor RamLabelledByteColor = Color.LightPink;
public XmlColor RamCodeByteColor = Color.DarkSeaGreen;
public XmlColor RamDataByteColor = Color.LightSteelBlue;
public XmlColor RamDmcDataByteColor = Color.Gold;
public XmlColor RamChrDrawnByteColor = Color.DarkSeaGreen;
public XmlColor RamChrReadByteColor = Color.LightSteelBlue;

9
GUI.NET/Debugger/ByteColorProvider.cs
View File

@ -25,11 +25,12 @@ namespace Mesen.GUI.Debugger
bool _hideReadBytes;
bool _hideWrittenBytes;
bool _hideExecutedBytes;
bool _highlightDmcDataBytes;
bool _highlightDataBytes;
bool _highlightCodeBytes;
bool _highlightLabelledBytes;
public ByteColorProvider(DebugMemoryType memoryType, bool showExec, bool showWrite, bool showRead, int framesToFade, bool hideUnusedBytes, bool hideReadBytes, bool hideWrittenBytes, bool hideExecutedBytes, bool highlightDataBytes, bool highlightCodeBytes, bool highlightLabelledBytes)
public ByteColorProvider(DebugMemoryType memoryType, bool showExec, bool showWrite, bool showRead, int framesToFade, bool hideUnusedBytes, bool hideReadBytes, bool hideWrittenBytes, bool hideExecutedBytes, bool highlightDmcDataBytes, bool highlightDataBytes, bool highlightCodeBytes, bool highlightLabelledBytes)
{
_memoryType = memoryType;
_showExec = showExec;
@ -40,6 +41,7 @@ namespace Mesen.GUI.Debugger
_hideReadBytes = hideReadBytes;
_hideWrittenBytes = hideWrittenBytes;
_hideExecutedBytes = hideExecutedBytes;
_highlightDmcDataBytes = highlightDmcDataBytes;
_highlightDataBytes = highlightDataBytes;
_highlightCodeBytes = highlightCodeBytes;
_highlightLabelledBytes = highlightLabelledBytes;
@ -59,7 +61,7 @@ namespace Mesen.GUI.Debugger
_execCounts = InteropEmu.DebugGetMemoryAccessCountsEx((UInt32)firstByteIndex, (UInt32)(lastByteIndex - firstByteIndex + 1), _memoryType, MemoryOperationType.Exec);
_cdlData = null;
if(_highlightDataBytes || _highlightCodeBytes || _highlightLabelledBytes) {
if(_highlightDmcDataBytes || _highlightDataBytes || _highlightCodeBytes || _highlightLabelledBytes) {
switch(_memoryType) {
case DebugMemoryType.ChrRom:
case DebugMemoryType.PpuMemory:
@ -115,6 +117,9 @@ namespace Mesen.GUI.Debugger
} else if((_cdlData[index] & 0x01) != 0 && _highlightCodeBytes) {
//Code
bgColor = ConfigManager.Config.DebugInfo.RamCodeByteColor;
} else if((_cdlData[index] & 0x40) != 0 && _highlightDmcDataBytes) {
//DMC channel Data
bgColor = ConfigManager.Config.DebugInfo.RamDmcDataByteColor;
} else if((_cdlData[index] & 0x02) != 0 && _highlightDataBytes) {
//Data
bgColor = ConfigManager.Config.DebugInfo.RamDataByteColor;

82
GUI.NET/Debugger/frmMemoryViewer.Designer.cs generated
View File

@ -47,9 +47,9 @@
this.mnuClose = new System.Windows.Forms.ToolStripMenuItem();
this.mnuView = new System.Windows.Forms.ToolStripMenuItem();
this.highlightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHightlightReads = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightWrites = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightExecution = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightWrites = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHightlightReads = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator();
this.fadeSpeedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnuFadeSlow = new System.Windows.Forms.ToolStripMenuItem();
@ -59,8 +59,11 @@
this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator();
this.mnuCustomFadeSpeed = new System.Windows.Forms.ToolStripMenuItem();
this.dataTypeHighlightingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightLabelledBytes = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripSeparator();
this.mnuHighlightCodeBytes = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightDataBytes = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightDmcDataBytes = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripSeparator();
this.mnuHighlightChrDrawnBytes = new System.Windows.Forms.ToolStripMenuItem();
this.mnuHighlightChrReadBytes = new System.Windows.Forms.ToolStripMenuItem();
@ -96,8 +99,6 @@
this.tpgProfiler = new System.Windows.Forms.TabPage();
this.ctrlProfiler = new Mesen.GUI.Debugger.Controls.ctrlProfiler();
this.tmrRefresh = new System.Windows.Forms.Timer(this.components);
this.mnuHighlightLabelledBytes = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripSeparator();
this.flowLayoutPanel1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
@ -271,34 +272,34 @@
this.highlightToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
this.highlightToolStripMenuItem.Text = "Memory Access Highlighting";
//
// mnuHightlightReads
// mnuHighlightExecution
//
this.mnuHightlightReads.CheckOnClick = true;
this.mnuHightlightReads.Name = "mnuHightlightReads";
this.mnuHightlightReads.Size = new System.Drawing.Size(152, 22);
this.mnuHightlightReads.Text = "Reads";
this.mnuHightlightReads.Click += new System.EventHandler(this.mnuColorProviderOptions_Click);
this.mnuHighlightExecution.CheckOnClick = true;
this.mnuHighlightExecution.Name = "mnuHighlightExecution";
this.mnuHighlightExecution.Size = new System.Drawing.Size(133, 22);
this.mnuHighlightExecution.Text = "Execution";
this.mnuHighlightExecution.Click += new System.EventHandler(this.mnuColorProviderOptions_Click);
//
// mnuHighlightWrites
//
this.mnuHighlightWrites.CheckOnClick = true;
this.mnuHighlightWrites.Name = "mnuHighlightWrites";
this.mnuHighlightWrites.Size = new System.Drawing.Size(152, 22);
this.mnuHighlightWrites.Size = new System.Drawing.Size(133, 22);
this.mnuHighlightWrites.Text = "Writes";
this.mnuHighlightWrites.Click += new System.EventHandler(this.mnuColorProviderOptions_Click);
//
// mnuHighlightExecution
// mnuHightlightReads
//
this.mnuHighlightExecution.CheckOnClick = true;
this.mnuHighlightExecution.Name = "mnuHighlightExecution";
this.mnuHighlightExecution.Size = new System.Drawing.Size(152, 22);
this.mnuHighlightExecution.Text = "Execution";
this.mnuHighlightExecution.Click += new System.EventHandler(this.mnuColorProviderOptions_Click);
this.mnuHightlightReads.CheckOnClick = true;
this.mnuHightlightReads.Name = "mnuHightlightReads";
this.mnuHightlightReads.Size = new System.Drawing.Size(133, 22);
this.mnuHightlightReads.Text = "Reads";
this.mnuHightlightReads.Click += new System.EventHandler(this.mnuColorProviderOptions_Click);
//
// toolStripMenuItem6
//
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(149, 6);
this.toolStripMenuItem6.Size = new System.Drawing.Size(130, 6);
//
// fadeSpeedToolStripMenuItem
//
@ -310,7 +311,7 @@
this.toolStripMenuItem7,
this.mnuCustomFadeSpeed});
this.fadeSpeedToolStripMenuItem.Name = "fadeSpeedToolStripMenuItem";
this.fadeSpeedToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.fadeSpeedToolStripMenuItem.Size = new System.Drawing.Size(133, 22);
this.fadeSpeedToolStripMenuItem.Text = "Fade speed";
//
// mnuFadeSlow
@ -362,6 +363,7 @@
this.toolStripMenuItem8,
this.mnuHighlightCodeBytes,
this.mnuHighlightDataBytes,
this.mnuHighlightDmcDataBytes,
this.toolStripMenuItem11,
this.mnuHighlightChrDrawnBytes,
this.mnuHighlightChrReadBytes});
@ -369,37 +371,56 @@
this.dataTypeHighlightingToolStripMenuItem.Size = new System.Drawing.Size(248, 22);
this.dataTypeHighlightingToolStripMenuItem.Text = "Data Type Highlighting";
//
// mnuHighlightLabelledBytes
//
this.mnuHighlightLabelledBytes.CheckOnClick = true;
this.mnuHighlightLabelledBytes.Name = "mnuHighlightLabelledBytes";
this.mnuHighlightLabelledBytes.Size = new System.Drawing.Size(236, 22);
this.mnuHighlightLabelledBytes.Text = "Labelled bytes";
//
// toolStripMenuItem8
//
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(233, 6);
//
// mnuHighlightCodeBytes
//
this.mnuHighlightCodeBytes.CheckOnClick = true;
this.mnuHighlightCodeBytes.Name = "mnuHighlightCodeBytes";
this.mnuHighlightCodeBytes.Size = new System.Drawing.Size(204, 22);
this.mnuHighlightCodeBytes.Size = new System.Drawing.Size(236, 22);
this.mnuHighlightCodeBytes.Text = "Code bytes (PRG ROM)";
//
// mnuHighlightDataBytes
//
this.mnuHighlightDataBytes.CheckOnClick = true;
this.mnuHighlightDataBytes.Name = "mnuHighlightDataBytes";
this.mnuHighlightDataBytes.Size = new System.Drawing.Size(204, 22);
this.mnuHighlightDataBytes.Size = new System.Drawing.Size(236, 22);
this.mnuHighlightDataBytes.Text = "Data bytes (PRG ROM)";
//
// mnuHighlightDmcDataBytes
//
this.mnuHighlightDmcDataBytes.CheckOnClick = true;
this.mnuHighlightDmcDataBytes.Name = "mnuHighlightDmcDataBytes";
this.mnuHighlightDmcDataBytes.Size = new System.Drawing.Size(236, 22);
this.mnuHighlightDmcDataBytes.Text = "DMC sample bytes (PRG ROM)";
//
// toolStripMenuItem11
//
this.toolStripMenuItem11.Name = "toolStripMenuItem11";
this.toolStripMenuItem11.Size = new System.Drawing.Size(201, 6);
this.toolStripMenuItem11.Size = new System.Drawing.Size(233, 6);
//
// mnuHighlightChrDrawnBytes
//
this.mnuHighlightChrDrawnBytes.CheckOnClick = true;
this.mnuHighlightChrDrawnBytes.Name = "mnuHighlightChrDrawnBytes";
this.mnuHighlightChrDrawnBytes.Size = new System.Drawing.Size(204, 22);
this.mnuHighlightChrDrawnBytes.Size = new System.Drawing.Size(236, 22);
this.mnuHighlightChrDrawnBytes.Text = "Drawn bytes (CHR ROM)";
//
// mnuHighlightChrReadBytes
//
this.mnuHighlightChrReadBytes.CheckOnClick = true;
this.mnuHighlightChrReadBytes.Name = "mnuHighlightChrReadBytes";
this.mnuHighlightChrReadBytes.Size = new System.Drawing.Size(204, 22);
this.mnuHighlightChrReadBytes.Size = new System.Drawing.Size(236, 22);
this.mnuHighlightChrReadBytes.Text = "Read bytes (CHR ROM)";
//
// fadeToolStripMenuItem
@ -687,18 +708,6 @@
this.tmrRefresh.Enabled = true;
this.tmrRefresh.Tick += new System.EventHandler(this.tmrRefresh_Tick);
//
// mnuHighlightLabelledBytes
//
this.mnuHighlightLabelledBytes.CheckOnClick = true;
this.mnuHighlightLabelledBytes.Name = "mnuHighlightLabelledBytes";
this.mnuHighlightLabelledBytes.Size = new System.Drawing.Size(204, 22);
this.mnuHighlightLabelledBytes.Text = "Labelled bytes";
//
// toolStripMenuItem8
//
this.toolStripMenuItem8.Name = "toolStripMenuItem8";
this.toolStripMenuItem8.Size = new System.Drawing.Size(201, 6);
//
// frmMemoryViewer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -796,5 +805,6 @@
private System.Windows.Forms.ToolStripMenuItem mnuShowLabelInfoOnMouseOver;
private System.Windows.Forms.ToolStripMenuItem mnuHighlightLabelledBytes;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem8;
private System.Windows.Forms.ToolStripMenuItem mnuHighlightDmcDataBytes;
}
}

3
GUI.NET/Debugger/frmMemoryViewer.cs
View File

@ -51,6 +51,7 @@ namespace Mesen.GUI.Debugger
this.mnuHighlightChrReadBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightChrReadBytes;
this.mnuHighlightCodeBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightCodeBytes;
this.mnuHighlightDataBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightDataBytes;
this.mnuHighlightDmcDataBytes.Checked = ConfigManager.Config.DebugInfo.RamHighlightDmcDataBytes;
this.UpdateFadeOptions();
@ -133,6 +134,7 @@ namespace Mesen.GUI.Debugger
mnuHideReadBytes.Checked,
mnuHideWrittenBytes.Checked,
mnuHideExecutedBytes.Checked,
mnuHighlightDmcDataBytes.Checked,
mnuHighlightDataBytes.Checked,
mnuHighlightCodeBytes.Checked,
mnuHighlightLabelledBytes.Checked
@ -239,6 +241,7 @@ namespace Mesen.GUI.Debugger
ConfigManager.Config.DebugInfo.RamHighlightChrReadBytes = this.mnuHighlightChrReadBytes.Checked;
ConfigManager.Config.DebugInfo.RamHighlightCodeBytes = this.mnuHighlightCodeBytes.Checked;
ConfigManager.Config.DebugInfo.RamHighlightDataBytes = this.mnuHighlightDataBytes.Checked;
ConfigManager.Config.DebugInfo.RamHighlightDmcDataBytes = this.mnuHighlightDmcDataBytes.Checked;
ConfigManager.ApplyChanges();
}

155
GUI.NET/Debugger/frmMemoryViewerColors.Designer.cs generated
View File

@ -31,30 +31,33 @@
this.picChrDrawnByte = new System.Windows.Forms.PictureBox();
this.lblChrDrawnByte = new System.Windows.Forms.Label();
this.lblCodeByte = new System.Windows.Forms.Label();
this.lblRead = new System.Windows.Forms.Label();
this.picRead = new System.Windows.Forms.PictureBox();
this.lblWrite = new System.Windows.Forms.Label();
this.lblExecute = new System.Windows.Forms.Label();
this.picCodeByte = new System.Windows.Forms.PictureBox();
this.picWrite = new System.Windows.Forms.PictureBox();
this.picExecute = new System.Windows.Forms.PictureBox();
this.picDataByte = new System.Windows.Forms.PictureBox();
this.picChrReadByte = new System.Windows.Forms.PictureBox();
this.lblChrReadByte = new System.Windows.Forms.Label();
this.lblDataByte = new System.Windows.Forms.Label();
this.btnReset = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.picLabelledByte = new System.Windows.Forms.PictureBox();
this.lblRead = new System.Windows.Forms.Label();
this.lblExecute = new System.Windows.Forms.Label();
this.picRead = new System.Windows.Forms.PictureBox();
this.picExecute = new System.Windows.Forms.PictureBox();
this.btnReset = new System.Windows.Forms.Button();
this.lblDmcDataByte = new System.Windows.Forms.Label();
this.picDmcDataByte = new System.Windows.Forms.PictureBox();
this.baseConfigPanel.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picChrDrawnByte)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picRead)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCodeByte)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picWrite)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picExecute)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picDataByte)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picChrReadByte)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picLabelledByte)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picRead)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picExecute)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picDmcDataByte)).BeginInit();
this.SuspendLayout();
//
// baseConfigPanel
@ -91,6 +94,8 @@
this.tableLayoutPanel1.Controls.Add(this.lblExecute, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.picRead, 7, 0);
this.tableLayoutPanel1.Controls.Add(this.picExecute, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.lblDmcDataByte, 6, 2);
this.tableLayoutPanel1.Controls.Add(this.picDmcDataByte, 7, 2);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@ -136,27 +141,6 @@
this.lblCodeByte.TabIndex = 2;
this.lblCodeByte.Text = "Code Byte:";
//
// lblRead
//
this.lblRead.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblRead.AutoSize = true;
this.lblRead.Location = new System.Drawing.Point(317, 12);
this.lblRead.Name = "lblRead";
this.lblRead.Size = new System.Drawing.Size(36, 13);
this.lblRead.TabIndex = 0;
this.lblRead.Text = "Read:";
//
// picRead
//
this.picRead.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picRead.Cursor = System.Windows.Forms.Cursors.Hand;
this.picRead.Location = new System.Drawing.Point(416, 3);
this.picRead.Name = "picRead";
this.picRead.Size = new System.Drawing.Size(32, 32);
this.picRead.TabIndex = 5;
this.picRead.TabStop = false;
this.picRead.Click += new System.EventHandler(this.picColorPicker_Click);
//
// lblWrite
//
this.lblWrite.Anchor = System.Windows.Forms.AnchorStyles.Left;
@ -167,16 +151,6 @@
this.lblWrite.TabIndex = 10;
this.lblWrite.Text = "Write:";
//
// lblExecute
//
this.lblExecute.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblExecute.AutoSize = true;
this.lblExecute.Location = new System.Drawing.Point(3, 12);
this.lblExecute.Name = "lblExecute";
this.lblExecute.Size = new System.Drawing.Size(49, 13);
this.lblExecute.TabIndex = 11;
this.lblExecute.Text = "Execute:";
//
// picCodeByte
//
this.picCodeByte.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@ -199,17 +173,6 @@
this.picWrite.TabStop = false;
this.picWrite.Click += new System.EventHandler(this.picColorPicker_Click);
//
// picExecute
//
this.picExecute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picExecute.Cursor = System.Windows.Forms.Cursors.Hand;
this.picExecute.Location = new System.Drawing.Point(102, 3);
this.picExecute.Name = "picExecute";
this.picExecute.Size = new System.Drawing.Size(32, 32);
this.picExecute.TabIndex = 9;
this.picExecute.TabStop = false;
this.picExecute.Click += new System.EventHandler(this.picColorPicker_Click);
//
// picDataByte
//
this.picDataByte.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@ -252,16 +215,6 @@
this.lblDataByte.TabIndex = 1;
this.lblDataByte.Text = "Data Byte:";
//
// btnReset
//
this.btnReset.Location = new System.Drawing.Point(3, 3);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(102, 23);
this.btnReset.TabIndex = 3;
this.btnReset.Text = "Use default colors";
this.btnReset.UseVisualStyleBackColor = true;
this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
//
// label1
//
this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
@ -272,17 +225,90 @@
this.label1.TabIndex = 14;
this.label1.Text = "Labelled Byte:";
//
// picLabelByte
// picLabelledByte
//
this.picLabelledByte.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picLabelledByte.Cursor = System.Windows.Forms.Cursors.Hand;
this.picLabelledByte.Location = new System.Drawing.Point(102, 41);
this.picLabelledByte.Name = "picLabelByte";
this.picLabelledByte.Name = "picLabelledByte";
this.picLabelledByte.Size = new System.Drawing.Size(32, 32);
this.picLabelledByte.TabIndex = 15;
this.picLabelledByte.TabStop = false;
this.picLabelledByte.Click += new System.EventHandler(this.picColorPicker_Click);
//
// lblRead
//
this.lblRead.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblRead.AutoSize = true;
this.lblRead.Location = new System.Drawing.Point(317, 12);
this.lblRead.Name = "lblRead";
this.lblRead.Size = new System.Drawing.Size(36, 13);
this.lblRead.TabIndex = 0;
this.lblRead.Text = "Read:";
//
// lblExecute
//
this.lblExecute.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblExecute.AutoSize = true;
this.lblExecute.Location = new System.Drawing.Point(3, 12);
this.lblExecute.Name = "lblExecute";
this.lblExecute.Size = new System.Drawing.Size(49, 13);
this.lblExecute.TabIndex = 11;
this.lblExecute.Text = "Execute:";
//
// picRead
//
this.picRead.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picRead.Cursor = System.Windows.Forms.Cursors.Hand;
this.picRead.Location = new System.Drawing.Point(416, 3);
this.picRead.Name = "picRead";
this.picRead.Size = new System.Drawing.Size(32, 32);
this.picRead.TabIndex = 5;
this.picRead.TabStop = false;
this.picRead.Click += new System.EventHandler(this.picColorPicker_Click);
//
// picExecute
//
this.picExecute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picExecute.Cursor = System.Windows.Forms.Cursors.Hand;
this.picExecute.Location = new System.Drawing.Point(102, 3);
this.picExecute.Name = "picExecute";
this.picExecute.Size = new System.Drawing.Size(32, 32);
this.picExecute.TabIndex = 9;
this.picExecute.TabStop = false;
this.picExecute.Click += new System.EventHandler(this.picColorPicker_Click);
//
// btnReset
//
this.btnReset.Location = new System.Drawing.Point(3, 3);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(102, 23);
this.btnReset.TabIndex = 3;
this.btnReset.Text = "Use default colors";
this.btnReset.UseVisualStyleBackColor = true;
this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
//
// lblDmcDataByte
//
this.lblDmcDataByte.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblDmcDataByte.AutoSize = true;
this.lblDmcDataByte.Location = new System.Drawing.Point(317, 88);
this.lblDmcDataByte.Name = "lblDmcDataByte";
this.lblDmcDataByte.Size = new System.Drawing.Size(93, 13);
this.lblDmcDataByte.TabIndex = 16;
this.lblDmcDataByte.Text = "DMC sample byte:";
//
// picDmcDataByte
//
this.picDmcDataByte.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picDmcDataByte.Cursor = System.Windows.Forms.Cursors.Hand;
this.picDmcDataByte.Location = new System.Drawing.Point(416, 79);
this.picDmcDataByte.Name = "picDmcDataByte";
this.picDmcDataByte.Size = new System.Drawing.Size(32, 32);
this.picDmcDataByte.TabIndex = 17;
this.picDmcDataByte.TabStop = false;
this.picDmcDataByte.Click += new System.EventHandler(this.picColorPicker_Click);
//
// frmMemoryViewerColors
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -298,13 +324,14 @@
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.picChrDrawnByte)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picRead)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCodeByte)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picWrite)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picExecute)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picDataByte)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picChrReadByte)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picLabelledByte)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picRead)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picExecute)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picDmcDataByte)).EndInit();
this.ResumeLayout(false);
}
@ -329,5 +356,7 @@
private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.PictureBox picLabelledByte;
private System.Windows.Forms.Label lblDmcDataByte;
private System.Windows.Forms.PictureBox picDmcDataByte;
}
}

3
GUI.NET/Debugger/frmMemoryViewerColors.cs
View File

@ -24,6 +24,7 @@ namespace Mesen.GUI.Debugger
picLabelledByte.BackColor = ConfigManager.Config.DebugInfo.RamLabelledByteColor;
picCodeByte.BackColor = ConfigManager.Config.DebugInfo.RamCodeByteColor;
picDataByte.BackColor = ConfigManager.Config.DebugInfo.RamDataByteColor;
picDmcDataByte.BackColor = ConfigManager.Config.DebugInfo.RamDmcDataByteColor;
picChrDrawnByte.BackColor = ConfigManager.Config.DebugInfo.RamChrDrawnByteColor;
picChrReadByte.BackColor = ConfigManager.Config.DebugInfo.RamChrReadByteColor;
}
@ -51,6 +52,7 @@ namespace Mesen.GUI.Debugger
ConfigManager.Config.DebugInfo.RamLabelledByteColor = picLabelledByte.BackColor;
ConfigManager.Config.DebugInfo.RamCodeByteColor = picCodeByte.BackColor;
ConfigManager.Config.DebugInfo.RamDataByteColor = picDataByte.BackColor;
ConfigManager.Config.DebugInfo.RamDmcDataByteColor = picDmcDataByte.BackColor;
ConfigManager.Config.DebugInfo.RamChrDrawnByteColor = picChrDrawnByte.BackColor;
ConfigManager.Config.DebugInfo.RamChrReadByteColor = picChrReadByte.BackColor;
ConfigManager.ApplyChanges();
@ -65,6 +67,7 @@ namespace Mesen.GUI.Debugger
picLabelledByte.BackColor = Color.LightPink;
picCodeByte.BackColor = Color.DarkSeaGreen;
picDataByte.BackColor = Color.LightSteelBlue;
picDmcDataByte.BackColor = Color.Gold;
picChrDrawnByte.BackColor = Color.DarkSeaGreen;
picChrReadByte.BackColor = Color.LightSteelBlue;
}