This commit is contained in:
kudzu_cp 2010-07-27 04:31:02 +00:00
parent c4ce4ebba7
commit f387ea2d82
8 changed files with 295 additions and 41 deletions

View file

@ -0,0 +1,80 @@
namespace Cosmos.Debug.GDB {
partial class BreakpointUC {
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) {
if (disposing && (components != null)) {
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent() {
this.lablNum = new System.Windows.Forms.Label();
this.cboxEnabled = new System.Windows.Forms.CheckBox();
this.lablName = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// lablNum
//
this.lablNum.AutoSize = true;
this.lablNum.Location = new System.Drawing.Point(24, 4);
this.lablNum.Name = "lablNum";
this.lablNum.Size = new System.Drawing.Size(28, 13);
this.lablNum.TabIndex = 0;
this.lablNum.Text = "XXX";
//
// cboxEnabled
//
this.cboxEnabled.AutoSize = true;
this.cboxEnabled.Location = new System.Drawing.Point(3, 3);
this.cboxEnabled.Name = "cboxEnabled";
this.cboxEnabled.Size = new System.Drawing.Size(15, 14);
this.cboxEnabled.TabIndex = 1;
this.cboxEnabled.UseVisualStyleBackColor = true;
//
// lablName
//
this.lablName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lablName.Location = new System.Drawing.Point(58, 4);
this.lablName.Name = "lablName";
this.lablName.Size = new System.Drawing.Size(184, 13);
this.lablName.TabIndex = 2;
this.lablName.Text = "Breakpoint Name";
//
// BreakpointUC
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lablName);
this.Controls.Add(this.cboxEnabled);
this.Controls.Add(this.lablNum);
this.Name = "BreakpointUC";
this.Size = new System.Drawing.Size(256, 22);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
public System.Windows.Forms.Label lablNum;
public System.Windows.Forms.CheckBox cboxEnabled;
public System.Windows.Forms.Label lablName;
}
}

View file

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace Cosmos.Debug.GDB {
public partial class BreakpointUC : UserControl {
public BreakpointUC() {
InitializeComponent();
}
}
}

View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View file

@ -72,6 +72,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BreakpointUC.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BreakpointUC.Designer.cs">
<DependentUpon>BreakpointUC.cs</DependentUpon>
</Compile>
<Compile Include="FormBreakpoints.cs">
<SubType>Form</SubType>
</Compile>
@ -131,6 +137,9 @@
<Compile Include="Windows.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="BreakpointUC.resx">
<DependentUpon>BreakpointUC.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FormBreakpoints.resx">
<DependentUpon>FormBreakpoints.cs</DependentUpon>
</EmbeddedResource>

View file

@ -25,26 +25,41 @@
private void InitializeComponent() {
this.components = new System.ComponentModel.Container();
this.lboxBreakpoints = new System.Windows.Forms.ListBox();
this.menuBreakpoints = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mitmBreakpointDelete = new System.Windows.Forms.ToolStripMenuItem();
this.panel6 = new System.Windows.Forms.Panel();
this.butnBreakpointAdd = new System.Windows.Forms.Button();
this.textBreakpoint = new System.Windows.Forms.TextBox();
this.menuBreakpoints = new System.Windows.Forms.ContextMenuStrip(this.components);
this.mitmBreakpointDelete = new System.Windows.Forms.ToolStripMenuItem();
this.panel6.SuspendLayout();
this.panl = new System.Windows.Forms.Panel();
this.menuBreakpoints.SuspendLayout();
this.panel6.SuspendLayout();
this.SuspendLayout();
//
// lboxBreakpoints
//
this.lboxBreakpoints.ContextMenuStrip = this.menuBreakpoints;
this.lboxBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill;
this.lboxBreakpoints.Dock = System.Windows.Forms.DockStyle.Top;
this.lboxBreakpoints.FormattingEnabled = true;
this.lboxBreakpoints.Location = new System.Drawing.Point(0, 32);
this.lboxBreakpoints.Name = "lboxBreakpoints";
this.lboxBreakpoints.Size = new System.Drawing.Size(284, 225);
this.lboxBreakpoints.Size = new System.Drawing.Size(284, 95);
this.lboxBreakpoints.Sorted = true;
this.lboxBreakpoints.TabIndex = 67;
//
// menuBreakpoints
//
this.menuBreakpoints.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mitmBreakpointDelete});
this.menuBreakpoints.Name = "menuBreakpoints";
this.menuBreakpoints.Size = new System.Drawing.Size(108, 26);
//
// mitmBreakpointDelete
//
this.mitmBreakpointDelete.Name = "mitmBreakpointDelete";
this.mitmBreakpointDelete.Size = new System.Drawing.Size(107, 22);
this.mitmBreakpointDelete.Text = "&Delete";
this.mitmBreakpointDelete.Click += new System.EventHandler(this.mitmBreakpointDelete_Click);
//
// panel6
//
this.panel6.Controls.Add(this.butnBreakpointAdd);
@ -76,25 +91,20 @@
this.textBreakpoint.TabIndex = 4;
this.textBreakpoint.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBreakpoint_KeyPress);
//
// menuBreakpoints
// panl
//
this.menuBreakpoints.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mitmBreakpointDelete});
this.menuBreakpoints.Name = "menuBreakpoints";
this.menuBreakpoints.Size = new System.Drawing.Size(108, 26);
//
// mitmBreakpointDelete
//
this.mitmBreakpointDelete.Name = "mitmBreakpointDelete";
this.mitmBreakpointDelete.Size = new System.Drawing.Size(107, 22);
this.mitmBreakpointDelete.Text = "&Delete";
this.mitmBreakpointDelete.Click += new System.EventHandler(this.mitmBreakpointDelete_Click);
this.panl.Dock = System.Windows.Forms.DockStyle.Fill;
this.panl.Location = new System.Drawing.Point(0, 127);
this.panl.Name = "panl";
this.panl.Size = new System.Drawing.Size(284, 135);
this.panl.TabIndex = 68;
//
// FormBreakpoints
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 262);
this.Controls.Add(this.panl);
this.Controls.Add(this.lboxBreakpoints);
this.Controls.Add(this.panel6);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
@ -102,9 +112,9 @@
this.ShowInTaskbar = false;
this.Text = "Breakpoints";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormBreakpoints_FormClosing);
this.menuBreakpoints.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.panel6.PerformLayout();
this.menuBreakpoints.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -117,5 +127,6 @@
private System.Windows.Forms.TextBox textBreakpoint;
private System.Windows.Forms.ContextMenuStrip menuBreakpoints;
private System.Windows.Forms.ToolStripMenuItem mitmBreakpointDelete;
private System.Windows.Forms.Panel panl;
}
}

