From 870a9711c571e2e8f8b0de3c0d52523d91deb812 Mon Sep 17 00:00:00 2001 From: Phil Garcia Date: Sun, 2 Aug 2015 06:31:32 -0700 Subject: [PATCH 1/2] - Attempting to fix exception handling bug --- .../Mosa.Compiler.Framework/MosaCompiler.cs | 7 ++ .../Stages/CodeGenerationStage.cs | 12 ++ .../Stages/IROptimizationStage.cs | 7 +- .../Stages/PromoteTempVariablesStage.cs | 4 +- .../MetadataPRTableStruct.cs | 2 +- Source/Mosa.Platform.Internal.x86/Runtime.cs | 25 ++-- Source/Mosa.Test.Collection/SpecificTests.cs | 7 +- Source/Mosa.TinyCPUSimulator.Debug/Program.cs | 4 +- .../TestCompiler.cs | 22 +++- Source/Mosa.TinyCPUSimulator/SimSymbol.cs | 6 +- Source/Mosa.Tool.Explorer/Main.Designer.cs | 46 ++++++-- Source/Mosa.Tool.Explorer/Main.cs | 110 +++++++++++++++--- Source/Mosa.Tool.Explorer/Main.resx | 3 + 13 files changed, 196 insertions(+), 59 deletions(-) diff --git a/Source/Mosa.Compiler.Framework/MosaCompiler.cs b/Source/Mosa.Compiler.Framework/MosaCompiler.cs index faf794784e..54720e1709 100644 --- a/Source/Mosa.Compiler.Framework/MosaCompiler.cs +++ b/Source/Mosa.Compiler.Framework/MosaCompiler.cs @@ -110,6 +110,13 @@ public void PreCompile() public void ScheduleAll() { + //HACK - for debugging + // Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress + //var type = TypeSystem.GetTypeByName("Mosa.Platform.Internal.x86", "Runtime"); + //var method = type.FindMethodByName("GetProtectedRegionEntryByAddress"); + //CompilationScheduler.Schedule(method); + //ENDHACK + CompilationScheduler.ScheduleAll(TypeSystem); } diff --git a/Source/Mosa.Compiler.Framework/Stages/CodeGenerationStage.cs b/Source/Mosa.Compiler.Framework/Stages/CodeGenerationStage.cs index 953e049a0d..a17338da2d 100644 --- a/Source/Mosa.Compiler.Framework/Stages/CodeGenerationStage.cs +++ b/Source/Mosa.Compiler.Framework/Stages/CodeGenerationStage.cs @@ -191,6 +191,18 @@ protected virtual void BlockEnd(BasicBlock block) /// protected virtual void EndGenerate() { + //HACK - for debugging + // Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress + //if (MethodCompiler.Method.FullName.Contains("Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress")) + //{ + // codeStream.Position = codeStream.Length - 1; + // while (codeStream.Length < 1024) + // { + // codeStream.WriteByte(0); + // } + //} + //ENDHACK + codeEmitter.ResolvePatches(); } diff --git a/Source/Mosa.Compiler.Framework/Stages/IROptimizationStage.cs b/Source/Mosa.Compiler.Framework/Stages/IROptimizationStage.cs index 2970deb930..b10aca8f1d 100644 --- a/Source/Mosa.Compiler.Framework/Stages/IROptimizationStage.cs +++ b/Source/Mosa.Compiler.Framework/Stages/IROptimizationStage.cs @@ -281,8 +281,8 @@ private bool ContainsAddressOf(Operand local) private bool PromoteLocalVariable() { //HACK!!! HACK!!! HACK!!! - if (MethodCompiler.Method.FullName.Contains(" Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress")) - return false; + //if (MethodCompiler.Method.FullName.Contains(" Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress")) + // return false; bool change = false; @@ -306,9 +306,6 @@ private bool PromoteLocalVariable() if (ContainsAddressOf(local)) continue; - //if (local.Definitions.Count == 0 || local.Uses.Count == 0) - // continue; - var v = MethodCompiler.CreateVirtualRegister(local.Type.GetStackType()); if (trace.Active) trace.Log("*** PromoteLocalVariable"); diff --git a/Source/Mosa.Compiler.Framework/Stages/PromoteTempVariablesStage.cs b/Source/Mosa.Compiler.Framework/Stages/PromoteTempVariablesStage.cs index 9a88c86a68..5ba94d6ff8 100644 --- a/Source/Mosa.Compiler.Framework/Stages/PromoteTempVariablesStage.cs +++ b/Source/Mosa.Compiler.Framework/Stages/PromoteTempVariablesStage.cs @@ -17,8 +17,8 @@ public sealed class PromoteTempVariablesStage : PromoteLocalVariablesStage protected override void Run() { //HACK!!! HACK!!! HACK!!! - if (MethodCompiler.Method.FullName.Contains(" Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress")) - return; + //if (MethodCompiler.Method.FullName.Contains(" Mosa.Platform.Internal.x86.Runtime::GetProtectedRegionEntryByAddress")) + // return; if (!HasCode) return; diff --git a/Source/Mosa.Platform.Internal.x86/MetadataStructures/MetadataPRTableStruct.cs b/Source/Mosa.Platform.Internal.x86/MetadataStructures/MetadataPRTableStruct.cs index a1ba862759..7f564c25f0 100644 --- a/Source/Mosa.Platform.Internal.x86/MetadataStructures/MetadataPRTableStruct.cs +++ b/Source/Mosa.Platform.Internal.x86/MetadataStructures/MetadataPRTableStruct.cs @@ -18,7 +18,7 @@ public unsafe struct MetadataPRTableStruct public int NumberOfRegions; public const uint ProtectedRegionDefintionOffset = 1; - public static MetadataPRDefinitionStruct* GetProtecteRegionDefinitionAddress(MetadataPRTableStruct* data, uint slot) + public static MetadataPRDefinitionStruct* GetProtectedRegionDefinitionAddress(MetadataPRTableStruct* data, uint slot) { return (MetadataPRDefinitionStruct*)*((uint*)data + MetadataPRTableStruct.ProtectedRegionDefintionOffset + slot); } diff --git a/Source/Mosa.Platform.Internal.x86/Runtime.cs b/Source/Mosa.Platform.Internal.x86/Runtime.cs index c68f94d951..487973c545 100644 --- a/Source/Mosa.Platform.Internal.x86/Runtime.cs +++ b/Source/Mosa.Platform.Internal.x86/Runtime.cs @@ -285,7 +285,7 @@ public static void DebugOutput(uint code) public static void DebugOutput(string msg) { - for(int i = 0; i < msg.Length; i++) + for (int i = 0; i < msg.Length; i++) { var c = msg[i]; Native.Out8(0xEC, (byte)c); @@ -378,9 +378,10 @@ public static void Fault(uint code) MetadataPRDefinitionStruct* protectedRegionDef = null; uint currentStart = uint.MinValue; uint currentEnd = uint.MaxValue; + while (entry < entries) { - var prDef = MetadataPRTableStruct.GetProtecteRegionDefinitionAddress(protectedRegionTable, (uint)entry); + var prDef = MetadataPRTableStruct.GetProtectedRegionDefinitionAddress(protectedRegionTable, (uint)entry); uint start = prDef->StartOffset; uint end = prDef->EndOffset; @@ -388,28 +389,16 @@ public static void Fault(uint code) if ((offset >= start) && (offset < end) && (start >= currentStart) && (end < currentEnd)) { var handlerType = prDef->HandlerType; - - // If the handler is a Finally clause, accept without testing - if (handlerType == ExceptionHandlerType.Finally) - { - protectedRegionDef = prDef; - currentStart = start; - currentEnd = end; - entry++; - continue; - } - var exType = prDef->ExceptionType; - // If the handler is a Exception clause, accept if the exception Type - // is in the is within the inhertiance chain of the exception object - if (handlerType == ExceptionHandlerType.Exception && IsTypeInInheritanceChain(exType, exceptionType)) + // If the handler is a finally clause, accept without testing + // If the handler is a exception clause, accept if the exception type is in the is within the inhertiance chain of the exception object + if ((handlerType == ExceptionHandlerType.Finally) || + (handlerType == ExceptionHandlerType.Exception && IsTypeInInheritanceChain(exType, exceptionType))) { protectedRegionDef = prDef; currentStart = start; currentEnd = end; - entry++; - continue; } } diff --git a/Source/Mosa.Test.Collection/SpecificTests.cs b/Source/Mosa.Test.Collection/SpecificTests.cs index e845e2d76a..022d41111e 100644 --- a/Source/Mosa.Test.Collection/SpecificTests.cs +++ b/Source/Mosa.Test.Collection/SpecificTests.cs @@ -11,6 +11,11 @@ namespace Mosa.Test.Collection { public static class SpecificTests { + public unsafe static void RefPointer(ref int* ptr) + { + ptr++; + } + public static uint Test2(uint size) { uint first = 0xFFFFFFFF; // Marker @@ -49,4 +54,4 @@ public static uint Test2(uint size) // return Double.IsPositiveInfinity(Double.NegativeInfinity); //} } -} \ No newline at end of file +} diff --git a/Source/Mosa.TinyCPUSimulator.Debug/Program.cs b/Source/Mosa.TinyCPUSimulator.Debug/Program.cs index a543ec0c5e..7097267dd0 100644 --- a/Source/Mosa.TinyCPUSimulator.Debug/Program.cs +++ b/Source/Mosa.TinyCPUSimulator.Debug/Program.cs @@ -56,9 +56,9 @@ private static void Main(string[] args) //Test4(); //Test12(); - //Test13(); + Test13(); - Test14(); + //Test14(); } catch (Exception e) { diff --git a/Source/Mosa.TinyCPUSimulator.TestSystem/TestCompiler.cs b/Source/Mosa.TinyCPUSimulator.TestSystem/TestCompiler.cs index 7b277bd08f..63a8b1335e 100644 --- a/Source/Mosa.TinyCPUSimulator.TestSystem/TestCompiler.cs +++ b/Source/Mosa.TinyCPUSimulator.TestSystem/TestCompiler.cs @@ -29,6 +29,8 @@ public class TestCompiler : ITraceListener protected SimLinker linker; + protected const uint MaxTicks = 500000; + public TestCompiler(BaseTestPlatform platform) { this.platform = platform; @@ -65,15 +67,27 @@ protected void CompileTestCode() compiler.Load(TypeSystem.Load(moduleLoader.CreateMetadata())); + //compiler.Execute(); compiler.Execute(Environment.ProcessorCount); linker = compiler.Linker as SimLinker; + //DumpSymbols(); //simAdapter.SimCPU.Monitor.DebugOutput = true; // DEBUG OPTION Run(string.Empty, "Default", "AssemblyInit", true); - //simAdapter.SimCPU.Monitor.DebugOutput = true; // DEBUG OPTION + simAdapter.SimCPU.Monitor.DebugOutput = true; // DEBUG OPTION + } + + public void DumpSymbols() + { + var symbols = simAdapter.SimCPU.Symbols; + + foreach (var symbol in symbols) + { + Debug.WriteLine(symbol.Value.ToString()); + } } public T Run(string ns, string type, string method, params object[] parameters) @@ -107,12 +121,12 @@ protected T Run(string ns, string type, string method, bool reset, params obj platform.PrepareToExecuteMethod(simAdapter, address, parameters); - simAdapter.SimCPU.Monitor.BreakAtTick = simAdapter.SimCPU.Monitor.BreakAtTick + 500000; // nothing should take this long + simAdapter.SimCPU.Monitor.BreakAtTick = simAdapter.SimCPU.Monitor.BreakAtTick + MaxTicks; // nothing should take this long simAdapter.SimCPU.Execute(); if (simAdapter.SimCPU.Monitor.BreakAtTick == simAdapter.SimCPU.Tick) { - throw new Exception("Aborted. Method did not complete under 500000 ticks. " + simAdapter.SimCPU.Tick.ToString()); + throw new Exception("Aborted. Method did not complete under " + MaxTicks.ToString() + " ticks. " + simAdapter.SimCPU.Tick.ToString()); } if (runtimeMethod.Signature.ReturnType.IsVoid) @@ -174,4 +188,4 @@ void ITraceListener.OnNewTraceLog(TraceLog traceLog) { } } -} \ No newline at end of file +} diff --git a/Source/Mosa.TinyCPUSimulator/SimSymbol.cs b/Source/Mosa.TinyCPUSimulator/SimSymbol.cs index 7b7d69ce30..e205f0dfd2 100644 --- a/Source/Mosa.TinyCPUSimulator/SimSymbol.cs +++ b/Source/Mosa.TinyCPUSimulator/SimSymbol.cs @@ -17,7 +17,7 @@ public class SimSymbol public ulong Size { get; private set; } - public ulong EndAddress { get { return Address + Size; } } + public ulong EndAddress { get { return Size == 0 ? Address : Address + Size - 1; } } public SimSymbol(string name, ulong address, ulong size) { @@ -28,7 +28,7 @@ public SimSymbol(string name, ulong address, ulong size) public override string ToString() { - return "0x" + Address.ToString("X") + " " + Name; + return "0x" + Address.ToString("X") + " - " + "0x" + EndAddress.ToString("X") + " " + Name + " (" + Size.ToString() + ")"; } } -} \ No newline at end of file +} diff --git a/Source/Mosa.Tool.Explorer/Main.Designer.cs b/Source/Mosa.Tool.Explorer/Main.Designer.cs index 8725e2364c..aa46dfdf2e 100644 --- a/Source/Mosa.Tool.Explorer/Main.Designer.cs +++ b/Source/Mosa.Tool.Explorer/Main.Designer.cs @@ -55,6 +55,7 @@ private void InitializeComponent() this.enableBinaryCodeGeneration = new System.Windows.Forms.ToolStripMenuItem(); this.enableVariablePromotion = new System.Windows.Forms.ToolStripMenuItem(); this.enableInlinedMethods = new System.Windows.Forms.ToolStripMenuItem(); + this.advanceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.treeView = new System.Windows.Forms.TreeView(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); @@ -82,6 +83,8 @@ private void InitializeComponent() this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.cbPlatform = new System.Windows.Forms.ComboBox(); + this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); + this.dumpAllMethodStagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); label2 = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); stageLabel = new System.Windows.Forms.Label(); @@ -175,7 +178,8 @@ private void InitializeComponent() this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.compileToolStripMenuItem, - this.optionsToolStripMenuItem}); + this.optionsToolStripMenuItem, + this.advanceToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(992, 24); @@ -327,6 +331,14 @@ private void InitializeComponent() this.enableInlinedMethods.Size = new System.Drawing.Size(293, 22); this.enableInlinedMethods.Text = "Enable Inlined Methods"; // + // advanceToolStripMenuItem + // + this.advanceToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.dumpAllMethodStagesToolStripMenuItem}); + this.advanceToolStripMenuItem.Name = "advanceToolStripMenuItem"; + this.advanceToolStripMenuItem.Size = new System.Drawing.Size(65, 20); + this.advanceToolStripMenuItem.Text = "Advance"; + // // openFileDialog // this.openFileDialog.DefaultExt = "exe"; @@ -381,7 +393,7 @@ private void InitializeComponent() this.tabControl1.Location = new System.Drawing.Point(3, 3); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(713, 405); + this.tabControl1.Size = new System.Drawing.Size(710, 405); this.tabControl1.TabIndex = 38; // // tabPage1 @@ -397,7 +409,7 @@ private void InitializeComponent() this.tabPage1.Location = new System.Drawing.Point(4, 25); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(705, 376); + this.tabPage1.Size = new System.Drawing.Size(702, 376); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Instructions"; // @@ -405,7 +417,7 @@ private void InitializeComponent() // this.textBox1.Location = new System.Drawing.Point(537, 5); this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(100, 23); + this.textBox1.Size = new System.Drawing.Size(76, 23); this.textBox1.TabIndex = 42; this.textBox1.Visible = false; // @@ -459,7 +471,7 @@ private void InitializeComponent() this.tabPage2.Location = new System.Drawing.Point(4, 25); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(705, 376); + this.tabPage2.Size = new System.Drawing.Size(702, 376); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Debug"; // @@ -497,7 +509,7 @@ private void InitializeComponent() this.tabPage3.Location = new System.Drawing.Point(4, 25); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(705, 376); + this.tabPage3.Size = new System.Drawing.Size(702, 376); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Errors"; // @@ -521,7 +533,7 @@ private void InitializeComponent() this.tabPage4.Location = new System.Drawing.Point(4, 25); this.tabPage4.Name = "tabPage4"; this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(705, 376); + this.tabPage4.Size = new System.Drawing.Size(702, 376); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Log"; // @@ -545,7 +557,7 @@ private void InitializeComponent() this.tabPage5.Location = new System.Drawing.Point(4, 25); this.tabPage5.Name = "tabPage5"; this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(705, 376); + this.tabPage5.Size = new System.Drawing.Size(702, 376); this.tabPage5.TabIndex = 4; this.tabPage5.Text = "Counters"; // @@ -568,7 +580,7 @@ private void InitializeComponent() this.tabPage6.Location = new System.Drawing.Point(4, 25); this.tabPage6.Name = "tabPage6"; this.tabPage6.Padding = new System.Windows.Forms.Padding(3); - this.tabPage6.Size = new System.Drawing.Size(705, 376); + this.tabPage6.Size = new System.Drawing.Size(702, 376); this.tabPage6.TabIndex = 5; this.tabPage6.Text = "Exceptions"; this.tabPage6.UseVisualStyleBackColor = true; @@ -649,6 +661,17 @@ private void InitializeComponent() this.cbPlatform.Size = new System.Drawing.Size(78, 21); this.cbPlatform.TabIndex = 28; // + // folderBrowserDialog1 + // + this.folderBrowserDialog1.RootFolder = System.Environment.SpecialFolder.MyComputer; + // + // dumpAllMethodStagesToolStripMenuItem + // + this.dumpAllMethodStagesToolStripMenuItem.Name = "dumpAllMethodStagesToolStripMenuItem"; + this.dumpAllMethodStagesToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.dumpAllMethodStagesToolStripMenuItem.Text = "Dump All Method Stages"; + this.dumpAllMethodStagesToolStripMenuItem.Click += new System.EventHandler(this.dumpAllMethodStagesToolStripMenuItem_Click); + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -738,5 +761,8 @@ private void InitializeComponent() private System.Windows.Forms.RichTextBox rbException; private System.Windows.Forms.ToolStripMenuItem enableInlinedMethods; private System.Windows.Forms.ToolStripMenuItem enableVariablePromotion; + private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; + private System.Windows.Forms.ToolStripMenuItem advanceToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem dumpAllMethodStagesToolStripMenuItem; } -} \ No newline at end of file +} diff --git a/Source/Mosa.Tool.Explorer/Main.cs b/Source/Mosa.Tool.Explorer/Main.cs index 022d824cd4..cb3c030e46 100644 --- a/Source/Mosa.Tool.Explorer/Main.cs +++ b/Source/Mosa.Tool.Explorer/Main.cs @@ -42,7 +42,7 @@ private class MethodStages public List OrderedStageNames = new List(); public List OrderedDebugStageNames = new List(); public Dictionary> InstructionLogs = new Dictionary>(); - public Dictionary DebugLogs = new Dictionary(); + public Dictionary> DebugLogs = new Dictionary>(); } private StringBuilder compileLog = new StringBuilder(); @@ -186,7 +186,7 @@ private void SubmitInstructionTraceInformation(MosaMethod method, string stage, } } - private void SubmitDebugStageInformation(MosaMethod method, string stage, string lines) + private void SubmitDebugStageInformation(MosaMethod method, string stage, List lines) { lock (methodStagelock) { @@ -517,9 +517,13 @@ private void cbDebugStages_SelectedIndexChanged(object sender, EventArgs e) string stage = cbDebugStages.SelectedItem.ToString(); if (methodStage.DebugLogs.ContainsKey(stage)) - rbOtherResult.Text = methodStage.DebugLogs[stage].ToString(); + { + rbOtherResult.Text = GetDebugLogText(methodStage.DebugLogs[stage]); + } else + { rbOtherResult.Text = string.Empty; + } } } @@ -620,11 +624,13 @@ private void toolStripButton3_Click(object sender, EventArgs e) private void cbLabels_SelectedIndexChanged(object sender, EventArgs e) { - tbResult.Text = string.Empty; SetStatus(string.Empty); if (currentInstructionLines == null) + { + tbResult.Text = string.Empty; return; + } var node = GetCurrentNode>(); @@ -633,9 +639,34 @@ private void cbLabels_SelectedIndexChanged(object sender, EventArgs e) SetStatus(node.Type.FullName); + tbResult.Text = GetCurrentStageInstructions(currentInstructionLines); + } + + private string GetDebugLogText(List list) + { + var result = new StringBuilder(); + + if (currentInstructionLines == null) + return string.Empty; + + foreach (var l in list) + { + result.AppendLine(l); + } + + return result.ToString(); + } + + private string GetCurrentStageInstructions(List lines) + { + var result = new StringBuilder(); + + if (lines == null) + return string.Empty; + if (cbLabels.SelectedIndex == 0) { - foreach (string l in currentInstructionLines) + foreach (string l in lines) { string line = l; @@ -645,18 +676,18 @@ private void cbLabels_SelectedIndexChanged(object sender, EventArgs e) if (line.Contains("IR.BlockStart") || line.Contains("IR.BlockEnd")) continue; - tbResult.AppendText(line); - tbResult.AppendText("\n"); + result.Append(line); + result.Append("\n"); } - return; + return result.ToString(); } string blockLabel = cbLabels.SelectedItem as string; bool inBlock = false; - foreach (string l in currentInstructionLines) + foreach (string l in lines) { string line = l; @@ -673,13 +704,17 @@ private void cbLabels_SelectedIndexChanged(object sender, EventArgs e) if (line.Contains("IR.BlockStart") || line.Contains("IR.BlockEnd")) continue; - tbResult.AppendText(line); - tbResult.AppendText("\n"); + result.Append(line); + result.Append("\n"); if (line.StartsWith(" Next:")) - return; + { + return result.ToString(); + } } } + + return result.ToString(); } private void toolStripButton4_Click(object sender, EventArgs e) @@ -727,12 +762,61 @@ void ITraceListener.OnNewTraceLog(TraceLog traceLog) if (traceLog.Section != null) stagesection = stagesection + "-" + traceLog.Section; - SubmitDebugStageInformation(traceLog.Method, stagesection, traceLog.ToString()); + SubmitDebugStageInformation(traceLog.Method, stagesection, traceLog.Lines); } else if (traceLog.Type == TraceType.InstructionList) { SubmitInstructionTraceInformation(traceLog.Method, traceLog.Stage, traceLog.Lines); } } + + private void dumpAllMethodStagesToolStripMenuItem_Click(object sender, EventArgs e) + { + var node = GetCurrentNode>(); + + if (node == null) + return; + + var type = node.Type.FullName; + + if (folderBrowserDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + var path = folderBrowserDialog1.SelectedPath; + + cbStages.SelectedIndex = 0; + + while (true) + { + cbStages_SelectedIndexChanged(null, null); + + string stage = cbStages.SelectedItem.ToString(); + var result = tbResult.Text.Replace("\n", "\r\n"); + + File.WriteAllText(Path.Combine(path, stage + "-stage.txt"), result); + + if (cbStages.Items.Count == cbStages.SelectedIndex + 1) + break; + + cbStages.SelectedIndex++; + } + + cbDebugStages.SelectedIndex = 0; + + while (true) + { + cbDebugStages_SelectedIndexChanged(null, null); + + string stage = cbDebugStages.SelectedItem.ToString(); + var result = rbOtherResult.Text.Replace("\n","\r\n"); + + File.WriteAllText(Path.Combine(path, stage + "-debug.txt"), result); + + if (cbDebugStages.Items.Count == cbDebugStages.SelectedIndex + 1) + break; + + cbDebugStages.SelectedIndex++; + } + } + } } } diff --git a/Source/Mosa.Tool.Explorer/Main.resx b/Source/Mosa.Tool.Explorer/Main.resx index 022caf26d4..ddc994e466 100644 --- a/Source/Mosa.Tool.Explorer/Main.resx +++ b/Source/Mosa.Tool.Explorer/Main.resx @@ -183,6 +183,9 @@ RK5CYII= + + 486, 17 + 25 From d8f84450af2916e9bb0b4495c65cf1da02a29216 Mon Sep 17 00:00:00 2001 From: Phil Garcia Date: Sun, 2 Aug 2015 06:41:39 -0700 Subject: [PATCH 2/2] - Updated version numbers --- Source/Mosa.Tool.Explorer/Main.Designer.cs | 32 +- .../Mosa.Tool.Launcher/MainForm.Designer.cs | 320 +++++++++--------- Source/Mosa.Tool.Launcher/MainForm.cs | 2 +- 3 files changed, 177 insertions(+), 177 deletions(-) diff --git a/Source/Mosa.Tool.Explorer/Main.Designer.cs b/Source/Mosa.Tool.Explorer/Main.Designer.cs index aa46dfdf2e..15bb966d21 100644 --- a/Source/Mosa.Tool.Explorer/Main.Designer.cs +++ b/Source/Mosa.Tool.Explorer/Main.Designer.cs @@ -56,6 +56,7 @@ private void InitializeComponent() this.enableVariablePromotion = new System.Windows.Forms.ToolStripMenuItem(); this.enableInlinedMethods = new System.Windows.Forms.ToolStripMenuItem(); this.advanceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dumpAllMethodStagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); this.treeView = new System.Windows.Forms.TreeView(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); @@ -84,7 +85,6 @@ private void InitializeComponent() this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.cbPlatform = new System.Windows.Forms.ComboBox(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.dumpAllMethodStagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); label2 = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); stageLabel = new System.Windows.Forms.Label(); @@ -339,6 +339,13 @@ private void InitializeComponent() this.advanceToolStripMenuItem.Size = new System.Drawing.Size(65, 20); this.advanceToolStripMenuItem.Text = "Advance"; // + // dumpAllMethodStagesToolStripMenuItem + // + this.dumpAllMethodStagesToolStripMenuItem.Name = "dumpAllMethodStagesToolStripMenuItem"; + this.dumpAllMethodStagesToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.dumpAllMethodStagesToolStripMenuItem.Text = "Dump All Method Stages"; + this.dumpAllMethodStagesToolStripMenuItem.Click += new System.EventHandler(this.dumpAllMethodStagesToolStripMenuItem_Click); + // // openFileDialog // this.openFileDialog.DefaultExt = "exe"; @@ -393,7 +400,7 @@ private void InitializeComponent() this.tabControl1.Location = new System.Drawing.Point(3, 3); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(710, 405); + this.tabControl1.Size = new System.Drawing.Size(709, 405); this.tabControl1.TabIndex = 38; // // tabPage1 @@ -409,7 +416,7 @@ private void InitializeComponent() this.tabPage1.Location = new System.Drawing.Point(4, 25); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(702, 376); + this.tabPage1.Size = new System.Drawing.Size(701, 376); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Instructions"; // @@ -471,7 +478,7 @@ private void InitializeComponent() this.tabPage2.Location = new System.Drawing.Point(4, 25); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(702, 376); + this.tabPage2.Size = new System.Drawing.Size(701, 376); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Debug"; // @@ -509,7 +516,7 @@ private void InitializeComponent() this.tabPage3.Location = new System.Drawing.Point(4, 25); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(702, 376); + this.tabPage3.Size = new System.Drawing.Size(701, 376); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Errors"; // @@ -533,7 +540,7 @@ private void InitializeComponent() this.tabPage4.Location = new System.Drawing.Point(4, 25); this.tabPage4.Name = "tabPage4"; this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(702, 376); + this.tabPage4.Size = new System.Drawing.Size(701, 376); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Log"; // @@ -557,7 +564,7 @@ private void InitializeComponent() this.tabPage5.Location = new System.Drawing.Point(4, 25); this.tabPage5.Name = "tabPage5"; this.tabPage5.Padding = new System.Windows.Forms.Padding(3); - this.tabPage5.Size = new System.Drawing.Size(702, 376); + this.tabPage5.Size = new System.Drawing.Size(701, 376); this.tabPage5.TabIndex = 4; this.tabPage5.Text = "Counters"; // @@ -580,7 +587,7 @@ private void InitializeComponent() this.tabPage6.Location = new System.Drawing.Point(4, 25); this.tabPage6.Name = "tabPage6"; this.tabPage6.Padding = new System.Windows.Forms.Padding(3); - this.tabPage6.Size = new System.Drawing.Size(702, 376); + this.tabPage6.Size = new System.Drawing.Size(701, 376); this.tabPage6.TabIndex = 5; this.tabPage6.Text = "Exceptions"; this.tabPage6.UseVisualStyleBackColor = true; @@ -665,13 +672,6 @@ private void InitializeComponent() // this.folderBrowserDialog1.RootFolder = System.Environment.SpecialFolder.MyComputer; // - // dumpAllMethodStagesToolStripMenuItem - // - this.dumpAllMethodStagesToolStripMenuItem.Name = "dumpAllMethodStagesToolStripMenuItem"; - this.dumpAllMethodStagesToolStripMenuItem.Size = new System.Drawing.Size(206, 22); - this.dumpAllMethodStagesToolStripMenuItem.Text = "Dump All Method Stages"; - this.dumpAllMethodStagesToolStripMenuItem.Click += new System.EventHandler(this.dumpAllMethodStagesToolStripMenuItem_Click); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -685,7 +685,7 @@ private void InitializeComponent() this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MainMenuStrip = this.menuStrip1; this.Name = "Main"; - this.Text = "MOSA Explorer v1.5.1"; + this.Text = "MOSA Explorer v1.5.2"; this.Load += new System.EventHandler(this.Main_Load); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); diff --git a/Source/Mosa.Tool.Launcher/MainForm.Designer.cs b/Source/Mosa.Tool.Launcher/MainForm.Designer.cs index f613a5ec17..0c022c335d 100644 --- a/Source/Mosa.Tool.Launcher/MainForm.Designer.cs +++ b/Source/Mosa.Tool.Launcher/MainForm.Designer.cs @@ -120,26 +120,26 @@ private void InitializeComponent() this.tpOutput.SuspendLayout(); this.tabPage3.SuspendLayout(); this.SuspendLayout(); - // + // // openFileDialog1 - // + // this.openFileDialog1.DefaultExt = "*.exe"; this.openFileDialog1.Filter = "Assemblies|*.exe"; this.openFileDialog1.Title = "Select Assembly"; - // + // // progressBar1 - // - this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.progressBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.progressBar1.Location = new System.Drawing.Point(0, 6); this.progressBar1.Name = "progressBar1"; this.progressBar1.Size = new System.Drawing.Size(634, 20); this.progressBar1.TabIndex = 3; - // + // // tabControl1 - // - this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + // + this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; this.tabControl1.Controls.Add(this.tbOptions); @@ -155,9 +155,9 @@ private void InitializeComponent() this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(634, 410); this.tabControl1.TabIndex = 22; - // + // // tbOptions - // + // this.tbOptions.BackColor = System.Drawing.SystemColors.Control; this.tbOptions.Controls.Add(this.groupBox12); this.tbOptions.Controls.Add(this.statusStrip1); @@ -173,9 +173,9 @@ private void InitializeComponent() this.tbOptions.Size = new System.Drawing.Size(626, 384); this.tbOptions.TabIndex = 0; this.tbOptions.Text = "MOSA Options"; - // + // // groupBox12 - // + // this.groupBox12.Controls.Add(this.cbCompilerUsesMultipleThreads); this.groupBox12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBox12.Location = new System.Drawing.Point(286, 317); @@ -184,9 +184,9 @@ private void InitializeComponent() this.groupBox12.TabIndex = 30; this.groupBox12.TabStop = false; this.groupBox12.Text = "Misc Options:"; - // + // // cbCompilerUsesMultipleThreads - // + // this.cbCompilerUsesMultipleThreads.AutoSize = true; this.cbCompilerUsesMultipleThreads.Checked = true; this.cbCompilerUsesMultipleThreads.CheckState = System.Windows.Forms.CheckState.Checked; @@ -197,9 +197,9 @@ private void InitializeComponent() this.cbCompilerUsesMultipleThreads.TabIndex = 13; this.cbCompilerUsesMultipleThreads.Text = "Use Multiple Threads"; this.cbCompilerUsesMultipleThreads.UseVisualStyleBackColor = true; - // + // // statusStrip1 - // + // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsStatusLabel}); this.statusStrip1.Location = new System.Drawing.Point(0, 362); @@ -207,14 +207,14 @@ private void InitializeComponent() this.statusStrip1.Size = new System.Drawing.Size(626, 22); this.statusStrip1.TabIndex = 32; this.statusStrip1.Text = "statusStrip1"; - // + // // tsStatusLabel - // + // this.tsStatusLabel.Name = "tsStatusLabel"; this.tsStatusLabel.Size = new System.Drawing.Size(0, 17); - // + // // groupBox5 - // + // this.groupBox5.Controls.Add(this.cbDebugConnectionOption); this.groupBox5.Controls.Add(this.label8); this.groupBox5.Controls.Add(this.checkBox1); @@ -226,9 +226,9 @@ private void InitializeComponent() this.groupBox5.TabIndex = 31; this.groupBox5.TabStop = false; this.groupBox5.Text = "Debugger:"; - // + // // cbDebugConnectionOption - // + // this.cbDebugConnectionOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbDebugConnectionOption.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbDebugConnectionOption.FormattingEnabled = true; @@ -241,9 +241,9 @@ private void InitializeComponent() this.cbDebugConnectionOption.Name = "cbDebugConnectionOption"; this.cbDebugConnectionOption.Size = new System.Drawing.Size(120, 21); this.cbDebugConnectionOption.TabIndex = 36; - // + // // label8 - // + // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(6, 71); @@ -251,9 +251,9 @@ private void InitializeComponent() this.label8.Size = new System.Drawing.Size(116, 13); this.label8.TabIndex = 35; this.label8.Text = "Debug Connection:"; - // + // // checkBox1 - // + // this.checkBox1.AutoSize = true; this.checkBox1.Enabled = false; this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -263,9 +263,9 @@ private void InitializeComponent() this.checkBox1.TabIndex = 14; this.checkBox1.Text = "MOSA Debugger"; this.checkBox1.UseVisualStyleBackColor = true; - // + // // cbMOSADebugger - // + // this.cbMOSADebugger.AutoSize = true; this.cbMOSADebugger.Enabled = false; this.cbMOSADebugger.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -275,9 +275,9 @@ private void InitializeComponent() this.cbMOSADebugger.TabIndex = 13; this.cbMOSADebugger.Text = "MOSA TinySimulator"; this.cbMOSADebugger.UseVisualStyleBackColor = true; - // + // // groupBox2 - // + // this.groupBox2.Controls.Add(this.cbGenerateASMFile); this.groupBox2.Controls.Add(this.cbGenerateMapFile); this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -287,9 +287,9 @@ private void InitializeComponent() this.groupBox2.TabIndex = 29; this.groupBox2.TabStop = false; this.groupBox2.Text = "Diagnostic Output:"; - // + // // cbGenerateASMFile - // + // this.cbGenerateASMFile.AutoSize = true; this.cbGenerateASMFile.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbGenerateASMFile.Location = new System.Drawing.Point(137, 19); @@ -298,9 +298,9 @@ private void InitializeComponent() this.cbGenerateASMFile.TabIndex = 14; this.cbGenerateASMFile.Text = "Generate ASM File"; this.cbGenerateASMFile.UseVisualStyleBackColor = true; - // + // // cbGenerateMapFile - // + // this.cbGenerateMapFile.AutoSize = true; this.cbGenerateMapFile.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbGenerateMapFile.Location = new System.Drawing.Point(6, 19); @@ -309,10 +309,10 @@ private void InitializeComponent() this.cbGenerateMapFile.TabIndex = 13; this.cbGenerateMapFile.Text = "Generate MAP File"; this.cbGenerateMapFile.UseVisualStyleBackColor = true; - // + // // groupBox6 - // - this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox6.Controls.Add(this.button1); this.groupBox6.Controls.Add(this.label6); @@ -326,10 +326,10 @@ private void InitializeComponent() this.groupBox6.TabIndex = 28; this.groupBox6.TabStop = false; this.groupBox6.Text = "Virtual Machine Emulator:"; - // + // // button1 - // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button1.Location = new System.Drawing.Point(14, 129); @@ -339,9 +339,9 @@ private void InitializeComponent() this.button1.Text = "Compile and Run (F5)"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); - // + // // label6 - // + // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label6.Location = new System.Drawing.Point(7, 52); @@ -349,9 +349,9 @@ private void InitializeComponent() this.label6.Size = new System.Drawing.Size(54, 13); this.label6.TabIndex = 24; this.label6.Text = "Memory:"; - // + // // nmMemory - // + // this.nmMemory.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nmMemory.Location = new System.Drawing.Point(67, 50); this.nmMemory.Maximum = new decimal(new int[] { @@ -372,9 +372,9 @@ private void InitializeComponent() 0, 0, 0}); - // + // // cbExitOnLaunch - // + // this.cbExitOnLaunch.AutoSize = true; this.cbExitOnLaunch.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbExitOnLaunch.Location = new System.Drawing.Point(14, 106); @@ -383,9 +383,9 @@ private void InitializeComponent() this.cbExitOnLaunch.TabIndex = 22; this.cbExitOnLaunch.Text = "Exit on Emulator"; this.cbExitOnLaunch.UseVisualStyleBackColor = true; - // + // // cbEmulator - // + // this.cbEmulator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbEmulator.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbEmulator.FormattingEnabled = true; @@ -397,10 +397,10 @@ private void InitializeComponent() this.cbEmulator.Name = "cbEmulator"; this.cbEmulator.Size = new System.Drawing.Size(171, 21); this.cbEmulator.TabIndex = 21; - // + // // groupBox4 - // - this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox4.Controls.Add(this.lbSourceDirectory); this.groupBox4.Controls.Add(this.label7); @@ -412,18 +412,18 @@ private void InitializeComponent() this.groupBox4.TabIndex = 25; this.groupBox4.TabStop = false; this.groupBox4.Text = "Source:"; - // + // // lbSourceDirectory - // + // this.lbSourceDirectory.AutoSize = true; this.lbSourceDirectory.Location = new System.Drawing.Point(119, 48); this.lbSourceDirectory.Name = "lbSourceDirectory"; this.lbSourceDirectory.Size = new System.Drawing.Size(94, 13); this.lbSourceDirectory.TabIndex = 20; this.lbSourceDirectory.Text = "{Source Directory}"; - // + // // label7 - // + // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.Location = new System.Drawing.Point(7, 48); @@ -431,9 +431,9 @@ private void InitializeComponent() this.label7.Size = new System.Drawing.Size(106, 13); this.label7.TabIndex = 19; this.label7.Text = "Source Directory:"; - // + // // btnSource - // + // this.btnSource.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSource.Location = new System.Drawing.Point(10, 19); this.btnSource.Name = "btnSource"; @@ -442,19 +442,19 @@ private void InitializeComponent() this.btnSource.Text = "Source:"; this.btnSource.UseVisualStyleBackColor = true; this.btnSource.Click += new System.EventHandler(this.btnSource_Click); - // + // // lbSource - // + // this.lbSource.AutoSize = true; this.lbSource.Location = new System.Drawing.Point(119, 24); this.lbSource.Name = "lbSource"; this.lbSource.Size = new System.Drawing.Size(49, 13); this.lbSource.TabIndex = 17; this.lbSource.Text = "{Source}"; - // + // // groupBox3 - // - this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox3.Controls.Add(this.label4); this.groupBox3.Controls.Add(this.cbBootFileSystem); @@ -474,9 +474,9 @@ private void InitializeComponent() this.groupBox3.TabIndex = 24; this.groupBox3.TabStop = false; this.groupBox3.Text = "Output:"; - // + // // label4 - // + // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(193, 81); @@ -484,9 +484,9 @@ private void InitializeComponent() this.label4.Size = new System.Drawing.Size(105, 13); this.label4.TabIndex = 34; this.label4.Text = "Boot File System:"; - // + // // cbBootFileSystem - // + // this.cbBootFileSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbBootFileSystem.FormattingEnabled = true; this.cbBootFileSystem.Items.AddRange(new object[] { @@ -496,9 +496,9 @@ private void InitializeComponent() this.cbBootFileSystem.Name = "cbBootFileSystem"; this.cbBootFileSystem.Size = new System.Drawing.Size(101, 21); this.cbBootFileSystem.TabIndex = 33; - // + // // label2 - // + // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.Location = new System.Drawing.Point(193, 54); @@ -506,9 +506,9 @@ private void InitializeComponent() this.label2.Size = new System.Drawing.Size(79, 13); this.label2.TabIndex = 32; this.label2.Text = "Boot Format:"; - // + // // cbBootFormat - // + // this.cbBootFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbBootFormat.FormattingEnabled = true; this.cbBootFormat.Items.AddRange(new object[] { @@ -517,9 +517,9 @@ private void InitializeComponent() this.cbBootFormat.Name = "cbBootFormat"; this.cbBootFormat.Size = new System.Drawing.Size(127, 21); this.cbBootFormat.TabIndex = 31; - // + // // label5 - // + // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label5.Location = new System.Drawing.Point(46, 54); @@ -527,9 +527,9 @@ private void InitializeComponent() this.label5.Size = new System.Drawing.Size(57, 13); this.label5.TabIndex = 30; this.label5.Text = "Platform:"; - // + // // cbPlatform - // + // this.cbPlatform.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbPlatform.FormattingEnabled = true; this.cbPlatform.Items.AddRange(new object[] { @@ -539,9 +539,9 @@ private void InitializeComponent() this.cbPlatform.Name = "cbPlatform"; this.cbPlatform.Size = new System.Drawing.Size(78, 21); this.cbPlatform.TabIndex = 29; - // + // // btnDestination - // + // this.btnDestination.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnDestination.Location = new System.Drawing.Point(6, 18); this.btnDestination.Name = "btnDestination"; @@ -550,9 +550,9 @@ private void InitializeComponent() this.btnDestination.Text = "Destination:"; this.btnDestination.UseVisualStyleBackColor = true; this.btnDestination.Click += new System.EventHandler(this.btnDestination_Click); - // + // // cbImageFormat - // + // this.cbImageFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbImageFormat.FormattingEnabled = true; this.cbImageFormat.Items.AddRange(new object[] { @@ -565,9 +565,9 @@ private void InitializeComponent() this.cbImageFormat.Name = "cbImageFormat"; this.cbImageFormat.Size = new System.Drawing.Size(100, 21); this.cbImageFormat.TabIndex = 16; - // + // // label1 - // + // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.Location = new System.Drawing.Point(12, 81); @@ -575,18 +575,18 @@ private void InitializeComponent() this.label1.Size = new System.Drawing.Size(88, 13); this.label1.TabIndex = 15; this.label1.Text = "Linker Format:"; - // + // // lbDestinationDirectory - // + // this.lbDestinationDirectory.AutoSize = true; this.lbDestinationDirectory.Location = new System.Drawing.Point(119, 23); this.lbDestinationDirectory.Name = "lbDestinationDirectory"; this.lbDestinationDirectory.Size = new System.Drawing.Size(113, 13); this.lbDestinationDirectory.TabIndex = 14; this.lbDestinationDirectory.Text = "{Destination Directory}"; - // + // // label3 - // + // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.Location = new System.Drawing.Point(411, 54); @@ -594,9 +594,9 @@ private void InitializeComponent() this.label3.Size = new System.Drawing.Size(87, 13); this.label3.TabIndex = 12; this.label3.Text = "Image Format:"; - // + // // cbLinkerFormat - // + // this.cbLinkerFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbLinkerFormat.FormattingEnabled = true; this.cbLinkerFormat.Items.AddRange(new object[] { @@ -606,9 +606,9 @@ private void InitializeComponent() this.cbLinkerFormat.Name = "cbLinkerFormat"; this.cbLinkerFormat.Size = new System.Drawing.Size(78, 21); this.cbLinkerFormat.TabIndex = 11; - // + // // groupBox1 - // + // this.groupBox1.Controls.Add(this.cbInlinedMethods); this.groupBox1.Controls.Add(this.cbEnableSparseConditionalConstantPropagation); this.groupBox1.Controls.Add(this.cbEnableIROptimizations); @@ -620,9 +620,9 @@ private void InitializeComponent() this.groupBox1.TabIndex = 22; this.groupBox1.TabStop = false; this.groupBox1.Text = "Optimizations:"; - // + // // cbInlinedMethods - // + // this.cbInlinedMethods.AutoSize = true; this.cbInlinedMethods.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cbInlinedMethods.Location = new System.Drawing.Point(6, 89); @@ -631,9 +631,9 @@ private void InitializeComponent() this.cbInlinedMethods.TabIndex = 9; this.cbInlinedMethods.Text = "Enable Inlined Methods"; this.cbInlinedMethods.UseVisualStyleBackColor = true; - // + // // cbEnableSparseConditionalConstantPropagation - // + // this.cbEnableSparseConditionalConstantPropagation.AutoSize = true; this.cbEnableSparseConditionalConstantPropagation.Checked = true; this.cbEnableSparseConditionalConstantPropagation.CheckState = System.Windows.Forms.CheckState.Checked; @@ -644,9 +644,9 @@ private void InitializeComponent() this.cbEnableSparseConditionalConstantPropagation.TabIndex = 8; this.cbEnableSparseConditionalConstantPropagation.Text = "Enable Sparse Conditional Constant Propagation"; this.cbEnableSparseConditionalConstantPropagation.UseVisualStyleBackColor = true; - // + // // cbEnableIROptimizations - // + // this.cbEnableIROptimizations.AutoSize = true; this.cbEnableIROptimizations.Checked = true; this.cbEnableIROptimizations.CheckState = System.Windows.Forms.CheckState.Checked; @@ -657,9 +657,9 @@ private void InitializeComponent() this.cbEnableIROptimizations.TabIndex = 7; this.cbEnableIROptimizations.Text = "Enable IR Optimizations"; this.cbEnableIROptimizations.UseVisualStyleBackColor = true; - // + // // cbEnableSSA - // + // this.cbEnableSSA.AutoSize = true; this.cbEnableSSA.Checked = true; this.cbEnableSSA.CheckState = System.Windows.Forms.CheckState.Checked; @@ -670,9 +670,9 @@ private void InitializeComponent() this.cbEnableSSA.TabIndex = 6; this.cbEnableSSA.Text = "Enable Static Single Assignment (SSA)"; this.cbEnableSSA.UseVisualStyleBackColor = true; - // + // // tabPage4 - // + // this.tabPage4.Controls.Add(this.groupBox11); this.tabPage4.Controls.Add(this.groupBox10); this.tabPage4.Controls.Add(this.groupBox9); @@ -685,10 +685,10 @@ private void InitializeComponent() this.tabPage4.TabIndex = 3; this.tabPage4.Text = "Application Settings"; this.tabPage4.UseVisualStyleBackColor = true; - // + // // groupBox11 - // - this.groupBox11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox11.Controls.Add(this.button7); this.groupBox11.Controls.Add(this.lbmkisofsExecutable); @@ -698,9 +698,9 @@ private void InitializeComponent() this.groupBox11.TabIndex = 25; this.groupBox11.TabStop = false; this.groupBox11.Text = "mkisofs:"; - // + // // button7 - // + // this.button7.Enabled = false; this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button7.Location = new System.Drawing.Point(6, 19); @@ -709,19 +709,19 @@ private void InitializeComponent() this.button7.TabIndex = 20; this.button7.Text = "Executable:"; this.button7.UseVisualStyleBackColor = true; - // + // // lbmkisofsExecutable - // + // this.lbmkisofsExecutable.AutoSize = true; this.lbmkisofsExecutable.Location = new System.Drawing.Point(118, 24); this.lbmkisofsExecutable.Name = "lbmkisofsExecutable"; this.lbmkisofsExecutable.Size = new System.Drawing.Size(126, 13); this.lbmkisofsExecutable.TabIndex = 19; this.lbmkisofsExecutable.Text = "{mkisofs.exe Executable}"; - // + // // groupBox10 - // - this.groupBox10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox10.Controls.Add(this.button4); this.groupBox10.Controls.Add(this.lbVMwarePlayerExecutable); @@ -731,9 +731,9 @@ private void InitializeComponent() this.groupBox10.TabIndex = 24; this.groupBox10.TabStop = false; this.groupBox10.Text = "VMware Player:"; - // + // // button4 - // + // this.button4.Enabled = false; this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button4.Location = new System.Drawing.Point(6, 19); @@ -742,19 +742,19 @@ private void InitializeComponent() this.button4.TabIndex = 20; this.button4.Text = "Executable:"; this.button4.UseVisualStyleBackColor = true; - // + // // lbVMwarePlayerExecutable - // + // this.lbVMwarePlayerExecutable.AutoSize = true; this.lbVMwarePlayerExecutable.Location = new System.Drawing.Point(118, 24); this.lbVMwarePlayerExecutable.Name = "lbVMwarePlayerExecutable"; this.lbVMwarePlayerExecutable.Size = new System.Drawing.Size(142, 13); this.lbVMwarePlayerExecutable.TabIndex = 19; this.lbVMwarePlayerExecutable.Text = "{VMware Player Executable}"; - // + // // groupBox9 - // - this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox9.Controls.Add(this.button6); this.groupBox9.Controls.Add(this.lbBOCHSExecutable); @@ -764,9 +764,9 @@ private void InitializeComponent() this.groupBox9.TabIndex = 23; this.groupBox9.TabStop = false; this.groupBox9.Text = "BOCHS:"; - // + // // button6 - // + // this.button6.Enabled = false; this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button6.Location = new System.Drawing.Point(6, 19); @@ -775,19 +775,19 @@ private void InitializeComponent() this.button6.TabIndex = 20; this.button6.Text = "Executable:"; this.button6.UseVisualStyleBackColor = true; - // + // // lbBOCHSExecutable - // + // this.lbBOCHSExecutable.AutoSize = true; this.lbBOCHSExecutable.Location = new System.Drawing.Point(118, 24); this.lbBOCHSExecutable.Name = "lbBOCHSExecutable"; this.lbBOCHSExecutable.Size = new System.Drawing.Size(108, 13); this.lbBOCHSExecutable.TabIndex = 19; this.lbBOCHSExecutable.Text = "{BOCHS Executable}"; - // + // // groupBox8 - // - this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox8.Controls.Add(this.button5); this.groupBox8.Controls.Add(this.lbNDISASMExecutable); @@ -797,9 +797,9 @@ private void InitializeComponent() this.groupBox8.TabIndex = 1; this.groupBox8.TabStop = false; this.groupBox8.Text = "NDISASM:"; - // + // // button5 - // + // this.button5.Enabled = false; this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button5.Location = new System.Drawing.Point(6, 19); @@ -808,19 +808,19 @@ private void InitializeComponent() this.button5.TabIndex = 20; this.button5.Text = "Executable:"; this.button5.UseVisualStyleBackColor = true; - // + // // lbNDISASMExecutable - // + // this.lbNDISASMExecutable.AutoSize = true; this.lbNDISASMExecutable.Location = new System.Drawing.Point(118, 24); this.lbNDISASMExecutable.Name = "lbNDISASMExecutable"; this.lbNDISASMExecutable.Size = new System.Drawing.Size(120, 13); this.lbNDISASMExecutable.TabIndex = 19; this.lbNDISASMExecutable.Text = "{NDISASM Executable}"; - // + // // groupBox7 - // - this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + // + this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBox7.Controls.Add(this.lbQEMUImgApplication); this.groupBox7.Controls.Add(this.button8); @@ -834,18 +834,18 @@ private void InitializeComponent() this.groupBox7.TabIndex = 0; this.groupBox7.TabStop = false; this.groupBox7.Text = "QEMU:"; - // + // // lbQEMUImgApplication - // + // this.lbQEMUImgApplication.AutoSize = true; this.lbQEMUImgApplication.Location = new System.Drawing.Point(118, 75); this.lbQEMUImgApplication.Name = "lbQEMUImgApplication"; this.lbQEMUImgApplication.Size = new System.Drawing.Size(171, 13); this.lbQEMUImgApplication.TabIndex = 24; this.lbQEMUImgApplication.Text = "{QEMU qemu-img.exe Executable}"; - // + // // button8 - // + // this.button8.Enabled = false; this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button8.Location = new System.Drawing.Point(6, 70); @@ -854,18 +854,18 @@ private void InitializeComponent() this.button8.TabIndex = 23; this.button8.Text = "qemu-img:"; this.button8.UseVisualStyleBackColor = true; - // + // // lbQEMUBIOSDirectory - // + // this.lbQEMUBIOSDirectory.AutoSize = true; this.lbQEMUBIOSDirectory.Location = new System.Drawing.Point(118, 48); this.lbQEMUBIOSDirectory.Name = "lbQEMUBIOSDirectory"; this.lbQEMUBIOSDirectory.Size = new System.Drawing.Size(120, 13); this.lbQEMUBIOSDirectory.TabIndex = 22; this.lbQEMUBIOSDirectory.Text = "{QEMU BIOS Directory}"; - // + // // button3 - // + // this.button3.Enabled = false; this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button3.Location = new System.Drawing.Point(6, 43); @@ -874,9 +874,9 @@ private void InitializeComponent() this.button3.TabIndex = 21; this.button3.Text = "BIOS Directory:"; this.button3.UseVisualStyleBackColor = true; - // + // // button2 - // + // this.button2.Enabled = false; this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button2.Location = new System.Drawing.Point(6, 19); @@ -885,18 +885,18 @@ private void InitializeComponent() this.button2.TabIndex = 20; this.button2.Text = "Executable:"; this.button2.UseVisualStyleBackColor = true; - // + // // lbQEMUExecutable - // + // this.lbQEMUExecutable.AutoSize = true; this.lbQEMUExecutable.Location = new System.Drawing.Point(118, 24); this.lbQEMUExecutable.Name = "lbQEMUExecutable"; this.lbQEMUExecutable.Size = new System.Drawing.Size(103, 13); this.lbQEMUExecutable.TabIndex = 19; this.lbQEMUExecutable.Text = "{QEMU Executable}"; - // + // // tpOutput - // + // this.tpOutput.Controls.Add(this.rtbOutput); this.tpOutput.Location = new System.Drawing.Point(4, 22); this.tpOutput.Name = "tpOutput"; @@ -905,11 +905,11 @@ private void InitializeComponent() this.tpOutput.TabIndex = 1; this.tpOutput.Text = "Output"; this.tpOutput.UseVisualStyleBackColor = true; - // + // // rtbOutput - // - this.rtbOutput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + // + this.rtbOutput.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.rtbOutput.Font = new System.Drawing.Font("Consolas", 8F); this.rtbOutput.Location = new System.Drawing.Point(0, 0); @@ -919,9 +919,9 @@ private void InitializeComponent() this.rtbOutput.TabIndex = 0; this.rtbOutput.Text = ""; this.rtbOutput.WordWrap = false; - // + // // tabPage3 - // + // this.tabPage3.Controls.Add(this.rtbCounters); this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; @@ -930,11 +930,11 @@ private void InitializeComponent() this.tabPage3.TabIndex = 2; this.tabPage3.Text = "Counters"; this.tabPage3.UseVisualStyleBackColor = true; - // + // // rtbCounters - // - this.rtbCounters.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + // + this.rtbCounters.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.rtbCounters.Font = new System.Drawing.Font("Consolas", 8F); this.rtbCounters.Location = new System.Drawing.Point(0, 1); @@ -944,15 +944,15 @@ private void InitializeComponent() this.rtbCounters.TabIndex = 1; this.rtbCounters.Text = ""; this.rtbCounters.WordWrap = false; - // + // // openFileDialog2 - // + // this.openFileDialog2.DefaultExt = "*.exe"; this.openFileDialog2.Filter = "Executable|*.exe"; this.openFileDialog2.Title = "Select Assembly"; - // + // // MainForm - // + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(632, 441); @@ -961,7 +961,7 @@ private void InitializeComponent() this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.Text = "MOSA Launcher v1.5.1"; + this.Text = "MOSA Launcher v1.5.2"; this.Load += new System.EventHandler(this.MainForm_Load); this.Shown += new System.EventHandler(this.MainForm_Shown); this.tabControl1.ResumeLayout(false); @@ -1075,4 +1075,4 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbCompilerUsesMultipleThreads; private System.Windows.Forms.CheckBox cbInlinedMethods; } -} \ No newline at end of file +} diff --git a/Source/Mosa.Tool.Launcher/MainForm.cs b/Source/Mosa.Tool.Launcher/MainForm.cs index b7d2028741..c461429123 100644 --- a/Source/Mosa.Tool.Launcher/MainForm.cs +++ b/Source/Mosa.Tool.Launcher/MainForm.cs @@ -397,4 +397,4 @@ private void button1_Click(object sender, EventArgs e) } } } -} \ No newline at end of file +}