From 027706be707a0315959dc2f26d16438edf5002ba Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 24 Jan 2015 02:50:22 +0000 Subject: [PATCH] Debugger - to PC button --- .../tools/Debugger/GenericDebugger.Designer.cs | 14 ++++++++++++++ .../tools/Debugger/GenericDebugger.Disassembler.cs | 1 + .../tools/Debugger/GenericDebugger.cs | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs index dcdf394d54..71d460b7e1 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs @@ -42,6 +42,7 @@ this.BreakpointsGroupBox = new System.Windows.Forms.GroupBox(); this.BreakPointControl1 = new BizHawk.Client.EmuHawk.tools.Debugger.BreakpointControl(); this.DisassemblerBox = new System.Windows.Forms.GroupBox(); + this.ToPCBtn = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.DisassemblerView = new BizHawk.Client.EmuHawk.VirtualListView(); this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -181,6 +182,7 @@ // this.DisassemblerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); + this.DisassemblerBox.Controls.Add(this.ToPCBtn); this.DisassemblerBox.Controls.Add(this.label1); this.DisassemblerBox.Controls.Add(this.DisassemblerView); this.DisassemblerBox.Location = new System.Drawing.Point(12, 27); @@ -190,6 +192,17 @@ this.DisassemblerBox.TabStop = false; this.DisassemblerBox.Text = "Disassembler"; // + // ToPCBtn + // + this.ToPCBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ToPCBtn.Location = new System.Drawing.Point(351, 13); + this.ToPCBtn.Name = "ToPCBtn"; + this.ToPCBtn.Size = new System.Drawing.Size(50, 23); + this.ToPCBtn.TabIndex = 3; + this.ToPCBtn.Text = "To PC"; + this.ToPCBtn.UseVisualStyleBackColor = true; + this.ToPCBtn.Click += new System.EventHandler(this.ToPCBtn_Click); + // // label1 // this.label1.AutoSize = true; @@ -360,5 +373,6 @@ private System.Windows.Forms.Button SeekToBtn; private HexTextBox SeekToBox; private System.Windows.Forms.Button CancelSeekBtn; + private System.Windows.Forms.Button ToPCBtn; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs index b48baa89ae..5426b0249c 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs @@ -38,6 +38,7 @@ namespace BizHawk.Client.EmuHawk if (CanDisassemble) { DisassemblerView.BlazingFast = true; + DisassemblerView.ItemCount = 0; currentDisassemblerAddress = PC; Disassemble(); DisassemblerView.Refresh(); diff --git a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs index 601be4e60b..d795eca709 100644 --- a/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs @@ -284,5 +284,10 @@ namespace BizHawk.Client.EmuHawk BreakPointControl1.RemoveCurrentSeek(); CancelSeekBtn.Enabled = false; } + + private void ToPCBtn_Click(object sender, EventArgs e) + { + UpdateDisassembler(); + } } }