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

Debugger: Auto-load msl/sym symbol files, if they are found (when option is enabled)

Browse source
This commit is contained in:
Sour 2020-05-07 21:26:16 -04:00
parent 7a929b56f3
commit 3a41275575
4 changed files with 53 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
UI/Debugger/Integration/frmIntegrationSettings.Designer.cs generated
View file

@ -41,7 +41,7 @@
this.grpGeneral = new System.Windows.Forms.GroupBox(); this.grpGeneral = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.chkResetLabelsOnImport = new System.Windows.Forms.CheckBox(); this.chkResetLabelsOnImport = new System.Windows.Forms.CheckBox();
this.chkAutoLoadDbgFiles = new System.Windows.Forms.CheckBox(); this.chkAutoLoadFiles = new System.Windows.Forms.CheckBox();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.grpSPC.SuspendLayout(); this.grpSPC.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout();
@ -54,7 +54,7 @@
// baseConfigPanel // baseConfigPanel
// //
this.baseConfigPanel.Location = new System.Drawing.Point(0, 196); this.baseConfigPanel.Location = new System.Drawing.Point(0, 196);
this.baseConfigPanel.Size = new System.Drawing.Size(419, 29); this.baseConfigPanel.Size = new System.Drawing.Size(463, 29);
this.baseConfigPanel.TabIndex = 4; this.baseConfigPanel.TabIndex = 4;
// //
// tableLayoutPanel1 // tableLayoutPanel1
@ -71,16 +71,16 @@
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(419, 196); this.tableLayoutPanel1.Size = new System.Drawing.Size(463, 196);
this.tableLayoutPanel1.TabIndex = 2; this.tableLayoutPanel1.TabIndex = 2;
// //
// grpSPC // grpSPC
// //
this.grpSPC.Controls.Add(this.tableLayoutPanel3); this.grpSPC.Controls.Add(this.tableLayoutPanel3);
this.grpSPC.Dock = System.Windows.Forms.DockStyle.Fill; this.grpSPC.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpSPC.Location = new System.Drawing.Point(212, 75); this.grpSPC.Location = new System.Drawing.Point(234, 75);
this.grpSPC.Name = "grpSPC"; this.grpSPC.Name = "grpSPC";
this.grpSPC.Size = new System.Drawing.Size(204, 118); this.grpSPC.Size = new System.Drawing.Size(226, 118);
this.grpSPC.TabIndex = 1; this.grpSPC.TabIndex = 1;
this.grpSPC.TabStop = false; this.grpSPC.TabStop = false;
this.grpSPC.Text = "SPC700"; this.grpSPC.Text = "SPC700";
@ -101,7 +101,7 @@
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(198, 99); this.tableLayoutPanel3.Size = new System.Drawing.Size(220, 99);
this.tableLayoutPanel3.TabIndex = 0; this.tableLayoutPanel3.TabIndex = 0;
// //
// chkSpcComments // chkSpcComments
@ -130,7 +130,7 @@
this.grpCpu.Dock = System.Windows.Forms.DockStyle.Fill; this.grpCpu.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpCpu.Location = new System.Drawing.Point(3, 75); this.grpCpu.Location = new System.Drawing.Point(3, 75);
this.grpCpu.Name = "grpCpu"; this.grpCpu.Name = "grpCpu";
this.grpCpu.Size = new System.Drawing.Size(203, 118); this.grpCpu.Size = new System.Drawing.Size(225, 118);
this.grpCpu.TabIndex = 0; this.grpCpu.TabIndex = 0;
this.grpCpu.TabStop = false; this.grpCpu.TabStop = false;
this.grpCpu.Text = "CPU (65816)"; this.grpCpu.Text = "CPU (65816)";
@ -153,7 +153,7 @@
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(197, 99); this.tableLayoutPanel2.Size = new System.Drawing.Size(219, 99);
this.tableLayoutPanel2.TabIndex = 0; this.tableLayoutPanel2.TabIndex = 0;
// //
// chkCpuComments // chkCpuComments
@ -203,7 +203,7 @@
this.grpGeneral.Dock = System.Windows.Forms.DockStyle.Fill; this.grpGeneral.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpGeneral.Location = new System.Drawing.Point(3, 3); this.grpGeneral.Location = new System.Drawing.Point(3, 3);
this.grpGeneral.Name = "grpGeneral"; this.grpGeneral.Name = "grpGeneral";
this.grpGeneral.Size = new System.Drawing.Size(413, 66); this.grpGeneral.Size = new System.Drawing.Size(457, 66);
this.grpGeneral.TabIndex = 2; this.grpGeneral.TabIndex = 2;
this.grpGeneral.TabStop = false; this.grpGeneral.TabStop = false;
this.grpGeneral.Text = "General Settings"; this.grpGeneral.Text = "General Settings";
@ -213,7 +213,7 @@
this.tableLayoutPanel4.ColumnCount = 1; this.tableLayoutPanel4.ColumnCount = 1;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.Controls.Add(this.chkResetLabelsOnImport, 0, 1); this.tableLayoutPanel4.Controls.Add(this.chkResetLabelsOnImport, 0, 1);
this.tableLayoutPanel4.Controls.Add(this.chkAutoLoadDbgFiles, 0, 0); this.tableLayoutPanel4.Controls.Add(this.chkAutoLoadFiles, 0, 0);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 16); this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 16);
this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.Name = "tableLayoutPanel4";
@ -221,7 +221,7 @@
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(407, 47); this.tableLayoutPanel4.Size = new System.Drawing.Size(451, 47);
this.tableLayoutPanel4.TabIndex = 0; this.tableLayoutPanel4.TabIndex = 0;
// //
// chkResetLabelsOnImport // chkResetLabelsOnImport
@ -229,26 +229,26 @@
this.chkResetLabelsOnImport.AutoSize = true; this.chkResetLabelsOnImport.AutoSize = true;
this.chkResetLabelsOnImport.Location = new System.Drawing.Point(3, 26); this.chkResetLabelsOnImport.Location = new System.Drawing.Point(3, 26);
this.chkResetLabelsOnImport.Name = "chkResetLabelsOnImport"; this.chkResetLabelsOnImport.Name = "chkResetLabelsOnImport";
this.chkResetLabelsOnImport.Size = new System.Drawing.Size(360, 17); this.chkResetLabelsOnImport.Size = new System.Drawing.Size(369, 17);
this.chkResetLabelsOnImport.TabIndex = 2; this.chkResetLabelsOnImport.TabIndex = 2;
this.chkResetLabelsOnImport.Text = "Reset workspace labels to their default state before importing DBG files"; this.chkResetLabelsOnImport.Text = "Reset workspace labels to their default state before importing symbol files";
this.chkResetLabelsOnImport.UseVisualStyleBackColor = true; this.chkResetLabelsOnImport.UseVisualStyleBackColor = true;
// //
// chkAutoLoadDbgFiles // chkAutoLoadFiles
// //
this.chkAutoLoadDbgFiles.AutoSize = true; this.chkAutoLoadFiles.AutoSize = true;
this.chkAutoLoadDbgFiles.Location = new System.Drawing.Point(3, 3); this.chkAutoLoadFiles.Location = new System.Drawing.Point(3, 3);
this.chkAutoLoadDbgFiles.Name = "chkAutoLoadDbgFiles"; this.chkAutoLoadFiles.Name = "chkAutoLoadFiles";
this.chkAutoLoadDbgFiles.Size = new System.Drawing.Size(354, 17); this.chkAutoLoadFiles.Size = new System.Drawing.Size(433, 17);
this.chkAutoLoadDbgFiles.TabIndex = 3; this.chkAutoLoadFiles.TabIndex = 3;
this.chkAutoLoadDbgFiles.Text = "Automatically load DBG files when debugger opens or on power cycle"; this.chkAutoLoadFiles.Text = "Automatically load DBG/MSL debug symbols when debugger opens or on power cycle";
this.chkAutoLoadDbgFiles.UseVisualStyleBackColor = true; this.chkAutoLoadFiles.UseVisualStyleBackColor = true;
// //
// frmIntegrationSettings // frmIntegrationSettings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(419, 225); this.ClientSize = new System.Drawing.Size(463, 225);
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.Name = "frmIntegrationSettings"; this.Name = "frmIntegrationSettings";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@ -286,6 +286,6 @@
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
private System.Windows.Forms.CheckBox chkSpcComments; private System.Windows.Forms.CheckBox chkSpcComments;
private System.Windows.Forms.CheckBox chkSpcRam; private System.Windows.Forms.CheckBox chkSpcRam;
private System.Windows.Forms.CheckBox chkAutoLoadDbgFiles; private System.Windows.Forms.CheckBox chkAutoLoadFiles;
} }
} }

