diff --git a/SIC Simulator/Form1.Designer.cs b/SIC Simulator/Form1.Designer.cs
index 7f48e25..72dd8df 100644
--- a/SIC Simulator/Form1.Designer.cs
+++ b/SIC Simulator/Form1.Designer.cs
@@ -72,11 +72,9 @@ private void InitializeComponent()
this.tsmOpen_SIC_Object_File = new System.Windows.Forms.ToolStripMenuItem();
this.tsmloadAndAssembleSICSourceFIle = new System.Windows.Forms.ToolStripMenuItem();
this.loadSavedSICMachineStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.loadObjectFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tsmSaveMachineState = new System.Windows.Forms.ToolStripMenuItem();
this.tsmFile_Ext = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmAbout = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmAbout_CheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();
- this.tsmAbout_About = new System.Windows.Forms.ToolStripMenuItem();
this.machineToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tsmzeroAllMemory = new System.Windows.Forms.ToolStripMenuItem();
this.randomizeAllMemory = new System.Windows.Forms.ToolStripMenuItem();
@@ -85,6 +83,9 @@ private void InitializeComponent()
this.tsmsetMemoryBYTE = new System.Windows.Forms.ToolStripMenuItem();
this.setMemoryWORDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tsmresetSICVirtualMachine = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmAbout = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmAbout_CheckForUpdates = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsmAbout_About = new System.Windows.Forms.ToolStripMenuItem();
this.tcMachine = new System.Windows.Forms.TabControl();
this.tpMemory = new System.Windows.Forms.TabPage();
this.rtfMemory = new System.Windows.Forms.RichTextBox();
@@ -111,7 +112,6 @@ private void InitializeComponent()
this.tbObjCode = new System.Windows.Forms.TabPage();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.btnThreeStep = new System.Windows.Forms.Button();
- this.loadObjectFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gbCPU.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.tcMachine.SuspendLayout();
@@ -522,8 +522,8 @@ private void InitializeComponent()
//
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsmFile,
- this.tsmAbout,
- this.machineToolStripMenuItem});
+ this.machineToolStripMenuItem,
+ this.tsmAbout});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1061, 24);
@@ -564,6 +564,13 @@ private void InitializeComponent()
this.loadSavedSICMachineStateToolStripMenuItem.Text = "Load Saved SIC Machine State";
this.loadSavedSICMachineStateToolStripMenuItem.Click += new System.EventHandler(this.loadSavedSICMachineStateToolStripMenuItem_Click);
//
+ // loadObjectFileToolStripMenuItem
+ //
+ this.loadObjectFileToolStripMenuItem.Name = "loadObjectFileToolStripMenuItem";
+ this.loadObjectFileToolStripMenuItem.Size = new System.Drawing.Size(257, 22);
+ this.loadObjectFileToolStripMenuItem.Text = "Load Object File";
+ this.loadObjectFileToolStripMenuItem.Click += new System.EventHandler(this.loadObjectFileToolStripMenuItem_Click);
+ //
// tsmSaveMachineState
//
this.tsmSaveMachineState.Name = "tsmSaveMachineState";
@@ -578,27 +585,6 @@ private void InitializeComponent()
this.tsmFile_Ext.Text = "Exit";
this.tsmFile_Ext.Click += new System.EventHandler(this.tsmFile_Ext_Click);
//
- // tsmAbout
- //
- this.tsmAbout.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsmAbout_CheckForUpdates,
- this.tsmAbout_About});
- this.tsmAbout.Name = "tsmAbout";
- this.tsmAbout.Size = new System.Drawing.Size(52, 20);
- this.tsmAbout.Text = "About";
- //
- // tsmAbout_CheckForUpdates
- //
- this.tsmAbout_CheckForUpdates.Name = "tsmAbout_CheckForUpdates";
- this.tsmAbout_CheckForUpdates.Size = new System.Drawing.Size(171, 22);
- this.tsmAbout_CheckForUpdates.Text = "Check for Updates";
- //
- // tsmAbout_About
- //
- this.tsmAbout_About.Name = "tsmAbout_About";
- this.tsmAbout_About.Size = new System.Drawing.Size(171, 22);
- this.tsmAbout_About.Text = "About";
- //
// machineToolStripMenuItem
//
this.machineToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -659,6 +645,27 @@ private void InitializeComponent()
this.tsmresetSICVirtualMachine.Text = "Reset SIC Virtual Machine";
this.tsmresetSICVirtualMachine.Click += new System.EventHandler(this.tsmresetSICVirtualMachine_Click);
//
+ // tsmAbout
+ //
+ this.tsmAbout.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.tsmAbout_CheckForUpdates,
+ this.tsmAbout_About});
+ this.tsmAbout.Name = "tsmAbout";
+ this.tsmAbout.Size = new System.Drawing.Size(52, 20);
+ this.tsmAbout.Text = "About";
+ //
+ // tsmAbout_CheckForUpdates
+ //
+ this.tsmAbout_CheckForUpdates.Name = "tsmAbout_CheckForUpdates";
+ this.tsmAbout_CheckForUpdates.Size = new System.Drawing.Size(171, 22);
+ this.tsmAbout_CheckForUpdates.Text = "Check for Updates";
+ //
+ // tsmAbout_About
+ //
+ this.tsmAbout_About.Name = "tsmAbout_About";
+ this.tsmAbout_About.Size = new System.Drawing.Size(171, 22);
+ this.tsmAbout_About.Text = "About";
+ //
// tcMachine
//
this.tcMachine.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -926,13 +933,6 @@ private void InitializeComponent()
this.btnThreeStep.UseVisualStyleBackColor = true;
this.btnThreeStep.Click += new System.EventHandler(this.btnThreeStep_Click);
//
- // loadObjectFileToolStripMenuItem
- //
- this.loadObjectFileToolStripMenuItem.Name = "loadObjectFileToolStripMenuItem";
- this.loadObjectFileToolStripMenuItem.Size = new System.Drawing.Size(257, 22);
- this.loadObjectFileToolStripMenuItem.Text = "Load Object File";
- this.loadObjectFileToolStripMenuItem.Click += new System.EventHandler(this.loadObjectFileToolStripMenuItem_Click);
- //
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/SIC Simulator/Form1.cs b/SIC Simulator/Form1.cs
index c87d12f..93ce12b 100644
--- a/SIC Simulator/Form1.cs
+++ b/SIC Simulator/Form1.cs
@@ -570,26 +570,16 @@ private void setProgramCounterToToolStripMenuItem_Click(object sender, EventArgs
private void btnRun_Click(object sender, EventArgs e)
{
- int StopAtPCAddress = 0;
-
- DialogResult Result;
- dlgStopAtMemoryAddress SetStop = new dlgStopAtMemoryAddress( this.LastLoadedFileName, this.LastLoadedStart, this.LastLoadedLength);
- Result = SetStop.ShowDialog();
-
- if ( Result == DialogResult.OK)
- {
- StopAtPCAddress = SetStop.HaltAtMemoryAddress;
- while (this.SICVirtualMachine.PC != StopAtPCAddress )
+ while (this.SICVirtualMachine.PC != -1)
{
- this.SICVirtualMachine.PerformStep();
+ this.SICVirtualMachine.PerformStep();
+ this.RefreshCPUDisplays();
+ Application.DoEvents();
+ System.Threading.Thread.Sleep(250);
}
- this.RefreshCPUDisplays();
+ this.RefreshCPUDisplays();
}
-
-
- }
-
private void btnResetProgram_Click(object sender, EventArgs e)
{
LoadObjectFile(this.txtObjectCode.Text.Split('\n'));
diff --git a/SIC Simulator/Properties/AssemblyInfo.cs b/SIC Simulator/Properties/AssemblyInfo.cs
index 68679e2..defa96e 100644
--- a/SIC Simulator/Properties/AssemblyInfo.cs
+++ b/SIC Simulator/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.10.28.1")]
-[assembly: AssemblyFileVersion("21.10.28.1")]
+[assembly: AssemblyVersion("21.11.08.1")]
+[assembly: AssemblyFileVersion("21.11.08.1")]
diff --git a/SIC Simulator/SIC Simulator.csproj b/SIC Simulator/SIC Simulator.csproj
index a34c382..e9b453c 100644
--- a/SIC Simulator/SIC Simulator.csproj
+++ b/SIC Simulator/SIC Simulator.csproj
@@ -22,6 +22,7 @@
DEBUG;TRACE
prompt
4
+ false
AnyCPU
@@ -35,6 +36,9 @@
SIC_CPU.ico
+
+ SIC_Simulator.Program
+