libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2024-11-23 17:19:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debugger: Added "Break on uninitialized memory read" option

Browse Source
This commit is contained in:
Sour 2018-06-07 19:32:34 -04:00
parent b20a085734
commit 8f6daaf9a9
9 changed files with 94 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/Debugger.cpp
View File

@ -86,6 +86,9 @@ Debugger::Debugger(shared_ptr<Console> console, shared_ptr<CPU> cpu, shared_ptr<
_curInstructionCycle = 0; _curInstructionCycle = 0;
_needRewind = false; _needRewind = false;
//Only enable break on uninitialized reads when debugger is opened at power on/reset
_enableBreakOnUninitRead = _cpu->GetPC() == 0;
_executionStopped = false; _executionStopped = false;
_disassemblerOutput = ""; _disassemblerOutput = "";
@ -571,7 +574,13 @@ bool Debugger::PrivateProcessRamOperation(MemoryOperationType type, uint16_t &ad
_memoryAccessCounter->ProcessMemoryAccess(addressInfo, type, _cpu->GetCycleCount()); _memoryAccessCounter->ProcessMemoryAccess(addressInfo, type, _cpu->GetCycleCount());
} }
} else { } else {
_memoryAccessCounter->ProcessMemoryAccess(addressInfo, type, _cpu->GetCycleCount()); if(_memoryAccessCounter->ProcessMemoryAccess(addressInfo, type, _cpu->GetCycleCount())) {
if(_enableBreakOnUninitRead && CheckFlag(DebuggerFlags::BreakOnUninitMemoryRead)) {
//Break on uninit memory read
Step(1);
breakDone = SleepUntilResume();
}
}
} }
} }
@ -1403,6 +1412,8 @@ void Debugger::ProcessEvent(EventType type)
AddDebugEvent(DebugEventType::Irq); AddDebugEvent(DebugEventType::Irq);
} else if(type == EventType::SpriteZeroHit) { } else if(type == EventType::SpriteZeroHit) {
AddDebugEvent(DebugEventType::SpriteZeroHit); AddDebugEvent(DebugEventType::SpriteZeroHit);
} else if(type == EventType::Reset) {
_enableBreakOnUninitRead = true;
} }
} }

2
Core/Debugger.h
View File

@ -102,6 +102,8 @@ private:
atomic<bool> _stepOut; atomic<bool> _stepOut;
atomic<int32_t> _stepOverAddr; atomic<int32_t> _stepOverAddr;
bool _enableBreakOnUninitRead;
atomic<bool> _breakRequested; atomic<bool> _breakRequested;
bool _pausedForDebugHelper; bool _pausedForDebugHelper;

13
Core/DebuggerTypes.h
View File

@ -12,15 +12,16 @@ enum class DebuggerFlags
DisplayOpCodesInLowerCase = 0x08, DisplayOpCodesInLowerCase = 0x08,
BreakOnBrk = 0x10, BreakOnBrk = 0x10,
BreakOnUnofficialOpCode = 0x20, BreakOnUnofficialOpCode = 0x20,
BreakOnUninitMemoryRead = 0x40,
DisassembleVerifiedData = 0x40, DisassembleVerifiedData = 0x80,
DisassembleUnidentifiedData = 0x80, DisassembleUnidentifiedData = 0x100,
ShowVerifiedData = 0x100, ShowVerifiedData = 0x200,
ShowUnidentifiedData = 0x200, ShowUnidentifiedData = 0x400,
IgnoreRedundantWrites = 0x400, IgnoreRedundantWrites = 0x800,
HidePauseIcon = 0x800 HidePauseIcon = 0x1000
}; };
enum class BreakSource enum class BreakSource

13
Core/MemoryAccessCounter.cpp
View File