2
UI/Debugger/Integration/frmIntegrationSettings.cs
View file

@ -20,7 +20,7 @@ namespace Mesen.GUI.Debugger
Entity = ConfigManager.Config.Debug.DbgIntegration; Entity = ConfigManager.Config.Debug.DbgIntegration;
AddBinding(nameof(DbgIntegrationConfig.AutoImport), chkAutoLoadDbgFiles); AddBinding(nameof(DbgIntegrationConfig.AutoImport), chkAutoLoadFiles);
AddBinding(nameof(DbgIntegrationConfig.ResetLabelsOnImport), chkResetLabelsOnImport); AddBinding(nameof(DbgIntegrationConfig.ResetLabelsOnImport), chkResetLabelsOnImport);
AddBinding(nameof(DbgIntegrationConfig.ImportCpuPrgRomLabels), chkCpuPrgRom); AddBinding(nameof(DbgIntegrationConfig.ImportCpuPrgRomLabels), chkCpuPrgRom);

46
UI/Debugger/Workspace/DebugWorkspaceManager.cs
View file

@ -103,10 +103,10 @@ namespace Mesen.GUI.Debugger.Workspace
LabelManager.SetLabels(_workspace.SpcLabels); LabelManager.SetLabels(_workspace.SpcLabels);
LabelManager.SetLabels(_workspace.NecDspLabels); LabelManager.SetLabels(_workspace.NecDspLabels);
LabelManager.SetDefaultLabels(); LabelManager.SetDefaultLabels();
ImportDbgFile(); AutoImportSymbols();
} }
//Send breakpoints & labels to emulation core (even if the same game is running) //Send breakpoints & labels to emulation core (even if the same game is running)
LabelManager.RefreshLabels(); LabelManager.RefreshLabels();
BreakpointManager.SetBreakpoints(_workspace.Breakpoints); BreakpointManager.SetBreakpoints(_workspace.Breakpoints);
@ -114,6 +114,26 @@ namespace Mesen.GUI.Debugger.Workspace
return _workspace; return _workspace;
} }
public static void AutoImportSymbols()
{
if(ConfigManager.Config.Debug.DbgIntegration.AutoImport) {
RomInfo romInfo = EmuApi.GetRomInfo();
string romName = romInfo.GetRomName();
string romFolder = ((ResourcePath)romInfo.RomPath).Folder;
string dbgPath = Path.Combine(romFolder, romName + ".dbg");
string mslPath = Path.Combine(romFolder, romName + ".msl");
string symPath = Path.Combine(romFolder, romName + ".sym");
if(File.Exists(dbgPath)) {
ImportDbgFile(dbgPath, true);
} else if(File.Exists(mslPath)) {
ImportMslFile(mslPath, true);
} else if(File.Exists(symPath)) {
ImportSymFile(symPath, true);
}
}
}
public static void ImportMslFile(string mslPath, bool silent = false) public static void ImportMslFile(string mslPath, bool silent = false)
{ {
if(ConfigManager.Config.Debug.DbgIntegration.ResetLabelsOnImport) { if(ConfigManager.Config.Debug.DbgIntegration.ResetLabelsOnImport) {
@ -132,24 +152,14 @@ namespace Mesen.GUI.Debugger.Workspace
LabelManager.RefreshLabels(); LabelManager.RefreshLabels();
} }
public static void ImportDbgFile(string dbgPath = null) public static void ImportDbgFile(string dbgPath, bool silent = false)
{ {
_symbolProvider = null; _symbolProvider = null;
if(dbgPath != null || ConfigManager.Config.Debug.DbgIntegration.AutoImport) { _symbolProvider = new DbgImporter();
bool silent = dbgPath == null; (_symbolProvider as DbgImporter).Import(dbgPath, silent);
if(dbgPath == null) { SymbolProviderChanged?.Invoke(_symbolProvider);
RomInfo romInfo = EmuApi.GetRomInfo(); LabelManager.RefreshLabels();
dbgPath = Path.Combine(((ResourcePath)romInfo.RomPath).Folder, romInfo.GetRomName() + ".dbg");
}
if(File.Exists(dbgPath)) {
_symbolProvider = new DbgImporter();
(_symbolProvider as DbgImporter).Import(dbgPath, silent);
SymbolProviderChanged?.Invoke(_symbolProvider);
LabelManager.RefreshLabels();
}
}
SymbolProviderChanged?.Invoke(_symbolProvider); SymbolProviderChanged?.Invoke(_symbolProvider);
} }

2
UI/Debugger/frmDebugger.cs
View file

@ -528,7 +528,7 @@ namespace Mesen.GUI.Debugger
bool isPowerCycle = e.Parameter.ToInt32() != 0; bool isPowerCycle = e.Parameter.ToInt32() != 0;
if(!isPowerCycle) { if(!isPowerCycle) {
DebugWorkspaceManager.ImportDbgFile(); DebugWorkspaceManager.AutoImportSymbols();
} }
LabelManager.RefreshLabels(); LabelManager.RefreshLabels();
DebugApi.RefreshDisassembly(_cpuType); DebugApi.RefreshDisassembly(_cpuType);