View file

@ -40,6 +40,13 @@ namespace Cosmos.Debug.GDB {
var xSplit = xResult[0].Split(" ".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
if (xSplit[0] == "Breakpoint") {
lboxBreakpoints.SelectedIndex = lboxBreakpoints.Items.Add(new Breakpoint(s, int.Parse(xSplit[1])));
var xUC = new BreakpointUC();
xUC.Dock = DockStyle.Top;
xUC.cboxEnabled.Checked = true;
xUC.lablNum.Text = xSplit[1];
xUC.lablName.Text = s;
panl.Controls.Add(xUC);
return true;
}
MessageBox.Show(xResult[0]);

View file

@ -38,10 +38,10 @@
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mitmViewBreakpoints = new System.Windows.Forms.ToolStripMenuItem();
this.mitmMainViewCallStack = new System.Windows.Forms.ToolStripMenuItem();
this.mitmViewLog = new System.Windows.Forms.ToolStripMenuItem();
this.mitmMainViewWatches = new System.Windows.Forms.ToolStripMenuItem();
this.mitmViewDisassembly = new System.Windows.Forms.ToolStripMenuItem();
this.mitmViewLog = new System.Windows.Forms.ToolStripMenuItem();
this.mitmRegisters = new System.Windows.Forms.ToolStripMenuItem();
this.mitmMainViewWatches = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
@ -160,45 +160,45 @@
// mitmViewBreakpoints
//
this.mitmViewBreakpoints.Name = "mitmViewBreakpoints";
this.mitmViewBreakpoints.Size = new System.Drawing.Size(152, 22);
this.mitmViewBreakpoints.Size = new System.Drawing.Size(139, 22);
this.mitmViewBreakpoints.Text = "&Breakpoints";
this.mitmViewBreakpoints.Click += new System.EventHandler(this.mitmViewBreakpoints_Click);
//
// mitmMainViewCallStack
//
this.mitmMainViewCallStack.Name = "mitmMainViewCallStack";
this.mitmMainViewCallStack.Size = new System.Drawing.Size(152, 22);
this.mitmMainViewCallStack.Size = new System.Drawing.Size(139, 22);
this.mitmMainViewCallStack.Text = "&CallStack";
this.mitmMainViewCallStack.Click += new System.EventHandler(this.mitmMainViewCallStack_Click);
//
// mitmViewLog
//
this.mitmViewLog.Name = "mitmViewLog";
this.mitmViewLog.Size = new System.Drawing.Size(152, 22);
this.mitmViewLog.Text = "&Log";
this.mitmViewLog.Click += new System.EventHandler(this.mitmViewLog_Click);
//
// mitmMainViewWatches
//
this.mitmMainViewWatches.Name = "mitmMainViewWatches";
this.mitmMainViewWatches.Size = new System.Drawing.Size(152, 22);
this.mitmMainViewWatches.Text = "&Watches";
this.mitmMainViewWatches.Click += new System.EventHandler(this.mitmMainViewWatches_Click);
//
// mitmViewDisassembly
//
this.mitmViewDisassembly.Name = "mitmViewDisassembly";
this.mitmViewDisassembly.Size = new System.Drawing.Size(152, 22);
this.mitmViewDisassembly.Size = new System.Drawing.Size(139, 22);
this.mitmViewDisassembly.Text = "&Disassembly";
this.mitmViewDisassembly.Click += new System.EventHandler(this.mitmViewDisassembly_Click);
//
// mitmViewLog
//
this.mitmViewLog.Name = "mitmViewLog";
this.mitmViewLog.Size = new System.Drawing.Size(139, 22);
this.mitmViewLog.Text = "&Log";
this.mitmViewLog.Click += new System.EventHandler(this.mitmViewLog_Click);
//
// mitmRegisters
//
this.mitmRegisters.Name = "mitmRegisters";
this.mitmRegisters.Size = new System.Drawing.Size(152, 22);
this.mitmRegisters.Size = new System.Drawing.Size(139, 22);
this.mitmRegisters.Text = "&Registers";
this.mitmRegisters.Click += new System.EventHandler(this.mitmRegisters_Click);
//
// mitmMainViewWatches
//
this.mitmMainViewWatches.Name = "mitmMainViewWatches";
this.mitmMainViewWatches.Size = new System.Drawing.Size(139, 22);
this.mitmMainViewWatches.Text = "&Watches";
this.mitmMainViewWatches.Click += new System.EventHandler(this.mitmMainViewWatches_Click);
//
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -213,6 +213,7 @@
this.Text = "Cosmos GDB Debugger";
this.TopMost = true;
this.Load += new System.EventHandler(this.FormMain_Load);
this.Shown += new System.EventHandler(this.FormMain_Shown);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormMain_FormClosing);
this.Resize += new System.EventHandler(this.FormMain_Resize);
this.menuStrip1.ResumeLayout(false);

View file

@ -89,9 +89,6 @@ namespace Cosmos.Debug.GDB {
private void FormMain_Load(object sender, EventArgs e) {
Windows.mMainForm = this;
if (Settings.AutoConnect) {
Connect(30);
}
}
private void mitmViewBreakpoints_Click(object sender, EventArgs e) {
@ -106,5 +103,18 @@ namespace Cosmos.Debug.GDB {
Windows.Show(Windows.mRegistersForm);
}
private void FormMain_Shown(object sender, EventArgs e) {
// Dont put this in load. Load happens in main call from Main.cs and on exceptions just
// goes out, no message.
// Also we want to show other forms after main form, not before.
// We also only want to run this once, not on each possible show.
if (mitmConnect.Enabled) {
if (Settings.AutoConnect) {
Connect(30);
}
}
}
}
}