@ -42,7 +42,7 @@ vector<int32_t>& MemoryAccessCounter::GetArray(MemoryOperationType operationType
} }
} }
void MemoryAccessCounter::ProcessMemoryAccess(AddressTypeInfo &addressInfo, MemoryOperationType operation, int32_t cpuCycle) bool MemoryAccessCounter::ProcessMemoryAccess(AddressTypeInfo &addressInfo, MemoryOperationType operation, int32_t cpuCycle)
{ {
int index = (int)addressInfo.Type; int index = (int)addressInfo.Type;
vector<int> &counts = GetArray(operation, addressInfo.Type, false); vector<int> &counts = GetArray(operation, addressInfo.Type, false);
@ -51,14 +51,15 @@ void MemoryAccessCounter::ProcessMemoryAccess(AddressTypeInfo &addressInfo, Memo
vector<int> &stamps = GetArray(operation, addressInfo.Type, true); vector<int> &stamps = GetArray(operation, addressInfo.Type, true);
stamps.data()[addressInfo.Address] = cpuCycle; stamps.data()[addressInfo.Address] = cpuCycle;
if(operation != MemoryOperationType::Write && if(operation == MemoryOperationType::Write) {
(addressInfo.Type == AddressType::InternalRam || addressInfo.Type == AddressType::WorkRam) && _initWrites[index][addressInfo.Address] = true;
!_initWrites[index][addressInfo.Address]) { } else if((addressInfo.Type == AddressType::InternalRam || addressInfo.Type == AddressType::WorkRam) && !_initWrites[index][addressInfo.Address]) {
//Mark address as read before being written to (if trying to read/execute) //Mark address as read before being written to (if trying to read/execute)
_uninitReads[index][addressInfo.Address] = true; _uninitReads[index][addressInfo.Address] = true;
} else if(operation == MemoryOperationType::Write) { return true;
_initWrites[index][addressInfo.Address] = true;
} }
return false;
} }
void MemoryAccessCounter::ResetCounts() void MemoryAccessCounter::ResetCounts()

2
Core/MemoryAccessCounter.h
View File

@ -25,7 +25,7 @@ private:
public: public:
MemoryAccessCounter(Debugger* debugger); MemoryAccessCounter(Debugger* debugger);
void ProcessMemoryAccess(AddressTypeInfo &addressInfo, MemoryOperationType operation, int32_t cpuCycle); bool ProcessMemoryAccess(AddressTypeInfo &addressInfo, MemoryOperationType operation, int32_t cpuCycle);
void ResetCounts(); void ResetCounts();
void GetAccessCounts(AddressType memoryType, MemoryOperationType operationType, uint32_t counts[], bool forUninitReads); void GetAccessCounts(AddressType memoryType, MemoryOperationType operationType, uint32_t counts[], bool forUninitReads);

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

@ -284,6 +284,7 @@ namespace Mesen.GUI.Config
public bool BreakOnBrk = false; public bool BreakOnBrk = false;
public bool BreakOnDebuggerFocus = false; public bool BreakOnDebuggerFocus = false;
public bool BreakOnCrash = false; public bool BreakOnCrash = false;
public bool BreakOnUninitMemoryRead = false;
public bool BringToFrontOnPause = false; public bool BringToFrontOnPause = false;
public bool BringToFrontOnBreak = true; public bool BringToFrontOnBreak = true;

81
GUI.NET/Debugger/frmDebugger.Designer.cs generated
View File

@ -130,6 +130,7 @@ namespace Mesen.GUI.Debugger
this.mnuBreakOnUnofficialOpcodes = new System.Windows.Forms.ToolStripMenuItem(); this.mnuBreakOnUnofficialOpcodes = new System.Windows.Forms.ToolStripMenuItem();
this.mnuBreakOnBrk = new System.Windows.Forms.ToolStripMenuItem(); this.mnuBreakOnBrk = new System.Windows.Forms.ToolStripMenuItem();
this.mnuBreakOnCrash = new System.Windows.Forms.ToolStripMenuItem(); this.mnuBreakOnCrash = new System.Windows.Forms.ToolStripMenuItem();
this.mnuBreakOnUninitMemoryRead = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripSeparator();
this.mnuBreakOnOpen = new System.Windows.Forms.ToolStripMenuItem(); this.mnuBreakOnOpen = new System.Windows.Forms.ToolStripMenuItem();
this.mnuBreakOnDebuggerFocus = new System.Windows.Forms.ToolStripMenuItem(); this.mnuBreakOnDebuggerFocus = new System.Windows.Forms.ToolStripMenuItem();
@ -251,7 +252,7 @@ namespace Mesen.GUI.Debugger
this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel10); this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel10);
this.splitContainer.Panel2MinSize = 100; this.splitContainer.Panel2MinSize = 100;
this.splitContainer.Size = new System.Drawing.Size(1075, 765); this.splitContainer.Size = new System.Drawing.Size(1075, 765);
this.splitContainer.SplitterDistance = 582; this.splitContainer.SplitterDistance = 576;
this.splitContainer.SplitterWidth = 7; this.splitContainer.SplitterWidth = 7;
this.splitContainer.TabIndex = 1; this.splitContainer.TabIndex = 1;
this.splitContainer.TabStop = false; this.splitContainer.TabStop = false;
@ -275,7 +276,7 @@ namespace Mesen.GUI.Debugger
// //
this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists); this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists);
this.ctrlSplitContainerTop.Panel2MinSize = 150; this.ctrlSplitContainerTop.Panel2MinSize = 150;
this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 582); this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 576);
this.ctrlSplitContainerTop.SplitterDistance = 750; this.ctrlSplitContainerTop.SplitterDistance = 750;
this.ctrlSplitContainerTop.SplitterWidth = 7; this.ctrlSplitContainerTop.SplitterWidth = 7;
this.ctrlSplitContainerTop.TabIndex = 3; this.ctrlSplitContainerTop.TabIndex = 3;
@ -296,8 +297,8 @@ namespace Mesen.GUI.Debugger
this.tlpTop.Name = "tlpTop"; this.tlpTop.Name = "tlpTop";
this.tlpTop.RowCount = 1; 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.Percent, 100F));
this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 582F)); this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 576F));
this.tlpTop.Size = new System.Drawing.Size(750, 582); this.tlpTop.Size = new System.Drawing.Size(750, 576);
this.tlpTop.TabIndex = 2; this.tlpTop.TabIndex = 2;
// //
// panel1 // panel1
@ -308,7 +309,7 @@ namespace Mesen.GUI.Debugger
this.panel1.Location = new System.Drawing.Point(3, 0); this.panel1.Location = new System.Drawing.Point(3, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); this.panel1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(286, 582); this.panel1.Size = new System.Drawing.Size(286, 576);
this.panel1.TabIndex = 5; this.panel1.TabIndex = 5;
// //
// ctrlSourceViewer // ctrlSourceViewer
@ -317,7 +318,7 @@ namespace Mesen.GUI.Debugger
this.ctrlSourceViewer.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlSourceViewer.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlSourceViewer.Location = new System.Drawing.Point(0, 0); this.ctrlSourceViewer.Location = new System.Drawing.Point(0, 0);
this.ctrlSourceViewer.Name = "ctrlSourceViewer"; this.ctrlSourceViewer.Name = "ctrlSourceViewer";
this.ctrlSourceViewer.Size = new System.Drawing.Size(286, 582); this.ctrlSourceViewer.Size = new System.Drawing.Size(286, 576);
this.ctrlSourceViewer.SymbolProvider = null; this.ctrlSourceViewer.SymbolProvider = null;
this.ctrlSourceViewer.TabIndex = 7; this.ctrlSourceViewer.TabIndex = 7;
this.ctrlSourceViewer.Visible = false; this.ctrlSourceViewer.Visible = false;
@ -331,7 +332,7 @@ namespace Mesen.GUI.Debugger
this.ctrlDebuggerCode.Location = new System.Drawing.Point(0, 0); this.ctrlDebuggerCode.Location = new System.Drawing.Point(0, 0);
this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; this.ctrlDebuggerCode.Name = "ctrlDebuggerCode";
this.ctrlDebuggerCode.ShowMemoryValues = false; this.ctrlDebuggerCode.ShowMemoryValues = false;
this.ctrlDebuggerCode.Size = new System.Drawing.Size(286, 582); this.ctrlDebuggerCode.Size = new System.Drawing.Size(286, 576);
this.ctrlDebuggerCode.SymbolProvider = null; this.ctrlDebuggerCode.SymbolProvider = null;
this.ctrlDebuggerCode.TabIndex = 2; this.ctrlDebuggerCode.TabIndex = 2;
this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode); this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode);
@ -345,7 +346,7 @@ namespace Mesen.GUI.Debugger
this.panel2.Location = new System.Drawing.Point(292, 0); this.panel2.Location = new System.Drawing.Point(292, 0);
this.panel2.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.panel2.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1, 582); this.panel2.Size = new System.Drawing.Size(1, 576);
this.panel2.TabIndex = 6; this.panel2.TabIndex = 6;
// //
// ctrlSourceViewerSplit // ctrlSourceViewerSplit
@ -354,7 +355,7 @@ namespace Mesen.GUI.Debugger
this.ctrlSourceViewerSplit.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlSourceViewerSplit.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlSourceViewerSplit.Location = new System.Drawing.Point(0, 0); this.ctrlSourceViewerSplit.Location = new System.Drawing.Point(0, 0);
this.ctrlSourceViewerSplit.Name = "ctrlSourceViewerSplit"; this.ctrlSourceViewerSplit.Name = "ctrlSourceViewerSplit";
this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 582); this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 576);
this.ctrlSourceViewerSplit.SymbolProvider = null; this.ctrlSourceViewerSplit.SymbolProvider = null;
this.ctrlSourceViewerSplit.TabIndex = 8; this.ctrlSourceViewerSplit.TabIndex = 8;
this.ctrlSourceViewerSplit.Visible = false; this.ctrlSourceViewerSplit.Visible = false;
@ -368,7 +369,7 @@ namespace Mesen.GUI.Debugger
this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(0, 0); this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(0, 0);
this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit"; this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit";
this.ctrlDebuggerCodeSplit.ShowMemoryValues = false; this.ctrlDebuggerCodeSplit.ShowMemoryValues = false;
this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 582); this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 576);
this.ctrlDebuggerCodeSplit.SymbolProvider = null; this.ctrlDebuggerCodeSplit.SymbolProvider = null;
this.ctrlDebuggerCodeSplit.TabIndex = 4; this.ctrlDebuggerCodeSplit.TabIndex = 4;
this.ctrlDebuggerCodeSplit.Visible = false; this.ctrlDebuggerCodeSplit.Visible = false;
@ -388,7 +389,7 @@ namespace Mesen.GUI.Debugger
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); 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.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 582); this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 576);
this.tableLayoutPanel1.TabIndex = 7; this.tableLayoutPanel1.TabIndex = 7;
// //
// ctrlConsoleStatus // ctrlConsoleStatus
@ -412,7 +413,7 @@ namespace Mesen.GUI.Debugger
this.tlpVerticalLayout.Name = "tlpVerticalLayout"; this.tlpVerticalLayout.Name = "tlpVerticalLayout";
this.tlpVerticalLayout.RowCount = 1; this.tlpVerticalLayout.RowCount = 1;
this.tlpVerticalLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpVerticalLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 182); this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 176);
this.tlpVerticalLayout.TabIndex = 4; this.tlpVerticalLayout.TabIndex = 4;
// //
// tlpFunctionLabelLists // tlpFunctionLabelLists
@ -428,16 +429,16 @@ namespace Mesen.GUI.Debugger
this.tlpFunctionLabelLists.RowCount = 2; 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.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, 582); this.tlpFunctionLabelLists.Size = new System.Drawing.Size(318, 576);
this.tlpFunctionLabelLists.TabIndex = 5; this.tlpFunctionLabelLists.TabIndex = 5;
// //
// grpLabels // grpLabels
// //
this.grpLabels.Controls.Add(this.ctrlLabelList); this.grpLabels.Controls.Add(this.ctrlLabelList);
this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill; this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpLabels.Location = new System.Drawing.Point(3, 294); this.grpLabels.Location = new System.Drawing.Point(3, 291);
this.grpLabels.Name = "grpLabels"; this.grpLabels.Name = "grpLabels";
this.grpLabels.Size = new System.Drawing.Size(312, 285); this.grpLabels.Size = new System.Drawing.Size(312, 282);
this.grpLabels.TabIndex = 6; this.grpLabels.TabIndex = 6;
this.grpLabels.TabStop = false; this.grpLabels.TabStop = false;
this.grpLabels.Text = "Labels"; this.grpLabels.Text = "Labels";
@ -447,7 +448,7 @@ namespace Mesen.GUI.Debugger
this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlLabelList.Location = new System.Drawing.Point(3, 16); this.ctrlLabelList.Location = new System.Drawing.Point(3, 16);
this.ctrlLabelList.Name = "ctrlLabelList"; this.ctrlLabelList.Name = "ctrlLabelList";
this.ctrlLabelList.Size = new System.Drawing.Size(306, 266); this.ctrlLabelList.Size = new System.Drawing.Size(306, 263);
this.ctrlLabelList.TabIndex = 0; this.ctrlLabelList.TabIndex = 0;
this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence); this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence);
this.ctrlLabelList.OnLabelSelected += new System.EventHandler(this.ctrlLabelList_OnLabelSelected); this.ctrlLabelList.OnLabelSelected += new System.EventHandler(this.ctrlLabelList_OnLabelSelected);
@ -458,7 +459,7 @@ namespace Mesen.GUI.Debugger
this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill; this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpFunctions.Location = new System.Drawing.Point(3, 3); this.grpFunctions.Location = new System.Drawing.Point(3, 3);
this.grpFunctions.Name = "grpFunctions"; this.grpFunctions.Name = "grpFunctions";
this.grpFunctions.Size = new System.Drawing.Size(312, 285); this.grpFunctions.Size = new System.Drawing.Size(312, 282);
this.grpFunctions.TabIndex = 5; this.grpFunctions.TabIndex = 5;
this.grpFunctions.TabStop = false; this.grpFunctions.TabStop = false;
this.grpFunctions.Text = "Functions"; this.grpFunctions.Text = "Functions";
@ -468,7 +469,7 @@ namespace Mesen.GUI.Debugger
this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16); this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16);
this.ctrlFunctionList.Name = "ctrlFunctionList"; this.ctrlFunctionList.Name = "ctrlFunctionList";
this.ctrlFunctionList.Size = new System.Drawing.Size(306, 266); this.ctrlFunctionList.Size = new System.Drawing.Size(306, 263);
this.ctrlFunctionList.TabIndex = 0; this.ctrlFunctionList.TabIndex = 0;
this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence); this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence);
this.ctrlFunctionList.OnFunctionSelected += new System.EventHandler(this.ctrlFunctionList_OnFunctionSelected); this.ctrlFunctionList.OnFunctionSelected += new System.EventHandler(this.ctrlFunctionList_OnFunctionSelected);
@ -499,7 +500,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(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.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 176); this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 182);
this.tableLayoutPanel10.TabIndex = 0; this.tableLayoutPanel10.TabIndex = 0;
// //
// grpWatch // grpWatch
@ -508,7 +509,7 @@ namespace Mesen.GUI.Debugger
this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill; this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpWatch.Location = new System.Drawing.Point(3, 3); this.grpWatch.Location = new System.Drawing.Point(3, 3);
this.grpWatch.Name = "grpWatch"; this.grpWatch.Name = "grpWatch";
this.grpWatch.Size = new System.Drawing.Size(352, 170); this.grpWatch.Size = new System.Drawing.Size(352, 176);
this.grpWatch.TabIndex = 2; this.grpWatch.TabIndex = 2;
this.grpWatch.TabStop = false; this.grpWatch.TabStop = false;
this.grpWatch.Text = "Watch"; this.grpWatch.Text = "Watch";
@ -518,7 +519,7 @@ namespace Mesen.GUI.Debugger
this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlWatch.Location = new System.Drawing.Point(3, 16); this.ctrlWatch.Location = new System.Drawing.Point(3, 16);
this.ctrlWatch.Name = "ctrlWatch"; this.ctrlWatch.Name = "ctrlWatch";
this.ctrlWatch.Size = new System.Drawing.Size(346, 151); this.ctrlWatch.Size = new System.Drawing.Size(346, 157);
this.ctrlWatch.TabIndex = 0; this.ctrlWatch.TabIndex = 0;
// //
// grpBreakpoints // grpBreakpoints
@ -527,7 +528,7 @@ namespace Mesen.GUI.Debugger
this.grpBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; this.grpBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpBreakpoints.Location = new System.Drawing.Point(361, 3); this.grpBreakpoints.Location = new System.Drawing.Point(361, 3);
this.grpBreakpoints.Name = "grpBreakpoints"; this.grpBreakpoints.Name = "grpBreakpoints";
this.grpBreakpoints.Size = new System.Drawing.Size(352, 170); this.grpBreakpoints.Size = new System.Drawing.Size(352, 176);
this.grpBreakpoints.TabIndex = 3; this.grpBreakpoints.TabIndex = 3;
this.grpBreakpoints.TabStop = false; this.grpBreakpoints.TabStop = false;
this.grpBreakpoints.Text = "Breakpoints"; this.grpBreakpoints.Text = "Breakpoints";
@ -537,7 +538,7 @@ namespace Mesen.GUI.Debugger
this.ctrlBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlBreakpoints.Location = new System.Drawing.Point(3, 16); this.ctrlBreakpoints.Location = new System.Drawing.Point(3, 16);
this.ctrlBreakpoints.Name = "ctrlBreakpoints"; this.ctrlBreakpoints.Name = "ctrlBreakpoints";
this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 151); this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 157);
this.ctrlBreakpoints.TabIndex = 0; this.ctrlBreakpoints.TabIndex = 0;
this.ctrlBreakpoints.BreakpointNavigation += new System.EventHandler(this.ctrlBreakpoints_BreakpointNavigation); this.ctrlBreakpoints.BreakpointNavigation += new System.EventHandler(this.ctrlBreakpoints_BreakpointNavigation);
// //
@ -547,7 +548,7 @@ namespace Mesen.GUI.Debugger
this.grpCallstack.Dock = System.Windows.Forms.DockStyle.Fill; this.grpCallstack.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpCallstack.Location = new System.Drawing.Point(719, 3); this.grpCallstack.Location = new System.Drawing.Point(719, 3);
this.grpCallstack.Name = "grpCallstack"; this.grpCallstack.Name = "grpCallstack";
this.grpCallstack.Size = new System.Drawing.Size(353, 170); this.grpCallstack.Size = new System.Drawing.Size(353, 176);
this.grpCallstack.TabIndex = 4; this.grpCallstack.TabIndex = 4;
this.grpCallstack.TabStop = false; this.grpCallstack.TabStop = false;
this.grpCallstack.Text = "Call Stack"; this.grpCallstack.Text = "Call Stack";
@ -557,7 +558,7 @@ namespace Mesen.GUI.Debugger
this.ctrlCallstack.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlCallstack.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlCallstack.Location = new System.Drawing.Point(3, 16); this.ctrlCallstack.Location = new System.Drawing.Point(3, 16);
this.ctrlCallstack.Name = "ctrlCallstack"; this.ctrlCallstack.Name = "ctrlCallstack";
this.ctrlCallstack.Size = new System.Drawing.Size(347, 151); this.ctrlCallstack.Size = new System.Drawing.Size(347, 157);
this.ctrlCallstack.TabIndex = 0; this.ctrlCallstack.TabIndex = 0;
this.ctrlCallstack.FunctionSelected += new System.EventHandler(this.ctrlCallstack_FunctionSelected); this.ctrlCallstack.FunctionSelected += new System.EventHandler(this.ctrlCallstack_FunctionSelected);
// //
@ -1161,6 +1162,7 @@ namespace Mesen.GUI.Debugger
this.mnuBreakOnUnofficialOpcodes, this.mnuBreakOnUnofficialOpcodes,
this.mnuBreakOnBrk, this.mnuBreakOnBrk,
this.mnuBreakOnCrash, this.mnuBreakOnCrash,
this.mnuBreakOnUninitMemoryRead,
this.toolStripMenuItem15, this.toolStripMenuItem15,
this.mnuBreakOnOpen, this.mnuBreakOnOpen,
this.mnuBreakOnDebuggerFocus, this.mnuBreakOnDebuggerFocus,
@ -1175,7 +1177,7 @@ namespace Mesen.GUI.Debugger
// //
this.mnuBreakOnReset.CheckOnClick = true; this.mnuBreakOnReset.CheckOnClick = true;
this.mnuBreakOnReset.Name = "mnuBreakOnReset"; this.mnuBreakOnReset.Name = "mnuBreakOnReset";
this.mnuBreakOnReset.Size = new System.Drawing.Size(250, 22); this.mnuBreakOnReset.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnReset.Text = "Break on power/reset"; this.mnuBreakOnReset.Text = "Break on power/reset";
this.mnuBreakOnReset.Click += new System.EventHandler(this.mnuBreakOnReset_Click); this.mnuBreakOnReset.Click += new System.EventHandler(this.mnuBreakOnReset_Click);
// //
@ -1183,7 +1185,7 @@ namespace Mesen.GUI.Debugger
// //
this.mnuBreakOnUnofficialOpcodes.CheckOnClick = true; this.mnuBreakOnUnofficialOpcodes.CheckOnClick = true;
this.mnuBreakOnUnofficialOpcodes.Name = "mnuBreakOnUnofficialOpcodes"; this.mnuBreakOnUnofficialOpcodes.Name = "mnuBreakOnUnofficialOpcodes";
this.mnuBreakOnUnofficialOpcodes.Size = new System.Drawing.Size(250, 22); this.mnuBreakOnUnofficialOpcodes.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnUnofficialOpcodes.Text = "Break on unofficial opcodes"; this.mnuBreakOnUnofficialOpcodes.Text = "Break on unofficial opcodes";
this.mnuBreakOnUnofficialOpcodes.Click += new System.EventHandler(this.mnuBreakOnUnofficialOpcodes_Click); this.mnuBreakOnUnofficialOpcodes.Click += new System.EventHandler(this.mnuBreakOnUnofficialOpcodes_Click);
// //
@ -1191,7 +1193,7 @@ namespace Mesen.GUI.Debugger
// //
this.mnuBreakOnBrk.CheckOnClick = true; this.mnuBreakOnBrk.CheckOnClick = true;
this.mnuBreakOnBrk.Name = "mnuBreakOnBrk"; this.mnuBreakOnBrk.Name = "mnuBreakOnBrk";
this.mnuBreakOnBrk.Size = new System.Drawing.Size(250, 22); this.mnuBreakOnBrk.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnBrk.Text = "Break on BRK"; this.mnuBreakOnBrk.Text = "Break on BRK";
this.mnuBreakOnBrk.Click += new System.EventHandler(this.mnuBreakOnBrk_Click); this.mnuBreakOnBrk.Click += new System.EventHandler(this.mnuBreakOnBrk_Click);
// //
@ -1199,20 +1201,28 @@ namespace Mesen.GUI.Debugger
// //
this.mnuBreakOnCrash.CheckOnClick = true; this.mnuBreakOnCrash.CheckOnClick = true;
this.mnuBreakOnCrash.Name = "mnuBreakOnCrash"; this.mnuBreakOnCrash.Name = "mnuBreakOnCrash";
this.mnuBreakOnCrash.Size = new System.Drawing.Size(250, 22); this.mnuBreakOnCrash.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnCrash.Text = "Break on CPU crash"; this.mnuBreakOnCrash.Text = "Break on CPU crash";
this.mnuBreakOnCrash.Click += new System.EventHandler(this.mnuBreakOnCrash_Click); this.mnuBreakOnCrash.Click += new System.EventHandler(this.mnuBreakOnCrash_Click);
// //
// mnuBreakOnUninitMemoryRead
//
this.mnuBreakOnUninitMemoryRead.CheckOnClick = true;
this.mnuBreakOnUninitMemoryRead.Name = "mnuBreakOnUninitMemoryRead";
this.mnuBreakOnUninitMemoryRead.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnUninitMemoryRead.Text = "Break on uninitialized memory read";
this.mnuBreakOnUninitMemoryRead.Click += new System.EventHandler(this.mnuBreakOnUninitMemoryRead_Click);
//
// toolStripMenuItem15 // toolStripMenuItem15
// //
this.toolStripMenuItem15.Name = "toolStripMenuItem15"; this.toolStripMenuItem15.Name = "toolStripMenuItem15";
this.toolStripMenuItem15.Size = new System.Drawing.Size(247, 6); this.toolStripMenuItem15.Size = new System.Drawing.Size(258, 6);
// //
// mnuBreakOnOpen // mnuBreakOnOpen
// //
this.mnuBreakOnOpen.CheckOnClick = true; this.mnuBreakOnOpen.CheckOnClick = true;
this.mnuBreakOnOpen.Name = "mnuBreakOnOpen"; this.mnuBreakOnOpen.Name = "mnuBreakOnOpen";
this.mnuBreakOnOpen.Size = new System.Drawing.Size(250, 22); this.mnuBreakOnOpen.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnOpen.Text = "Break when debugger is opened"; this.mnuBreakOnOpen.Text = "Break when debugger is opened";
this.mnuBreakOnOpen.Click += new System.EventHandler(this.mnuBreakOnOpen_Click); this.mnuBreakOnOpen.Click += new System.EventHandler(this.mnuBreakOnOpen_Click);
// //
@ -1220,20 +1230,20 @@ namespace Mesen.GUI.Debugger
// //
this.mnuBreakOnDebuggerFocus.CheckOnClick = true; this.mnuBreakOnDebuggerFocus.CheckOnClick = true;
this.mnuBreakOnDebuggerFocus.Name = "mnuBreakOnDebuggerFocus"; this.mnuBreakOnDebuggerFocus.Name = "mnuBreakOnDebuggerFocus";
this.mnuBreakOnDebuggerFocus.Size = new System.Drawing.Size(250, 22); this.mnuBreakOnDebuggerFocus.Size = new System.Drawing.Size(261, 22);
this.mnuBreakOnDebuggerFocus.Text = "Break on debugger focus"; this.mnuBreakOnDebuggerFocus.Text = "Break on debugger focus";
this.mnuBreakOnDebuggerFocus.Click += new System.EventHandler(this.mnuBreakOnDebuggerFocus_Click); this.mnuBreakOnDebuggerFocus.Click += new System.EventHandler(this.mnuBreakOnDebuggerFocus_Click);
// //
// toolStripMenuItem20 // toolStripMenuItem20
// //
this.toolStripMenuItem20.Name = "toolStripMenuItem20"; this.toolStripMenuItem20.Name = "toolStripMenuItem20";
this.toolStripMenuItem20.Size = new System.Drawing.Size(247, 6); this.toolStripMenuItem20.Size = new System.Drawing.Size(258, 6);
// //
// mnuBringToFrontOnBreak // mnuBringToFrontOnBreak
// //
this.mnuBringToFrontOnBreak.CheckOnClick = true; this.mnuBringToFrontOnBreak.CheckOnClick = true;
this.mnuBringToFrontOnBreak.Name = "mnuBringToFrontOnBreak"; this.mnuBringToFrontOnBreak.Name = "mnuBringToFrontOnBreak";
this.mnuBringToFrontOnBreak.Size = new System.Drawing.Size(250, 22); this.mnuBringToFrontOnBreak.Size = new System.Drawing.Size(261, 22);
this.mnuBringToFrontOnBreak.Text = "Bring debugger to front on break"; this.mnuBringToFrontOnBreak.Text = "Bring debugger to front on break";
this.mnuBringToFrontOnBreak.Click += new System.EventHandler(this.mnuBringToFrontOnBreak_Click); this.mnuBringToFrontOnBreak.Click += new System.EventHandler(this.mnuBringToFrontOnBreak_Click);
// //
@ -1241,7 +1251,7 @@ namespace Mesen.GUI.Debugger
// //
this.mnuBringToFrontOnPause.CheckOnClick = true; this.mnuBringToFrontOnPause.CheckOnClick = true;
this.mnuBringToFrontOnPause.Name = "mnuBringToFrontOnPause"; this.mnuBringToFrontOnPause.Name = "mnuBringToFrontOnPause";
this.mnuBringToFrontOnPause.Size = new System.Drawing.Size(250, 22); this.mnuBringToFrontOnPause.Size = new System.Drawing.Size(261, 22);
this.mnuBringToFrontOnPause.Text = "Bring debugger to front on pause"; this.mnuBringToFrontOnPause.Text = "Bring debugger to front on pause";
this.mnuBringToFrontOnPause.Click += new System.EventHandler(this.mnuBringToFrontOnPause_Click); this.mnuBringToFrontOnPause.Click += new System.EventHandler(this.mnuBringToFrontOnPause_Click);
// //
@ -1996,5 +2006,6 @@ namespace Mesen.GUI.Debugger
private System.Windows.Forms.TableLayoutPanel tlpVerticalLayout; private System.Windows.Forms.TableLayoutPanel tlpVerticalLayout;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem mnuUseVerticalLayout; private System.Windows.Forms.ToolStripMenuItem mnuUseVerticalLayout;
private System.Windows.Forms.ToolStripMenuItem mnuBreakOnUninitMemoryRead;
} }
} }

