This commit is contained in:
kudzu_cp 2010-07-26 04:48:20 +00:00
parent 6521e75e48
commit bfa8bdb13e
3 changed files with 36 additions and 46 deletions

View file

@ -24,8 +24,6 @@
/// </summary> /// </summary>
private void InitializeComponent() { private void InitializeComponent() {
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mitmConnect = new System.Windows.Forms.ToolStripMenuItem(); this.mitmConnect = new System.Windows.Forms.ToolStripMenuItem();
@ -40,40 +38,18 @@
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mitmMainViewCallStack = new System.Windows.Forms.ToolStripMenuItem(); this.mitmMainViewCallStack = new System.Windows.Forms.ToolStripMenuItem();
this.mitmMainViewWatches = new System.Windows.Forms.ToolStripMenuItem(); this.mitmMainViewWatches = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1.SuspendLayout(); this.mitmViewLog = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// panel1 // panel1
// //
this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 24); this.panel1.Location = new System.Drawing.Point(0, 24);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(775, 32); this.panel1.Size = new System.Drawing.Size(160, 30);
this.panel1.TabIndex = 3; this.panel1.TabIndex = 3;
// //
// tabControl1
//
this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Right;
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 56);
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(775, 360);
this.tabControl1.TabIndex = 4;
//
// tabPage1
//
this.tabPage1.Location = new System.Drawing.Point(4, 4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(748, 352);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Main";
this.tabPage1.UseVisualStyleBackColor = true;
//
// menuStrip1 // menuStrip1
// //
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -82,7 +58,7 @@
this.viewToolStripMenuItem}); this.viewToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(775, 24); this.menuStrip1.Size = new System.Drawing.Size(160, 24);
this.menuStrip1.TabIndex = 5; this.menuStrip1.TabIndex = 5;
this.menuStrip1.Text = "E&xecute"; this.menuStrip1.Text = "E&xecute";
// //
@ -169,7 +145,8 @@
// //
this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.mitmMainViewCallStack, this.mitmMainViewCallStack,
this.mitmMainViewWatches}); this.mitmMainViewWatches,
this.mitmViewLog});
this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20); this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
this.viewToolStripMenuItem.Text = "&View"; this.viewToolStripMenuItem.Text = "&View";
@ -188,12 +165,18 @@
this.mitmMainViewWatches.Text = "&Watches"; this.mitmMainViewWatches.Text = "&Watches";
this.mitmMainViewWatches.Click += new System.EventHandler(this.mitmMainViewWatches_Click); this.mitmMainViewWatches.Click += new System.EventHandler(this.mitmMainViewWatches_Click);
// //
// mitmViewLog
//
this.mitmViewLog.Name = "mitmViewLog";
this.mitmViewLog.Size = new System.Drawing.Size(122, 22);
this.mitmViewLog.Text = "&Log";
this.mitmViewLog.Click += new System.EventHandler(this.mitmViewLog_Click);
//
// FormMain // FormMain
// //
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(775, 416); this.ClientSize = new System.Drawing.Size(160, 54);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
@ -202,10 +185,8 @@
this.Text = "Cosmos GDB Debugger"; this.Text = "Cosmos GDB Debugger";
this.TopMost = true; this.TopMost = true;
this.Load += new System.EventHandler(this.FormMain_Load); 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.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormMain_FormClosing);
this.Resize += new System.EventHandler(this.FormMain_Resize); this.Resize += new System.EventHandler(this.FormMain_Resize);
this.tabControl1.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
@ -216,8 +197,6 @@
#endregion #endregion
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mitmExit; private System.Windows.Forms.ToolStripMenuItem mitmExit;
@ -232,6 +211,7 @@
private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mitmMainViewCallStack; private System.Windows.Forms.ToolStripMenuItem mitmMainViewCallStack;
private System.Windows.Forms.ToolStripMenuItem mitmMainViewWatches; private System.Windows.Forms.ToolStripMenuItem mitmMainViewWatches;
private System.Windows.Forms.ToolStripMenuItem mitmViewLog;
} }
} }

View file

@ -19,12 +19,6 @@ namespace Cosmos.Debug.GDB {
// watches // watches
// View stack // View stack
private void FormMain_Shown(object sender, EventArgs e) {
if (mitmConnect.Enabled) {
Connect(true);
}
}
private void mitmExit_Click(object sender, EventArgs e) { private void mitmExit_Click(object sender, EventArgs e) {
Close(); Close();
} }
@ -70,11 +64,6 @@ namespace Cosmos.Debug.GDB {
Windows.Show(Windows.mWatchesForm); Windows.Show(Windows.mWatchesForm);
} }
private void FormMain_Load(object sender, EventArgs e) {
Windows.mMainForm = this;
Settings.Load();
}
private void FormMain_FormClosing(object sender, FormClosingEventArgs e) { private void FormMain_FormClosing(object sender, FormClosingEventArgs e) {
Settings.Save(); Settings.Save();
} }
@ -91,5 +80,17 @@ namespace Cosmos.Debug.GDB {
mLastWindowState = WindowState; mLastWindowState = WindowState;
} }
private void mitmViewLog_Click(object sender, EventArgs e) {
Windows.Show(Windows.mLogForm);
}
private void FormMain_Load(object sender, EventArgs e) {
Windows.mMainForm = this;
Settings.Load();
if (mitmConnect.Enabled) {
Connect(true);
}
}
} }
} }

View file

@ -73,6 +73,15 @@ namespace Cosmos.Debug.GDB {
SendCmd("symbol-file CosmosKernel.obj"); SendCmd("symbol-file CosmosKernel.obj");
SendCmd("target remote :8832"); SendCmd("target remote :8832");
//&target remote :8832
//&:8832: No connection could be made because the target machine actively refused it.
//^error,msg=":8832: No connection could be made because the target machine actively refused it."
//&target remote :8832
//~Remote debugging using :8832
//~[New Thread 1]
//~0x000ffff0 in ?? ()
//^done
SendCmd("set architecture i386"); SendCmd("set architecture i386");
SendCmd("set language asm"); SendCmd("set language asm");