diff --git a/SIC Simulator/Form1.Designer.cs b/SIC Simulator/Form1.Designer.cs index 5323678..cbc3be4 100644 --- a/SIC Simulator/Form1.Designer.cs +++ b/SIC Simulator/Form1.Designer.cs @@ -196,7 +196,7 @@ private void InitializeComponent() this.lblComp_Result.AutoSize = true; this.lblComp_Result.Location = new System.Drawing.Point(80, 219); this.lblComp_Result.Name = "lblComp_Result"; - this.lblComp_Result.Size = new System.Drawing.Size(38, 31); + this.lblComp_Result.Size = new System.Drawing.Size(21, 16); this.lblComp_Result.TabIndex = 35; this.lblComp_Result.Text = "xx"; // @@ -205,7 +205,7 @@ private void InitializeComponent() this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(10, 219); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(52, 31); + this.label6.Size = new System.Drawing.Size(25, 16); this.label6.TabIndex = 34; this.label6.Text = "CC"; // @@ -214,7 +214,7 @@ private void InitializeComponent() this.txtSW_CC.Location = new System.Drawing.Point(44, 215); this.txtSW_CC.Name = "txtSW_CC"; this.txtSW_CC.ReadOnly = true; - this.txtSW_CC.Size = new System.Drawing.Size(26, 37); + this.txtSW_CC.Size = new System.Drawing.Size(26, 22); this.txtSW_CC.TabIndex = 33; this.txtSW_CC.Text = "00"; this.txtSW_CC.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -224,7 +224,7 @@ private void InitializeComponent() this.txtSW_BIN_LSB.Location = new System.Drawing.Point(278, 181); this.txtSW_BIN_LSB.Name = "txtSW_BIN_LSB"; this.txtSW_BIN_LSB.ReadOnly = true; - this.txtSW_BIN_LSB.Size = new System.Drawing.Size(76, 37); + this.txtSW_BIN_LSB.Size = new System.Drawing.Size(76, 22); this.txtSW_BIN_LSB.TabIndex = 32; this.txtSW_BIN_LSB.Text = "00000000"; this.txtSW_BIN_LSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -234,7 +234,7 @@ private void InitializeComponent() this.txtSW_BIN_MIB.Location = new System.Drawing.Point(197, 181); this.txtSW_BIN_MIB.Name = "txtSW_BIN_MIB"; this.txtSW_BIN_MIB.ReadOnly = true; - this.txtSW_BIN_MIB.Size = new System.Drawing.Size(76, 37); + this.txtSW_BIN_MIB.Size = new System.Drawing.Size(76, 22); this.txtSW_BIN_MIB.TabIndex = 31; this.txtSW_BIN_MIB.Text = "00000000"; this.txtSW_BIN_MIB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -244,7 +244,7 @@ private void InitializeComponent() this.txtSW_BIN_MSB.Location = new System.Drawing.Point(117, 181); this.txtSW_BIN_MSB.Name = "txtSW_BIN_MSB"; this.txtSW_BIN_MSB.ReadOnly = true; - this.txtSW_BIN_MSB.Size = new System.Drawing.Size(76, 37); + this.txtSW_BIN_MSB.Size = new System.Drawing.Size(76, 22); this.txtSW_BIN_MSB.TabIndex = 30; this.txtSW_BIN_MSB.Text = "00000000"; this.txtSW_BIN_MSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -254,7 +254,7 @@ private void InitializeComponent() this.txtPC_BIN_LSB.Location = new System.Drawing.Point(278, 144); this.txtPC_BIN_LSB.Name = "txtPC_BIN_LSB"; this.txtPC_BIN_LSB.ReadOnly = true; - this.txtPC_BIN_LSB.Size = new System.Drawing.Size(76, 37); + this.txtPC_BIN_LSB.Size = new System.Drawing.Size(76, 22); this.txtPC_BIN_LSB.TabIndex = 29; this.txtPC_BIN_LSB.Text = "00000000"; this.txtPC_BIN_LSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -264,7 +264,7 @@ private void InitializeComponent() this.txtPC_BIN_MIB.Location = new System.Drawing.Point(197, 144); this.txtPC_BIN_MIB.Name = "txtPC_BIN_MIB"; this.txtPC_BIN_MIB.ReadOnly = true; - this.txtPC_BIN_MIB.Size = new System.Drawing.Size(76, 37); + this.txtPC_BIN_MIB.Size = new System.Drawing.Size(76, 22); this.txtPC_BIN_MIB.TabIndex = 28; this.txtPC_BIN_MIB.Text = "00000000"; this.txtPC_BIN_MIB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -274,7 +274,7 @@ private void InitializeComponent() this.txtPC_BIN_MSB.Location = new System.Drawing.Point(117, 144); this.txtPC_BIN_MSB.Name = "txtPC_BIN_MSB"; this.txtPC_BIN_MSB.ReadOnly = true; - this.txtPC_BIN_MSB.Size = new System.Drawing.Size(76, 37); + this.txtPC_BIN_MSB.Size = new System.Drawing.Size(76, 22); this.txtPC_BIN_MSB.TabIndex = 27; this.txtPC_BIN_MSB.Text = "00000000"; this.txtPC_BIN_MSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -284,7 +284,7 @@ private void InitializeComponent() this.txtX_BIN_LSB.Location = new System.Drawing.Point(278, 109); this.txtX_BIN_LSB.Name = "txtX_BIN_LSB"; this.txtX_BIN_LSB.ReadOnly = true; - this.txtX_BIN_LSB.Size = new System.Drawing.Size(76, 37); + this.txtX_BIN_LSB.Size = new System.Drawing.Size(76, 22); this.txtX_BIN_LSB.TabIndex = 26; this.txtX_BIN_LSB.Text = "00000000"; this.txtX_BIN_LSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -294,7 +294,7 @@ private void InitializeComponent() this.txtX_BIN_MIB.Location = new System.Drawing.Point(197, 109); this.txtX_BIN_MIB.Name = "txtX_BIN_MIB"; this.txtX_BIN_MIB.ReadOnly = true; - this.txtX_BIN_MIB.Size = new System.Drawing.Size(76, 37); + this.txtX_BIN_MIB.Size = new System.Drawing.Size(76, 22); this.txtX_BIN_MIB.TabIndex = 25; this.txtX_BIN_MIB.Text = "00000000"; this.txtX_BIN_MIB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -304,7 +304,7 @@ private void InitializeComponent() this.txtX_BIN_MSB.Location = new System.Drawing.Point(117, 109); this.txtX_BIN_MSB.Name = "txtX_BIN_MSB"; this.txtX_BIN_MSB.ReadOnly = true; - this.txtX_BIN_MSB.Size = new System.Drawing.Size(76, 37); + this.txtX_BIN_MSB.Size = new System.Drawing.Size(76, 22); this.txtX_BIN_MSB.TabIndex = 24; this.txtX_BIN_MSB.Text = "00000000"; this.txtX_BIN_MSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -314,7 +314,7 @@ private void InitializeComponent() this.txtL_BIN_LSB.Location = new System.Drawing.Point(278, 74); this.txtL_BIN_LSB.Name = "txtL_BIN_LSB"; this.txtL_BIN_LSB.ReadOnly = true; - this.txtL_BIN_LSB.Size = new System.Drawing.Size(76, 37); + this.txtL_BIN_LSB.Size = new System.Drawing.Size(76, 22); this.txtL_BIN_LSB.TabIndex = 23; this.txtL_BIN_LSB.Text = "00000000"; this.txtL_BIN_LSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -324,7 +324,7 @@ private void InitializeComponent() this.txtL_BIN_MIB.Location = new System.Drawing.Point(197, 74); this.txtL_BIN_MIB.Name = "txtL_BIN_MIB"; this.txtL_BIN_MIB.ReadOnly = true; - this.txtL_BIN_MIB.Size = new System.Drawing.Size(76, 37); + this.txtL_BIN_MIB.Size = new System.Drawing.Size(76, 22); this.txtL_BIN_MIB.TabIndex = 22; this.txtL_BIN_MIB.Text = "00000000"; this.txtL_BIN_MIB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -334,7 +334,7 @@ private void InitializeComponent() this.txtL_BIN_MSB.Location = new System.Drawing.Point(117, 74); this.txtL_BIN_MSB.Name = "txtL_BIN_MSB"; this.txtL_BIN_MSB.ReadOnly = true; - this.txtL_BIN_MSB.Size = new System.Drawing.Size(76, 37); + this.txtL_BIN_MSB.Size = new System.Drawing.Size(76, 22); this.txtL_BIN_MSB.TabIndex = 21; this.txtL_BIN_MSB.Text = "00000000"; this.txtL_BIN_MSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -344,7 +344,7 @@ private void InitializeComponent() this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(386, 18); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(108, 31); + this.label11.Size = new System.Drawing.Size(54, 16); this.label11.TabIndex = 20; this.label11.Text = "Decimal"; // @@ -353,7 +353,7 @@ private void InitializeComponent() this.txtSW_Dec.Location = new System.Drawing.Point(369, 181); this.txtSW_Dec.Name = "txtSW_Dec"; this.txtSW_Dec.ReadOnly = true; - this.txtSW_Dec.Size = new System.Drawing.Size(87, 37); + this.txtSW_Dec.Size = new System.Drawing.Size(87, 22); this.txtSW_Dec.TabIndex = 19; this.txtSW_Dec.Text = "0"; this.txtSW_Dec.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -363,7 +363,7 @@ private void InitializeComponent() this.txtPC_Dec.Location = new System.Drawing.Point(369, 144); this.txtPC_Dec.Name = "txtPC_Dec"; this.txtPC_Dec.ReadOnly = true; - this.txtPC_Dec.Size = new System.Drawing.Size(87, 37); + this.txtPC_Dec.Size = new System.Drawing.Size(87, 22); this.txtPC_Dec.TabIndex = 18; this.txtPC_Dec.Text = "0"; this.txtPC_Dec.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -373,7 +373,7 @@ private void InitializeComponent() this.txtX_Dec.Location = new System.Drawing.Point(369, 109); this.txtX_Dec.Name = "txtX_Dec"; this.txtX_Dec.ReadOnly = true; - this.txtX_Dec.Size = new System.Drawing.Size(87, 37); + this.txtX_Dec.Size = new System.Drawing.Size(87, 22); this.txtX_Dec.TabIndex = 17; this.txtX_Dec.Text = "0"; this.txtX_Dec.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -383,7 +383,7 @@ private void InitializeComponent() this.txtL_Dec.Location = new System.Drawing.Point(369, 74); this.txtL_Dec.Name = "txtL_Dec"; this.txtL_Dec.ReadOnly = true; - this.txtL_Dec.Size = new System.Drawing.Size(87, 37); + this.txtL_Dec.Size = new System.Drawing.Size(87, 22); this.txtL_Dec.TabIndex = 16; this.txtL_Dec.Text = "0"; this.txtL_Dec.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -393,7 +393,7 @@ private void InitializeComponent() this.txtA_Dec.Location = new System.Drawing.Point(369, 40); this.txtA_Dec.Name = "txtA_Dec"; this.txtA_Dec.ReadOnly = true; - this.txtA_Dec.Size = new System.Drawing.Size(87, 37); + this.txtA_Dec.Size = new System.Drawing.Size(87, 22); this.txtA_Dec.TabIndex = 15; this.txtA_Dec.Text = "0"; this.txtA_Dec.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -403,7 +403,7 @@ private void InitializeComponent() this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(211, 18); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(108, 31); + this.label10.Size = new System.Drawing.Size(55, 16); this.label10.TabIndex = 14; this.label10.Text = "BINARY"; // @@ -412,7 +412,7 @@ private void InitializeComponent() this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(57, 18); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(67, 31); + this.label9.Size = new System.Drawing.Size(32, 16); this.label9.TabIndex = 13; this.label9.Text = "HEX"; // @@ -421,7 +421,7 @@ private void InitializeComponent() this.txtA_BIN_LSB.Location = new System.Drawing.Point(278, 40); this.txtA_BIN_LSB.Name = "txtA_BIN_LSB"; this.txtA_BIN_LSB.ReadOnly = true; - this.txtA_BIN_LSB.Size = new System.Drawing.Size(76, 37); + this.txtA_BIN_LSB.Size = new System.Drawing.Size(76, 22); this.txtA_BIN_LSB.TabIndex = 12; this.txtA_BIN_LSB.Text = "00000000"; this.txtA_BIN_LSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -431,7 +431,7 @@ private void InitializeComponent() this.txtA_BIN_MIB.Location = new System.Drawing.Point(197, 40); this.txtA_BIN_MIB.Name = "txtA_BIN_MIB"; this.txtA_BIN_MIB.ReadOnly = true; - this.txtA_BIN_MIB.Size = new System.Drawing.Size(76, 37); + this.txtA_BIN_MIB.Size = new System.Drawing.Size(76, 22); this.txtA_BIN_MIB.TabIndex = 11; this.txtA_BIN_MIB.Text = "00000000"; this.txtA_BIN_MIB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -441,7 +441,7 @@ private void InitializeComponent() this.txtA_BIN_MSB.Location = new System.Drawing.Point(117, 40); this.txtA_BIN_MSB.Name = "txtA_BIN_MSB"; this.txtA_BIN_MSB.ReadOnly = true; - this.txtA_BIN_MSB.Size = new System.Drawing.Size(76, 37); + this.txtA_BIN_MSB.Size = new System.Drawing.Size(76, 22); this.txtA_BIN_MSB.TabIndex = 10; this.txtA_BIN_MSB.Text = "00000000"; this.txtA_BIN_MSB.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -451,7 +451,7 @@ private void InitializeComponent() this.txtSW_Hex.Location = new System.Drawing.Point(44, 181); this.txtSW_Hex.Name = "txtSW_Hex"; this.txtSW_Hex.ReadOnly = true; - this.txtSW_Hex.Size = new System.Drawing.Size(65, 37); + this.txtSW_Hex.Size = new System.Drawing.Size(65, 22); this.txtSW_Hex.TabIndex = 9; this.txtSW_Hex.Text = "000000"; this.txtSW_Hex.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -461,7 +461,7 @@ private void InitializeComponent() this.txtPC_Hex.Location = new System.Drawing.Point(47, 144); this.txtPC_Hex.Name = "txtPC_Hex"; this.txtPC_Hex.ReadOnly = true; - this.txtPC_Hex.Size = new System.Drawing.Size(65, 37); + this.txtPC_Hex.Size = new System.Drawing.Size(65, 22); this.txtPC_Hex.TabIndex = 8; this.txtPC_Hex.Text = "000000"; this.txtPC_Hex.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -471,7 +471,7 @@ private void InitializeComponent() this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(8, 185); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(57, 31); + this.label5.Size = new System.Drawing.Size(29, 16); this.label5.TabIndex = 7; this.label5.Text = "SW"; // @@ -480,7 +480,7 @@ private void InitializeComponent() this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(8, 146); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(68, 31); + this.label4.Size = new System.Drawing.Size(33, 16); this.label4.TabIndex = 6; this.label4.Text = "(PC)"; // @@ -489,7 +489,7 @@ private void InitializeComponent() this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(19, 112); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(31, 31); + this.label3.Size = new System.Drawing.Size(14, 16); this.label3.TabIndex = 5; this.label3.Text = "X"; // @@ -498,7 +498,7 @@ private void InitializeComponent() this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(20, 80); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(28, 31); + this.label2.Size = new System.Drawing.Size(14, 16); this.label2.TabIndex = 4; this.label2.Text = "L"; // @@ -507,7 +507,7 @@ private void InitializeComponent() this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(17, 43); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(31, 31); + this.label1.Size = new System.Drawing.Size(16, 16); this.label1.TabIndex = 3; this.label1.Text = "A"; // @@ -516,7 +516,7 @@ private void InitializeComponent() this.txtX_Hex.Location = new System.Drawing.Point(47, 109); this.txtX_Hex.Name = "txtX_Hex"; this.txtX_Hex.ReadOnly = true; - this.txtX_Hex.Size = new System.Drawing.Size(65, 37); + this.txtX_Hex.Size = new System.Drawing.Size(65, 22); this.txtX_Hex.TabIndex = 2; this.txtX_Hex.Text = "000000"; this.txtX_Hex.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -526,7 +526,7 @@ private void InitializeComponent() this.txtL_Hex.Location = new System.Drawing.Point(44, 74); this.txtL_Hex.Name = "txtL_Hex"; this.txtL_Hex.ReadOnly = true; - this.txtL_Hex.Size = new System.Drawing.Size(65, 37); + this.txtL_Hex.Size = new System.Drawing.Size(65, 22); this.txtL_Hex.TabIndex = 1; this.txtL_Hex.Text = "000000"; this.txtL_Hex.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; @@ -536,14 +536,13 @@ private void InitializeComponent() this.txtA_Hex.Location = new System.Drawing.Point(44, 40); this.txtA_Hex.Name = "txtA_Hex"; this.txtA_Hex.ReadOnly = true; - this.txtA_Hex.Size = new System.Drawing.Size(65, 37); + this.txtA_Hex.Size = new System.Drawing.Size(65, 22); this.txtA_Hex.TabIndex = 0; this.txtA_Hex.Text = "000000"; this.txtA_Hex.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // // menuStrip1 // - this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2); this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsmFile, @@ -552,7 +551,7 @@ private void InitializeComponent() this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(1444, 42); + this.menuStrip1.Size = new System.Drawing.Size(1444, 24); this.menuStrip1.TabIndex = 1; this.menuStrip1.Text = "menuStrip1"; // @@ -569,69 +568,69 @@ private void InitializeComponent() this.relocateCurrentProgramToolStripMenuItem, this.tsmFile_Ext}); this.tsmFile.Name = "tsmFile"; - this.tsmFile.Size = new System.Drawing.Size(71, 38); + this.tsmFile.Size = new System.Drawing.Size(37, 20); this.tsmFile.Text = "File"; // // assembleCurrentFileToolStripMenuItem // this.assembleCurrentFileToolStripMenuItem.Name = "assembleCurrentFileToolStripMenuItem"; - this.assembleCurrentFileToolStripMenuItem.Size = new System.Drawing.Size(484, 44); + this.assembleCurrentFileToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.assembleCurrentFileToolStripMenuItem.Text = "Save and Assemble Current File"; this.assembleCurrentFileToolStripMenuItem.Click += new System.EventHandler(this.assembleCurrentFileToolStripMenuItem_Click); // // saveSICSourceFileToolStripMenuItem // this.saveSICSourceFileToolStripMenuItem.Name = "saveSICSourceFileToolStripMenuItem"; - this.saveSICSourceFileToolStripMenuItem.Size = new System.Drawing.Size(484, 44); + this.saveSICSourceFileToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.saveSICSourceFileToolStripMenuItem.Text = "Save SIC Source File"; this.saveSICSourceFileToolStripMenuItem.Click += new System.EventHandler(this.saveSICSourceFileToolStripMenuItem_Click); // // saveNewSICSourceFileToolStripMenuItem // this.saveNewSICSourceFileToolStripMenuItem.Name = "saveNewSICSourceFileToolStripMenuItem"; - this.saveNewSICSourceFileToolStripMenuItem.Size = new System.Drawing.Size(484, 44); + this.saveNewSICSourceFileToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.saveNewSICSourceFileToolStripMenuItem.Text = "Save to New SIC Source File"; this.saveNewSICSourceFileToolStripMenuItem.Click += new System.EventHandler(this.saveNewSICSourceFileToolStripMenuItem_Click); // // tsmloadSICSourceFIle // this.tsmloadSICSourceFIle.Name = "tsmloadSICSourceFIle"; - this.tsmloadSICSourceFIle.Size = new System.Drawing.Size(484, 44); + this.tsmloadSICSourceFIle.Size = new System.Drawing.Size(239, 22); this.tsmloadSICSourceFIle.Text = "Load SIC Source FIle"; this.tsmloadSICSourceFIle.Click += new System.EventHandler(this.tsmloadSICSourceFIle_Click); // // tsmOpen_SIC_Object_File // this.tsmOpen_SIC_Object_File.Name = "tsmOpen_SIC_Object_File"; - this.tsmOpen_SIC_Object_File.Size = new System.Drawing.Size(484, 44); + this.tsmOpen_SIC_Object_File.Size = new System.Drawing.Size(239, 22); this.tsmOpen_SIC_Object_File.Text = "Open SIC Object File"; this.tsmOpen_SIC_Object_File.Click += new System.EventHandler(this.tsmOpen_SIC_Object_File_Click); // // loadSavedSICMachineStateToolStripMenuItem // this.loadSavedSICMachineStateToolStripMenuItem.Name = "loadSavedSICMachineStateToolStripMenuItem"; - this.loadSavedSICMachineStateToolStripMenuItem.Size = new System.Drawing.Size(484, 44); + this.loadSavedSICMachineStateToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.loadSavedSICMachineStateToolStripMenuItem.Text = "Load Saved SIC Machine State"; this.loadSavedSICMachineStateToolStripMenuItem.Click += new System.EventHandler(this.loadSavedSICMachineStateToolStripMenuItem_Click); // // tsmSaveMachineState // this.tsmSaveMachineState.Name = "tsmSaveMachineState"; - this.tsmSaveMachineState.Size = new System.Drawing.Size(484, 44); + this.tsmSaveMachineState.Size = new System.Drawing.Size(239, 22); this.tsmSaveMachineState.Text = "Save SIC Machine State"; this.tsmSaveMachineState.Click += new System.EventHandler(this.tsmSaveMachineState_Click); // // relocateCurrentProgramToolStripMenuItem // this.relocateCurrentProgramToolStripMenuItem.Name = "relocateCurrentProgramToolStripMenuItem"; - this.relocateCurrentProgramToolStripMenuItem.Size = new System.Drawing.Size(484, 44); + this.relocateCurrentProgramToolStripMenuItem.Size = new System.Drawing.Size(239, 22); this.relocateCurrentProgramToolStripMenuItem.Text = "Relocate Current Program"; this.relocateCurrentProgramToolStripMenuItem.Click += new System.EventHandler(this.relocateCurrentProgramToolStripMenuItem_Click); // // tsmFile_Ext // this.tsmFile_Ext.Name = "tsmFile_Ext"; - this.tsmFile_Ext.Size = new System.Drawing.Size(484, 44); + this.tsmFile_Ext.Size = new System.Drawing.Size(239, 22); this.tsmFile_Ext.Text = "Exit"; this.tsmFile_Ext.Click += new System.EventHandler(this.tsmFile_Ext_Click); // @@ -647,59 +646,59 @@ private void InitializeComponent() this.tsmresetSICVirtualMachine, this.resetSICDevicesToolStripMenuItem}); this.machineToolStripMenuItem.Name = "machineToolStripMenuItem"; - this.machineToolStripMenuItem.Size = new System.Drawing.Size(126, 38); + this.machineToolStripMenuItem.Size = new System.Drawing.Size(65, 20); this.machineToolStripMenuItem.Text = "Machine"; // // tsmzeroAllMemory // this.tsmzeroAllMemory.Name = "tsmzeroAllMemory"; - this.tsmzeroAllMemory.Size = new System.Drawing.Size(420, 44); + this.tsmzeroAllMemory.Size = new System.Drawing.Size(208, 22); this.tsmzeroAllMemory.Text = "Zero All Memory"; // // randomizeAllMemory // this.randomizeAllMemory.Name = "randomizeAllMemory"; - this.randomizeAllMemory.Size = new System.Drawing.Size(420, 44); + this.randomizeAllMemory.Size = new System.Drawing.Size(208, 22); this.randomizeAllMemory.Text = "Randomize All Memory"; // // setProgramCounterToToolStripMenuItem // this.setProgramCounterToToolStripMenuItem.Name = "setProgramCounterToToolStripMenuItem"; - this.setProgramCounterToToolStripMenuItem.Size = new System.Drawing.Size(420, 44); + this.setProgramCounterToToolStripMenuItem.Size = new System.Drawing.Size(208, 22); this.setProgramCounterToToolStripMenuItem.Text = "Set Program Counter To"; this.setProgramCounterToToolStripMenuItem.Click += new System.EventHandler(this.setProgramCounterToToolStripMenuItem_Click); // // stepSingleInstructionToolStripMenuItem // this.stepSingleInstructionToolStripMenuItem.Name = "stepSingleInstructionToolStripMenuItem"; - this.stepSingleInstructionToolStripMenuItem.Size = new System.Drawing.Size(420, 44); + this.stepSingleInstructionToolStripMenuItem.Size = new System.Drawing.Size(208, 22); this.stepSingleInstructionToolStripMenuItem.Text = "Step Single Instruction"; // // tsmsetMemoryBYTE // this.tsmsetMemoryBYTE.Name = "tsmsetMemoryBYTE"; - this.tsmsetMemoryBYTE.Size = new System.Drawing.Size(420, 44); + this.tsmsetMemoryBYTE.Size = new System.Drawing.Size(208, 22); this.tsmsetMemoryBYTE.Text = "Set Memory BYTE"; this.tsmsetMemoryBYTE.Click += new System.EventHandler(this.tsmsetMemoryBYTE_Click); // // setMemoryWORDToolStripMenuItem // this.setMemoryWORDToolStripMenuItem.Name = "setMemoryWORDToolStripMenuItem"; - this.setMemoryWORDToolStripMenuItem.Size = new System.Drawing.Size(420, 44); + this.setMemoryWORDToolStripMenuItem.Size = new System.Drawing.Size(208, 22); this.setMemoryWORDToolStripMenuItem.Text = "Set Memory WORD"; this.setMemoryWORDToolStripMenuItem.Click += new System.EventHandler(this.setMemoryWORDToolStripMenuItem_Click); // // tsmresetSICVirtualMachine // this.tsmresetSICVirtualMachine.Name = "tsmresetSICVirtualMachine"; - this.tsmresetSICVirtualMachine.Size = new System.Drawing.Size(420, 44); + this.tsmresetSICVirtualMachine.Size = new System.Drawing.Size(208, 22); this.tsmresetSICVirtualMachine.Text = "Reset SIC Virtual Machine"; this.tsmresetSICVirtualMachine.Click += new System.EventHandler(this.tsmresetSICVirtualMachine_Click); // // resetSICDevicesToolStripMenuItem // this.resetSICDevicesToolStripMenuItem.Name = "resetSICDevicesToolStripMenuItem"; - this.resetSICDevicesToolStripMenuItem.Size = new System.Drawing.Size(420, 44); + this.resetSICDevicesToolStripMenuItem.Size = new System.Drawing.Size(208, 22); this.resetSICDevicesToolStripMenuItem.Text = "Reset SIC Devices"; this.resetSICDevicesToolStripMenuItem.Click += new System.EventHandler(this.resetSICDevicesToolStripMenuItem_Click); // @@ -709,19 +708,19 @@ private void InitializeComponent() this.tsmAbout_CheckForUpdates, this.tsmAbout_About}); this.tsmAbout.Name = "tsmAbout"; - this.tsmAbout.Size = new System.Drawing.Size(99, 38); + 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(343, 44); + 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(343, 44); + this.tsmAbout_About.Size = new System.Drawing.Size(171, 22); this.tsmAbout_About.Text = "About"; // // loadObjectFileToolStripMenuItem @@ -750,10 +749,10 @@ private void InitializeComponent() this.tpMemory.Controls.Add(this.rtfMemory); this.tpMemory.Controls.Add(this.rbMemHex); this.tpMemory.Controls.Add(this.rbMemBinary); - this.tpMemory.Location = new System.Drawing.Point(8, 45); + this.tpMemory.Location = new System.Drawing.Point(4, 25); this.tpMemory.Name = "tpMemory"; this.tpMemory.Padding = new System.Windows.Forms.Padding(3); - this.tpMemory.Size = new System.Drawing.Size(718, 545); + this.tpMemory.Size = new System.Drawing.Size(726, 569); this.tpMemory.TabIndex = 0; this.tpMemory.Text = "Memory"; this.tpMemory.UseVisualStyleBackColor = true; @@ -763,7 +762,7 @@ private void InitializeComponent() this.rbMemAscii.AutoSize = true; this.rbMemAscii.Location = new System.Drawing.Point(233, 10); this.rbMemAscii.Name = "rbMemAscii"; - this.rbMemAscii.Size = new System.Drawing.Size(110, 35); + this.rbMemAscii.Size = new System.Drawing.Size(58, 20); this.rbMemAscii.TabIndex = 1; this.rbMemAscii.TabStop = true; this.rbMemAscii.Text = "ASCII"; @@ -774,7 +773,7 @@ private void InitializeComponent() this.rbMemDecimal.AutoSize = true; this.rbMemDecimal.Location = new System.Drawing.Point(154, 10); this.rbMemDecimal.Name = "rbMemDecimal"; - this.rbMemDecimal.Size = new System.Drawing.Size(139, 35); + this.rbMemDecimal.Size = new System.Drawing.Size(72, 20); this.rbMemDecimal.TabIndex = 2; this.rbMemDecimal.Text = "Decimal"; this.rbMemDecimal.UseVisualStyleBackColor = true; @@ -797,7 +796,7 @@ private void InitializeComponent() this.rbMemHex.Checked = true; this.rbMemHex.Location = new System.Drawing.Point(93, 10); this.rbMemHex.Name = "rbMemHex"; - this.rbMemHex.Size = new System.Drawing.Size(90, 35); + this.rbMemHex.Size = new System.Drawing.Size(48, 20); this.rbMemHex.TabIndex = 1; this.rbMemHex.TabStop = true; this.rbMemHex.Text = "Hex"; @@ -808,7 +807,7 @@ private void InitializeComponent() this.rbMemBinary.AutoSize = true; this.rbMemBinary.Location = new System.Drawing.Point(17, 9); this.rbMemBinary.Name = "rbMemBinary"; - this.rbMemBinary.Size = new System.Drawing.Size(117, 35); + this.rbMemBinary.Size = new System.Drawing.Size(62, 20); this.rbMemBinary.TabIndex = 0; this.rbMemBinary.Text = "Binary"; this.rbMemBinary.UseVisualStyleBackColor = true; @@ -816,10 +815,10 @@ private void InitializeComponent() // tpDevices // this.tpDevices.Controls.Add(this.lvDevices); - this.tpDevices.Location = new System.Drawing.Point(8, 45); + this.tpDevices.Location = new System.Drawing.Point(4, 25); this.tpDevices.Name = "tpDevices"; this.tpDevices.Padding = new System.Windows.Forms.Padding(3); - this.tpDevices.Size = new System.Drawing.Size(718, 545); + this.tpDevices.Size = new System.Drawing.Size(726, 569); this.tpDevices.TabIndex = 1; this.tpDevices.Text = "Devices"; this.tpDevices.UseVisualStyleBackColor = true; @@ -862,9 +861,9 @@ private void InitializeComponent() // tpMicroSteps // this.tpMicroSteps.Controls.Add(this.rtfMicroSteps); - this.tpMicroSteps.Location = new System.Drawing.Point(8, 45); + this.tpMicroSteps.Location = new System.Drawing.Point(4, 25); this.tpMicroSteps.Name = "tpMicroSteps"; - this.tpMicroSteps.Size = new System.Drawing.Size(718, 545); + this.tpMicroSteps.Size = new System.Drawing.Size(726, 569); this.tpMicroSteps.TabIndex = 2; this.tpMicroSteps.Text = "Microsteps"; this.tpMicroSteps.UseVisualStyleBackColor = true; @@ -898,7 +897,7 @@ private void InitializeComponent() this.label12.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label12.Location = new System.Drawing.Point(492, 186); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(190, 31); + this.label12.Size = new System.Drawing.Size(98, 16); this.label12.TabIndex = 5; this.label12.Text = "Next Instruction"; // @@ -908,7 +907,7 @@ private void InitializeComponent() this.lblNextInstruction.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNextInstruction.Location = new System.Drawing.Point(534, 208); this.lblNextInstruction.Name = "lblNextInstruction"; - this.lblNextInstruction.Size = new System.Drawing.Size(86, 31); + this.lblNextInstruction.Size = new System.Drawing.Size(49, 16); this.lblNextInstruction.TabIndex = 6; this.lblNextInstruction.Text = "xxxxxx"; // @@ -918,7 +917,7 @@ private void InitializeComponent() this.lblNI_Description.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNI_Description.Location = new System.Drawing.Point(534, 235); this.lblNI_Description.Name = "lblNI_Description"; - this.lblNI_Description.Size = new System.Drawing.Size(86, 31); + this.lblNI_Description.Size = new System.Drawing.Size(49, 16); this.lblNI_Description.TabIndex = 7; this.lblNI_Description.Text = "xxxxxx"; // @@ -928,7 +927,7 @@ private void InitializeComponent() this.lblNextInstruction_Effect.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblNextInstruction_Effect.Location = new System.Drawing.Point(534, 262); this.lblNextInstruction_Effect.Name = "lblNextInstruction_Effect"; - this.lblNextInstruction_Effect.Size = new System.Drawing.Size(86, 31); + this.lblNextInstruction_Effect.Size = new System.Drawing.Size(49, 16); this.lblNextInstruction_Effect.TabIndex = 8; this.lblNextInstruction_Effect.Text = "xxxxxx"; // @@ -1004,10 +1003,10 @@ private void InitializeComponent() // tbCodeEditor // this.tbCodeEditor.Controls.Add(this.txtCodeEditor); - this.tbCodeEditor.Location = new System.Drawing.Point(8, 45); + this.tbCodeEditor.Location = new System.Drawing.Point(4, 25); this.tbCodeEditor.Name = "tbCodeEditor"; this.tbCodeEditor.Padding = new System.Windows.Forms.Padding(3); - this.tbCodeEditor.Size = new System.Drawing.Size(648, 537); + this.tbCodeEditor.Size = new System.Drawing.Size(656, 561); this.tbCodeEditor.TabIndex = 4; this.tbCodeEditor.Text = "Code Editor"; this.tbCodeEditor.UseVisualStyleBackColor = true; @@ -1018,17 +1017,17 @@ private void InitializeComponent() this.txtCodeEditor.Font = new System.Drawing.Font("Courier New", 9.75F); this.txtCodeEditor.Location = new System.Drawing.Point(0, 0); this.txtCodeEditor.Name = "txtCodeEditor"; - this.txtCodeEditor.Size = new System.Drawing.Size(648, 409); + this.txtCodeEditor.Size = new System.Drawing.Size(648, 555); this.txtCodeEditor.TabIndex = 0; this.txtCodeEditor.Text = ""; // // tbSICSymbol // this.tbSICSymbol.Controls.Add(this.txtSICInput); - this.tbSICSymbol.Location = new System.Drawing.Point(8, 45); + this.tbSICSymbol.Location = new System.Drawing.Point(4, 25); this.tbSICSymbol.Name = "tbSICSymbol"; this.tbSICSymbol.Padding = new System.Windows.Forms.Padding(3); - this.tbSICSymbol.Size = new System.Drawing.Size(648, 537); + this.tbSICSymbol.Size = new System.Drawing.Size(656, 561); this.tbSICSymbol.TabIndex = 0; this.tbSICSymbol.Text = "SIC Symbol Table"; this.tbSICSymbol.UseVisualStyleBackColor = true; @@ -1036,10 +1035,10 @@ private void InitializeComponent() // tbObjCode // this.tbObjCode.Controls.Add(this.txtObjectCode); - this.tbObjCode.Location = new System.Drawing.Point(8, 45); + this.tbObjCode.Location = new System.Drawing.Point(4, 25); this.tbObjCode.Name = "tbObjCode"; this.tbObjCode.Padding = new System.Windows.Forms.Padding(3); - this.tbObjCode.Size = new System.Drawing.Size(648, 537); + this.tbObjCode.Size = new System.Drawing.Size(656, 561); this.tbObjCode.TabIndex = 1; this.tbObjCode.Text = "SIC Object Code"; this.tbObjCode.UseVisualStyleBackColor = true; @@ -1047,11 +1046,11 @@ private void InitializeComponent() // tbModRecs // this.tbModRecs.Controls.Add(this.txtModRecs); - this.tbModRecs.Location = new System.Drawing.Point(8, 45); + this.tbModRecs.Location = new System.Drawing.Point(4, 25); this.tbModRecs.Margin = new System.Windows.Forms.Padding(2); this.tbModRecs.Name = "tbModRecs"; this.tbModRecs.Padding = new System.Windows.Forms.Padding(2); - this.tbModRecs.Size = new System.Drawing.Size(648, 537); + this.tbModRecs.Size = new System.Drawing.Size(656, 561); this.tbModRecs.TabIndex = 2; this.tbModRecs.Text = "SIC Modification Records"; this.tbModRecs.UseVisualStyleBackColor = true; @@ -1062,18 +1061,18 @@ private void InitializeComponent() this.txtModRecs.Location = new System.Drawing.Point(2, 2); this.txtModRecs.Margin = new System.Windows.Forms.Padding(2); this.txtModRecs.Name = "txtModRecs"; - this.txtModRecs.Size = new System.Drawing.Size(644, 533); + this.txtModRecs.Size = new System.Drawing.Size(652, 557); this.txtModRecs.TabIndex = 0; this.txtModRecs.Text = ""; // // relocatedObj // this.relocatedObj.Controls.Add(this.txtModdedObjectCode); - this.relocatedObj.Location = new System.Drawing.Point(8, 45); + this.relocatedObj.Location = new System.Drawing.Point(4, 25); this.relocatedObj.Margin = new System.Windows.Forms.Padding(2); this.relocatedObj.Name = "relocatedObj"; this.relocatedObj.Padding = new System.Windows.Forms.Padding(2); - this.relocatedObj.Size = new System.Drawing.Size(648, 537); + this.relocatedObj.Size = new System.Drawing.Size(656, 561); this.relocatedObj.TabIndex = 3; this.relocatedObj.Text = "SIC Relocated Object Code"; this.relocatedObj.UseVisualStyleBackColor = true; @@ -1084,7 +1083,7 @@ private void InitializeComponent() this.txtModdedObjectCode.Location = new System.Drawing.Point(2, 2); this.txtModdedObjectCode.Margin = new System.Windows.Forms.Padding(2); this.txtModdedObjectCode.Name = "txtModdedObjectCode"; - this.txtModdedObjectCode.Size = new System.Drawing.Size(644, 533); + this.txtModdedObjectCode.Size = new System.Drawing.Size(652, 557); this.txtModdedObjectCode.TabIndex = 0; this.txtModdedObjectCode.Text = ""; // @@ -1111,7 +1110,7 @@ private void InitializeComponent() this.lblCurrentInstruction_Effect.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCurrentInstruction_Effect.Location = new System.Drawing.Point(533, 136); this.lblCurrentInstruction_Effect.Name = "lblCurrentInstruction_Effect"; - this.lblCurrentInstruction_Effect.Size = new System.Drawing.Size(86, 31); + this.lblCurrentInstruction_Effect.Size = new System.Drawing.Size(49, 16); this.lblCurrentInstruction_Effect.TabIndex = 45; this.lblCurrentInstruction_Effect.Text = "xxxxxx"; // @@ -1121,7 +1120,7 @@ private void InitializeComponent() this.lblCI_Description.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCI_Description.Location = new System.Drawing.Point(533, 110); this.lblCI_Description.Name = "lblCI_Description"; - this.lblCI_Description.Size = new System.Drawing.Size(86, 31); + this.lblCI_Description.Size = new System.Drawing.Size(49, 16); this.lblCI_Description.TabIndex = 44; this.lblCI_Description.Text = "xxxxxx"; // @@ -1131,7 +1130,7 @@ private void InitializeComponent() this.lblCurrentInstruction.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblCurrentInstruction.Location = new System.Drawing.Point(533, 82); this.lblCurrentInstruction.Name = "lblCurrentInstruction"; - this.lblCurrentInstruction.Size = new System.Drawing.Size(86, 31); + this.lblCurrentInstruction.Size = new System.Drawing.Size(49, 16); this.lblCurrentInstruction.TabIndex = 43; this.lblCurrentInstruction.Text = "xxxxxx"; // @@ -1141,13 +1140,13 @@ private void InitializeComponent() this.label14.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.Location = new System.Drawing.Point(491, 61); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(224, 31); + this.label14.Size = new System.Drawing.Size(113, 16); this.label14.TabIndex = 42; this.label14.Text = "Current Instruction"; // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 31F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; this.ClientSize = new System.Drawing.Size(1444, 966); diff --git a/SIC Simulator/Form1.cs b/SIC Simulator/Form1.cs index 6f09248..c447611 100644 --- a/SIC Simulator/Form1.cs +++ b/SIC Simulator/Form1.cs @@ -1129,6 +1129,8 @@ await Task.Run(() => { //String.Format("{0}\t{1}\t{2}\t{3}\t{4}\n", string textBoxText = lines[0] + "\n" + lines[1] + "\n"; + if (this.SICVirtualMachine.PC < 0) { return; } + int highlightOffset = lines[0].Length + lines[1].Length + 2; int addr = int.Parse(this.txtPC_Hex.Text, System.Globalization.NumberStyles.HexNumber); string hexValue = addr.ToString("X"); //this.txtPC_Hex.Text.TrimStart(new Char[] { '0' }); diff --git a/SIC Simulator/SIC_CPU.cs b/SIC Simulator/SIC_CPU.cs index 667c656..478c093 100644 --- a/SIC Simulator/SIC_CPU.cs +++ b/SIC Simulator/SIC_CPU.cs @@ -502,11 +502,12 @@ public void PerformStep() int op = 0; int TA = 0; + Console.WriteLine(PC); NextInstruction = this.FetchWord(PC); - this.DecodeInstruction(NextInstruction, ref op, ref TA); - this.ExecuteInstruction(op, TA); + + MachineStateIsNotSaved = true; } diff --git a/SIC Simulator/frmAbout.cs b/SIC Simulator/frmAbout.cs index 2aad53e..0ccda11 100644 --- a/SIC Simulator/frmAbout.cs +++ b/SIC Simulator/frmAbout.cs @@ -82,7 +82,7 @@ private void frmAbout_Load(object sender, EventArgs e) String[] RoryNLvItems = { "Rory Naughton", "Base Code Editor & Saving SIC Files" }; this.lvAuthors.Items.Add(new ListViewItem(RoryNLvItems)); - String[] AaronSLvItems = { "Aaron Swartz", "[Insert Contributions]" }; + String[] AaronSLvItems = { "Aaron Swartz", "Base Code Editor & Dark Theme" }; this.lvAuthors.Items.Add(new ListViewItem(AaronSLvItems)); this.lblVersion.Text = "Version: " + Application.ProductVersion.ToString();