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

Debugger: Added tooltip icon for watch box

Browse source
This commit is contained in:
Sour 2019-03-30 23:44:45 -04:00
parent 341656e699
commit bc891d6408
4 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
UI/Debugger/Breakpoints/frmBreakpoint.cs
View file

@ -99,14 +99,13 @@ namespace Mesen.GUI.Debugger
{
string tooltip =
"Most expressions/operators are accepted (C++ syntax)." + Environment.NewLine +
"Note: Use the $ prefix to denote hexadecimal values." + Environment.NewLine +
"Note 2: Labels assigned to the code can be used (their value will match the label's address in CPU memory)." + Environment.NewLine + Environment.NewLine +
"Note: Use the $ prefix to denote hexadecimal values." + Environment.NewLine + Environment.NewLine +
//"Note 2: Labels assigned to the code can be used (their value will match the label's address in CPU memory)." + Environment.NewLine + Environment.NewLine +
"A/X/Y/PS/SP: Value of registers" + Environment.NewLine +
"PC: Program Counter" + Environment.NewLine +
"OpPC: Address of the current instruction's first byte" + Environment.NewLine +
"PreviousOpPC: Address of the previous instruction's first byte" + Environment.NewLine +
"Irq/Nmi/Sprite0Hit/SpriteOverflow/VerticalBlank: True if the corresponding flags are set" + Environment.NewLine +
"Branched: True if the current instruction was reached by jumping or branching" + Environment.NewLine +
"Irq/Nmi: True if the corresponding flags are set" + Environment.NewLine +
"Cycle/Scanline: Current cycle (0-340)/scanline(-1 to 260) of the PPU" + Environment.NewLine +
"Frame: PPU frame number (since power on/reset)" + Environment.NewLine +
"Value: Current value being read/written from/to memory" + Environment.NewLine +
@ -128,7 +127,7 @@ namespace Mesen.GUI.Debugger
"scanline == 10 && (cycle >= 55 && cycle <= 100)" + Environment.NewLine +
"x == [$150] || y == [10]" + Environment.NewLine +
"[[$15] + y] -> Reads the value at address $15, adds Y to it and reads the value at the resulting address." + Environment.NewLine +
"{$FFFA} -> Returns the NMI handler's address.";
"{$FFEA} -> Returns the NMI handler's address.";
return tooltip;
}

5
UI/Debugger/Controls/ctrlWatch.cs
View file

@ -52,13 +52,12 @@ namespace Mesen.GUI.Debugger
public string GetTooltipText()
{
return "";
/*return (
return (
frmBreakpoint.GetConditionTooltip(true) + Environment.NewLine + Environment.NewLine +
"Additionally, the watch window supports a syntax to display X bytes starting from a specific address. e.g:" + Environment.NewLine +
"[$10, 16]: Display 16 bytes starting from address $10" + Environment.NewLine +
"[MyLabel, 4]: Display 4 bytes starting from the address the specified label (MyLabel) refers to"
);*/
);
}
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)

15
UI/Debugger/frmDebugger.Designer.cs generated
View file

@ -82,6 +82,7 @@
this.grpCallstack = new System.Windows.Forms.GroupBox();
this.ctrlCallstack = new Mesen.GUI.Debugger.Controls.ctrlCallstack();
this.tsToolbar = new Mesen.GUI.Controls.ctrlMesenToolStrip();
this.picWatchHelp = new System.Windows.Forms.PictureBox();
this.ctrlMesenMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ctrlSplitContainer)).BeginInit();
this.ctrlSplitContainer.Panel1.SuspendLayout();
@ -91,6 +92,7 @@
this.grpWatch.SuspendLayout();
this.grpBreakpoints.SuspendLayout();
this.grpCallstack.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picWatchHelp)).BeginInit();
this.SuspendLayout();
//
// ctrlDisassemblyView
@ -451,6 +453,7 @@
//
// grpWatch
//
this.grpWatch.Controls.Add(this.picWatchHelp);
this.grpWatch.Controls.Add(this.ctrlWatch);
this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpWatch.Location = new System.Drawing.Point(3, 3);
@ -516,6 +519,16 @@
this.tsToolbar.TabIndex = 3;
this.tsToolbar.Text = "ctrlMesenToolStrip1";
//
// picWatchHelp
//
this.picWatchHelp.Image = global::Mesen.GUI.Properties.Resources.Help;
this.picWatchHelp.Location = new System.Drawing.Point(44, -1);
this.picWatchHelp.Name = "picWatchHelp";
this.picWatchHelp.Size = new System.Drawing.Size(16, 16);
this.picWatchHelp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.picWatchHelp.TabIndex = 4;
this.picWatchHelp.TabStop = false;
//
// frmDebugger
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -536,6 +549,7 @@
this.grpWatch.ResumeLayout(false);
this.grpBreakpoints.ResumeLayout(false);
this.grpCallstack.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picWatchHelp)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -594,5 +608,6 @@
private System.Windows.Forms.ToolStripMenuItem mnuGoToCopHandler;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mnuPreferences;
private System.Windows.Forms.PictureBox picWatchHelp;
}
}

2
UI/Debugger/frmDebugger.cs
View file

@ -34,6 +34,8 @@ namespace Mesen.GUI.Debugger
InitShortcuts();
InitToolbar();
toolTip.SetToolTip(picWatchHelp, ctrlWatch.GetTooltipText());
BreakpointManager.BreakpointsEnabled = true;
DebugApi.Step(10000);
}