11
GUI.NET/Debugger/frmDebugger.cs
View File

@ -102,6 +102,7 @@ namespace Mesen.GUI.Debugger
this.mnuBreakOnOpen.Checked = ConfigManager.Config.DebugInfo.BreakOnOpen; this.mnuBreakOnOpen.Checked = ConfigManager.Config.DebugInfo.BreakOnOpen;
this.mnuBreakOnUnofficialOpcodes.Checked = ConfigManager.Config.DebugInfo.BreakOnUnofficialOpcodes; this.mnuBreakOnUnofficialOpcodes.Checked = ConfigManager.Config.DebugInfo.BreakOnUnofficialOpcodes;
this.mnuBreakOnBrk.Checked = ConfigManager.Config.DebugInfo.BreakOnBrk; this.mnuBreakOnBrk.Checked = ConfigManager.Config.DebugInfo.BreakOnBrk;
this.mnuBreakOnUninitMemoryRead.Checked = ConfigManager.Config.DebugInfo.BreakOnUninitMemoryRead;
this.mnuBreakOnCrash.Checked = ConfigManager.Config.DebugInfo.BreakOnCrash; this.mnuBreakOnCrash.Checked = ConfigManager.Config.DebugInfo.BreakOnCrash;
this.mnuBreakOnDebuggerFocus.Checked = ConfigManager.Config.DebugInfo.BreakOnDebuggerFocus; this.mnuBreakOnDebuggerFocus.Checked = ConfigManager.Config.DebugInfo.BreakOnDebuggerFocus;
this.mnuBringToFrontOnBreak.Checked = ConfigManager.Config.DebugInfo.BringToFrontOnBreak; this.mnuBringToFrontOnBreak.Checked = ConfigManager.Config.DebugInfo.BringToFrontOnBreak;
@ -402,6 +403,7 @@ namespace Mesen.GUI.Debugger
SetFlag(DebuggerFlags.ShowUnidentifiedData, mnuShowUnidentifiedData.Checked); SetFlag(DebuggerFlags.ShowUnidentifiedData, mnuShowUnidentifiedData.Checked);
SetFlag(DebuggerFlags.BreakOnUnofficialOpCode, mnuBreakOnUnofficialOpcodes.Checked); SetFlag(DebuggerFlags.BreakOnUnofficialOpCode, mnuBreakOnUnofficialOpcodes.Checked);
SetFlag(DebuggerFlags.BreakOnBrk, mnuBreakOnBrk.Checked); SetFlag(DebuggerFlags.BreakOnBrk, mnuBreakOnBrk.Checked);
SetFlag(DebuggerFlags.BreakOnUninitMemoryRead, mnuBreakOnUninitMemoryRead.Checked);
SetFlag(DebuggerFlags.HidePauseIcon, mnuHidePauseIcon.Checked); SetFlag(DebuggerFlags.HidePauseIcon, mnuHidePauseIcon.Checked);
InteropEmu.SetFlag(EmulationFlags.DebuggerWindowEnabled, true); InteropEmu.SetFlag(EmulationFlags.DebuggerWindowEnabled, true);
} }
@ -1034,12 +1036,21 @@ namespace Mesen.GUI.Debugger
{ {
ConfigManager.Config.DebugInfo.BreakOnUnofficialOpcodes = mnuBreakOnUnofficialOpcodes.Checked; ConfigManager.Config.DebugInfo.BreakOnUnofficialOpcodes = mnuBreakOnUnofficialOpcodes.Checked;
ConfigManager.ApplyChanges(); ConfigManager.ApplyChanges();
UpdateDebuggerFlags();
} }
private void mnuBreakOnBrk_Click(object sender, EventArgs e) private void mnuBreakOnBrk_Click(object sender, EventArgs e)
{ {
ConfigManager.Config.DebugInfo.BreakOnBrk = mnuBreakOnBrk.Checked; ConfigManager.Config.DebugInfo.BreakOnBrk = mnuBreakOnBrk.Checked;
ConfigManager.ApplyChanges(); ConfigManager.ApplyChanges();
UpdateDebuggerFlags();
}
private void mnuBreakOnUninitMemoryRead_Click(object sender, EventArgs e)
{
ConfigManager.Config.DebugInfo.BreakOnUninitMemoryRead = mnuBreakOnUninitMemoryRead.Checked;
ConfigManager.ApplyChanges();
UpdateDebuggerFlags();
} }
private void mnuBreakOnCrash_Click(object sender, EventArgs e) private void mnuBreakOnCrash_Click(object sender, EventArgs e)

13
GUI.NET/InteropEmu.cs
View File

@ -1548,15 +1548,16 @@ namespace Mesen.GUI
DisplayOpCodesInLowerCase = 0x08, DisplayOpCodesInLowerCase = 0x08,
BreakOnBrk = 0x10, BreakOnBrk = 0x10,
BreakOnUnofficialOpCode = 0x20, BreakOnUnofficialOpCode = 0x20,
BreakOnUninitMemoryRead = 0x40,
DisassembleVerifiedData = 0x40, DisassembleVerifiedData = 0x80,
DisassembleUnidentifiedData = 0x80, DisassembleUnidentifiedData = 0x100,
ShowVerifiedData = 0x100, ShowVerifiedData = 0x200,
ShowUnidentifiedData = 0x200, ShowUnidentifiedData = 0x400,
IgnoreRedundantWrites = 0x400, IgnoreRedundantWrites = 0x800,
HidePauseIcon = 0x800, HidePauseIcon = 0x1000,
} }
public struct InteropRomInfo public struct InteropRomInfo