Commit 71a73036 authored by Alexander Dietsch's avatar Alexander Dietsch

General:

-Changed all occurances of 'register' to 'variable'
GUI:
-Improved the option to show the next executed command
MainSimulator:
-Added check to prevent input variables also being output or auxiliary
variables
-Added check to prevent recursion by calling the same macro multiple times
within one hierachy
parent 4c0c49d9
......@@ -864,7 +864,7 @@ namespace NDesk.Options {
if (i == 0)
return false;
throw new OptionException (string.Format (localizer (
"Cannot bundle unregistered option '{0}'."), opt), opt);
"Cannot bundle unvariableed option '{0}'."), opt), opt);
}
p = this [rn];
switch (p.OptionValueType) {
......
......@@ -21,14 +21,14 @@ namespace LWSimulatorCons
{
bool show_help = false;
bool gui = false;
long limitRegisters = long.MaxValue;
long limitVariables = long.MaxValue;
long clockRate = long.MinValue;
long limitSteps = 0;
bool errorInd = false;
bool[] errors = new bool[amInputErrors];
bool quarantined = false;
string inputPath = null;
string registerPath = null;
string variablePath = null;
bool run = false;
OptionSet opt = new OptionSet() {
{
......@@ -73,13 +73,13 @@ namespace LWSimulatorCons
"q|quarantined", "disallow the simulator to save the options so they won't carry over to the next start; will be set automatically if paremeter '--run' is set",
v => quarantined = v != null },
{
"R|registers=", "set register file",
v => registerPath = v },
"R|variables=", "set variable file",
v => variablePath = v },
{
"r|limit-registers=", "limit the number of registers that any program is allowed to use at most; default is 100",
"r|limit-variables=", "limit the number of variables that any program is allowed to use at most; default is 100",
v => {
if (!tryParseValue(v,out limitRegisters))
if (!tryParseValue(v,out limitVariables))
{
errorInd = true;
errors[0] = true;
......@@ -142,7 +142,7 @@ namespace LWSimulatorCons
simulator.setUpdateOptionFunc(dummyFunc);
simulator.setRunningFuncs(notifyRunningStateChanged);
simulator.setProgramCodeFuncs(dummyFunc);
simulator.setUpdateRegisterFuncs(dummyFunc, dummyFunc, dummyFunc);
simulator.setUpdateVariableFuncs(dummyFunc, dummyFunc, dummyFunc);
if (!errors[4])
{
......@@ -157,9 +157,9 @@ namespace LWSimulatorCons
}
}
if (!errors[0] && limitRegisters != long.MaxValue)
if (!errors[0] && limitVariables != long.MaxValue)
{
if(limitRegisters <= 0 || !simulator.setOptionVal("maxRegAm",limitRegisters))
if(limitVariables <= 0 || !simulator.setOptionVal("maxRegAm",limitVariables))
{
errorInd = true;
errors[1] = true;
......@@ -184,9 +184,9 @@ namespace LWSimulatorCons
}
}
if(!errorInd && registerPath != null)
if(!errorInd && variablePath != null)
{
if (string.IsNullOrEmpty(registerPath) || !File.Exists(registerPath))
if (string.IsNullOrEmpty(variablePath) || !File.Exists(variablePath))
{
errorInd = true;
errors[8] = true;
......@@ -194,7 +194,7 @@ namespace LWSimulatorCons
else
{
byte error;
if (!simulator.importRegisters(registerPath, out error))
if (!simulator.importVariables(variablePath, out error))
{
errorInd = true;
errors[10] = true;
......@@ -239,9 +239,9 @@ namespace LWSimulatorCons
{
Console.WriteLine("LWSimulator: Following errors occured:");
if (errors[0])
Console.WriteLine("\t-Couldn't parse the maximum number of registers");
Console.WriteLine("\t-Couldn't parse the maximum number of variables");
if (errors[1])
Console.WriteLine("\t-Invalid number for maximum amount of registers");
Console.WriteLine("\t-Invalid number for maximum amount of variables");
if (errors[2])
Console.WriteLine("\t-Couldn't parse the maximum number of steps");
if (errors[3])
......@@ -255,11 +255,11 @@ namespace LWSimulatorCons
if (errors[7])
Console.WriteLine("\t-Invalid number for clock-rate");
if (errors[8])
Console.WriteLine("\t-Couldn't find register file");
Console.WriteLine("\t-Couldn't find variable file");
if (errors[9])
Console.WriteLine("\t-Couldn't find input file");
if (errors[10])
Console.WriteLine("\t-Error on loading (existant) register file");
Console.WriteLine("\t-Error on loading (existant) variable file");
#if (DEBUG)
Console.ReadLine();
......
namespace LWSimulatorGUI
{
partial class DeleteRegisters
partial class DeleteVariables
{
/// <summary>
/// Required designer variable.
......@@ -29,15 +29,15 @@
private void InitializeComponent()
{
this.lDelete = new System.Windows.Forms.Label();
this.nUDRegisterAm = new System.Windows.Forms.NumericUpDown();
this.nUDVariableAm = new System.Windows.Forms.NumericUpDown();
this.lFollowing = new System.Windows.Forms.Label();
this.nUDRegister = new System.Windows.Forms.NumericUpDown();
this.nUDVariable = new System.Windows.Forms.NumericUpDown();
this.bPrefOK = new System.Windows.Forms.Button();
this.bPrefCancel = new System.Windows.Forms.Button();
this.lRegister = new System.Windows.Forms.Label();
this.lVariable = new System.Windows.Forms.Label();
this.lAnd = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.nUDRegisterAm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDRegister)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariableAm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariable)).BeginInit();
this.SuspendLayout();
//
// lDelete
......@@ -47,14 +47,14 @@
this.lDelete.Name = "lDelete";
this.lDelete.Size = new System.Drawing.Size(83, 13);
this.lDelete.TabIndex = 0;
this.lDelete.Text = "Delete register x";
this.lDelete.Text = "Delete variable x";
//
// nUDRegisterAm
// nUDVariableAm
//
this.nUDRegisterAm.Location = new System.Drawing.Point(81, 60);
this.nUDRegisterAm.Name = "nUDRegisterAm";
this.nUDRegisterAm.Size = new System.Drawing.Size(59, 20);
this.nUDRegisterAm.TabIndex = 1;
this.nUDVariableAm.Location = new System.Drawing.Point(81, 60);
this.nUDVariableAm.Name = "nUDVariableAm";
this.nUDVariableAm.Size = new System.Drawing.Size(59, 20);
this.nUDVariableAm.TabIndex = 1;
//
// lFollowing
//
......@@ -65,17 +65,17 @@
this.lFollowing.TabIndex = 2;
this.lFollowing.Text = "the following";
//
// nUDRegister
// nUDVariable
//
this.nUDRegister.Location = new System.Drawing.Point(89, 23);
this.nUDRegister.Maximum = new decimal(new int[] {
this.nUDVariable.Location = new System.Drawing.Point(89, 23);
this.nUDVariable.Maximum = new decimal(new int[] {
10000,
0,
0,
0});
this.nUDRegister.Name = "nUDRegister";
this.nUDRegister.Size = new System.Drawing.Size(59, 20);
this.nUDRegister.TabIndex = 0;
this.nUDVariable.Name = "nUDVariable";
this.nUDVariable.Size = new System.Drawing.Size(59, 20);
this.nUDVariable.TabIndex = 0;
//
// bPrefOK
//
......@@ -99,14 +99,14 @@
this.bPrefCancel.UseVisualStyleBackColor = true;
this.bPrefCancel.Click += new System.EventHandler(this.bPrefCancel_Click);
//
// lRegister
// lVariable
//
this.lRegister.AutoSize = true;
this.lRegister.Location = new System.Drawing.Point(146, 62);
this.lRegister.Name = "lRegister";
this.lRegister.Size = new System.Drawing.Size(52, 13);
this.lRegister.TabIndex = 8;
this.lRegister.Text = "register(s)";
this.lVariable.AutoSize = true;
this.lVariable.Location = new System.Drawing.Point(146, 62);
this.lVariable.Name = "lVariable";
this.lVariable.Size = new System.Drawing.Size(52, 13);
this.lVariable.TabIndex = 8;
this.lVariable.Text = "variable(s)";
//
// lAnd
//
......@@ -117,28 +117,28 @@
this.lAnd.TabIndex = 9;
this.lAnd.Text = "and";
//
// DeleteRegisters
// DeleteVariables
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(244, 135);
this.Controls.Add(this.lAnd);
this.Controls.Add(this.lRegister);
this.Controls.Add(this.lVariable);
this.Controls.Add(this.bPrefCancel);
this.Controls.Add(this.bPrefOK);
this.Controls.Add(this.nUDRegister);
this.Controls.Add(this.nUDVariable);
this.Controls.Add(this.lFollowing);
this.Controls.Add(this.nUDRegisterAm);
this.Controls.Add(this.nUDVariableAm);
this.Controls.Add(this.lDelete);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "DeleteRegisters";
this.Name = "DeleteVariables";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Delete Registers";
((System.ComponentModel.ISupportInitialize)(this.nUDRegisterAm)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDRegister)).EndInit();
this.Text = "Delete Variables";
((System.ComponentModel.ISupportInitialize)(this.nUDVariableAm)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariable)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -147,12 +147,12 @@
#endregion
private System.Windows.Forms.Label lDelete;
private System.Windows.Forms.NumericUpDown nUDRegisterAm;
private System.Windows.Forms.NumericUpDown nUDVariableAm;
private System.Windows.Forms.Label lFollowing;
private System.Windows.Forms.NumericUpDown nUDRegister;
private System.Windows.Forms.NumericUpDown nUDVariable;
private System.Windows.Forms.Button bPrefOK;
private System.Windows.Forms.Button bPrefCancel;
private System.Windows.Forms.Label lRegister;
private System.Windows.Forms.Label lVariable;
private System.Windows.Forms.Label lAnd;
}
}
\ No newline at end of file
......@@ -11,26 +11,26 @@ using System.Windows.Forms;
namespace LWSimulatorGUI
{
public partial class DeleteRegisters : Form
public partial class DeleteVariables : Form
{
LWCoordinator simul;
public DeleteRegisters(LWCoordinator coord)
public DeleteVariables(LWCoordinator coord)
{
InitializeComponent();
simul = coord;
nUDRegister.Maximum = simul.getRegisterAmount() - 1;
nUDRegisterAm.Maximum = simul.getRegisterAmount() - 1;
nUDVariable.Maximum = simul.getVariableAmount() - 1;
nUDVariableAm.Maximum = simul.getVariableAmount() - 1;
// Attempt to get some uniformity between platforms
nUDRegister.Location = new Point(lDelete.Location.X + lDelete.Width - 2, nUDRegister.Location.Y);
lAnd.Location = new Point(nUDRegister.Location.X + nUDRegister.Width + 6, lAnd.Location.Y);
nUDRegisterAm.Location = new Point(lFollowing.Location.X + lFollowing.Width + 6, nUDRegisterAm.Location.Y);
lRegister.Location = new Point(nUDRegisterAm.Location.X + nUDRegisterAm.Width + 6, lRegister.Location.Y);
nUDVariable.Location = new Point(lDelete.Location.X + lDelete.Width - 2, nUDVariable.Location.Y);
lAnd.Location = new Point(nUDVariable.Location.X + nUDVariable.Width + 6, lAnd.Location.Y);
nUDVariableAm.Location = new Point(lFollowing.Location.X + lFollowing.Width + 6, nUDVariableAm.Location.Y);
lVariable.Location = new Point(nUDVariableAm.Location.X + nUDVariableAm.Width + 6, lVariable.Location.Y);
}
private void bPrefOK_Click(object sender, EventArgs e)
{
simul.removeRegisters((int)nUDRegister.Value, (int)nUDRegisterAm.Value + 1);
simul.removeVariables((int)nUDVariable.Value, (int)nUDVariableAm.Value + 1);
this.Close();
}
......
namespace LWSimulatorGUI
{
partial class InsertRegisters
partial class InsertVariables
{
/// <summary>
/// Required designer variable.
......@@ -29,16 +29,16 @@
private void InitializeComponent()
{
this.lInsert = new System.Windows.Forms.Label();
this.nUDRegisterAm = new System.Windows.Forms.NumericUpDown();
this.lRegisters = new System.Windows.Forms.Label();
this.nUDVariableAm = new System.Windows.Forms.NumericUpDown();
this.lVariables = new System.Windows.Forms.Label();
this.rBToEnd = new System.Windows.Forms.RadioButton();
this.rBBeforeReg = new System.Windows.Forms.RadioButton();
this.nUDRegister = new System.Windows.Forms.NumericUpDown();
this.nUDVariable = new System.Windows.Forms.NumericUpDown();
this.bPrefOK = new System.Windows.Forms.Button();
this.bPrefCancel = new System.Windows.Forms.Button();
this.nUDValue = new System.Windows.Forms.NumericUpDown();
((System.ComponentModel.ISupportInitialize)(this.nUDRegisterAm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDRegister)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariableAm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariable)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDValue)).BeginInit();
this.SuspendLayout();
//
......@@ -51,36 +51,36 @@
this.lInsert.TabIndex = 0;
this.lInsert.Text = "Insert";
//
// nUDRegisterAm
// nUDVariableAm
//
this.nUDRegisterAm.Location = new System.Drawing.Point(41, 23);
this.nUDRegisterAm.Maximum = new decimal(new int[] {
this.nUDVariableAm.Location = new System.Drawing.Point(41, 23);
this.nUDVariableAm.Maximum = new decimal(new int[] {
10000,
0,
0,
0});
this.nUDRegisterAm.Minimum = new decimal(new int[] {
this.nUDVariableAm.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.nUDRegisterAm.Name = "nUDRegisterAm";
this.nUDRegisterAm.Size = new System.Drawing.Size(59, 20);
this.nUDRegisterAm.TabIndex = 1;
this.nUDRegisterAm.Value = new decimal(new int[] {
this.nUDVariableAm.Name = "nUDVariableAm";
this.nUDVariableAm.Size = new System.Drawing.Size(59, 20);
this.nUDVariableAm.TabIndex = 1;
this.nUDVariableAm.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// lRegisters
// lVariables
//
this.lRegisters.AutoSize = true;
this.lRegisters.Location = new System.Drawing.Point(106, 25);
this.lRegisters.Name = "lRegisters";
this.lRegisters.Size = new System.Drawing.Size(121, 13);
this.lRegisters.TabIndex = 2;
this.lRegisters.Text = "register(s) with the value";
this.lVariables.AutoSize = true;
this.lVariables.Location = new System.Drawing.Point(106, 25);
this.lVariables.Name = "lVariables";
this.lVariables.Size = new System.Drawing.Size(121, 13);
this.lVariables.TabIndex = 2;
this.lVariables.Text = "variable(s) with the value";
//
// rBToEnd
//
......@@ -90,7 +90,7 @@
this.rBToEnd.Size = new System.Drawing.Size(102, 17);
this.rBToEnd.TabIndex = 3;
this.rBToEnd.TabStop = true;
this.rBToEnd.Text = "after last register";
this.rBToEnd.Text = "after last variable";
this.rBToEnd.UseVisualStyleBackColor = true;
//
// rBBeforeReg
......@@ -102,21 +102,21 @@
this.rBBeforeReg.Size = new System.Drawing.Size(100, 17);
this.rBBeforeReg.TabIndex = 4;
this.rBBeforeReg.TabStop = true;
this.rBBeforeReg.Text = "before register x";
this.rBBeforeReg.Text = "before variable x";
this.rBBeforeReg.UseVisualStyleBackColor = true;
this.rBBeforeReg.CheckedChanged += new System.EventHandler(this.rBBeforeReg_CheckedChanged);
//
// nUDRegister
// nUDVariable
//
this.nUDRegister.Location = new System.Drawing.Point(109, 58);
this.nUDRegister.Maximum = new decimal(new int[] {
this.nUDVariable.Location = new System.Drawing.Point(109, 58);
this.nUDVariable.Maximum = new decimal(new int[] {
10000,
0,
0,
0});
this.nUDRegister.Name = "nUDRegister";
this.nUDRegister.Size = new System.Drawing.Size(54, 20);
this.nUDRegister.TabIndex = 5;
this.nUDVariable.Name = "nUDVariable";
this.nUDVariable.Size = new System.Drawing.Size(54, 20);
this.nUDVariable.TabIndex = 5;
//
// bPrefOK
//
......@@ -152,7 +152,7 @@
this.nUDValue.Size = new System.Drawing.Size(106, 20);
this.nUDValue.TabIndex = 8;
//
// InsertRegisters
// InsertVariables
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
......@@ -160,21 +160,21 @@
this.Controls.Add(this.nUDValue);
this.Controls.Add(this.bPrefCancel);
this.Controls.Add(this.bPrefOK);
this.Controls.Add(this.nUDRegister);
this.Controls.Add(this.nUDVariable);
this.Controls.Add(this.rBBeforeReg);
this.Controls.Add(this.rBToEnd);
this.Controls.Add(this.lRegisters);
this.Controls.Add(this.nUDRegisterAm);
this.Controls.Add(this.lVariables);
this.Controls.Add(this.nUDVariableAm);
this.Controls.Add(this.lInsert);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "InsertRegisters";
this.Name = "InsertVariables";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Insert Registers";
((System.ComponentModel.ISupportInitialize)(this.nUDRegisterAm)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDRegister)).EndInit();
this.Text = "Insert Variables";
((System.ComponentModel.ISupportInitialize)(this.nUDVariableAm)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nUDValue)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -184,11 +184,11 @@
#endregion
private System.Windows.Forms.Label lInsert;
private System.Windows.Forms.NumericUpDown nUDRegisterAm;
private System.Windows.Forms.Label lRegisters;
private System.Windows.Forms.NumericUpDown nUDVariableAm;
private System.Windows.Forms.Label lVariables;
private System.Windows.Forms.RadioButton rBToEnd;
private System.Windows.Forms.RadioButton rBBeforeReg;
private System.Windows.Forms.NumericUpDown nUDRegister;
private System.Windows.Forms.NumericUpDown nUDVariable;
private System.Windows.Forms.Button bPrefOK;
private System.Windows.Forms.Button bPrefCancel;
private System.Windows.Forms.NumericUpDown nUDValue;
......
......@@ -11,35 +11,35 @@ using System.Windows.Forms;
namespace LWSimulatorGUI
{
public partial class InsertRegisters : Form
public partial class InsertVariables : Form
{
LWCoordinator simul;
public InsertRegisters(LWCoordinator coord)
public InsertVariables(LWCoordinator coord)
{
InitializeComponent();
simul = coord;
nUDValue.Value = simul.getOptionVal("defRegVal");
nUDRegister.Maximum = simul.getRegisterAmount() - 1;
nUDRegisterAm.Maximum = simul.getOptionVal("maxRegAm") - simul.getRegisterAmount();
nUDVariable.Maximum = simul.getVariableAmount() - 1;
nUDVariableAm.Maximum = simul.getOptionVal("maxRegAm") - simul.getVariableAmount();
// Attempt to get some uniformity between platforms
nUDRegisterAm.Location = new Point(lInsert.Location.X + lInsert.Width + 6, nUDRegisterAm.Location.Y);
lRegisters.Location = new Point(nUDRegisterAm.Location.X + nUDRegisterAm.Width + 6, lRegisters.Location.Y);
nUDValue.Location = new Point(lRegisters.Location.X + lRegisters.Width + 6, nUDValue.Location.Y);
nUDRegister.Location = new Point(rBBeforeReg.Location.X + rBBeforeReg.Width - 2, nUDRegister.Location.Y);
nUDVariableAm.Location = new Point(lInsert.Location.X + lInsert.Width + 6, nUDVariableAm.Location.Y);
lVariables.Location = new Point(nUDVariableAm.Location.X + nUDVariableAm.Width + 6, lVariables.Location.Y);
nUDValue.Location = new Point(lVariables.Location.X + lVariables.Width + 6, nUDValue.Location.Y);
nUDVariable.Location = new Point(rBBeforeReg.Location.X + rBBeforeReg.Width - 2, nUDVariable.Location.Y);
}
private void rBBeforeReg_CheckedChanged(object sender, EventArgs e)
{
nUDRegister.Enabled = rBBeforeReg.Checked;
nUDVariable.Enabled = rBBeforeReg.Checked;
}
private void bPrefOK_Click(object sender, EventArgs e)
{
if (rBBeforeReg.Checked)
simul.insertRegisters((int)nUDRegister.Value, (int)nUDRegisterAm.Value, (long)nUDValue.Value);
simul.insertVariables((int)nUDVariable.Value, (int)nUDVariableAm.Value, (long)nUDValue.Value);
else
simul.insertRegisters(simul.getRegisterAmount(), (int)nUDRegisterAm.Value, (long)nUDValue.Value);
simul.insertVariables(simul.getVariableAmount(), (int)nUDVariableAm.Value, (long)nUDValue.Value);
this.Close();
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -185,7 +185,7 @@
YII=
</value>
</data>
<metadata name="cRegisters.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="cVariables.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cValues.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
......
......@@ -48,13 +48,13 @@
this.nUDLogLines = new System.Windows.Forms.NumericUpDown();
this.lMaxLinesLog = new System.Windows.Forms.Label();
this.chBClearLog = new System.Windows.Forms.CheckBox();
this.gBRegisters = new System.Windows.Forms.GroupBox();
this.gBVariables = new System.Windows.Forms.GroupBox();
this.pBHelpRegDefVal = new System.Windows.Forms.PictureBox();
this.lRegDefVal = new System.Windows.Forms.Label();
this.nUDRegDefVal = new System.Windows.Forms.NumericUpDown();
this.pBHelpReg = new System.Windows.Forms.PictureBox();
this.nUDRegisters = new System.Windows.Forms.NumericUpDown();
this.lMaximumRegisters = new System.Windows.Forms.Label();
this.nUDVariables = new System.Windows.Forms.NumericUpDown();
this.lMaximumVariables = new System.Windows.Forms.Label();
this.bPrefCancel = new System.Windows.Forms.Button();
this.bPrefOK = new System.Windows.Forms.Button();
this.fBDiaExportLog = new System.Windows.Forms.FolderBrowserDialog();
......@@ -69,11 +69,11 @@
this.gBLog.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pBHelpAdvancedLog)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDLogLines)).BeginInit();
this.gBRegisters.SuspendLayout();
this.gBVariables.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pBHelpRegDefVal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDRegDefVal)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pBHelpReg)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDRegisters)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nUDVariables)).BeginInit();
this.SuspendLayout();
//
// pPreferences
......@@ -85,7 +85,7 @@
this.pPreferences.Controls.Add(this.gBEditor);
this.pPreferences.Controls.Add(this.gBSimulation);
this.pPreferences.Controls.Add(this.gBLog);
this.pPreferences.Controls.Add(this.gBRegisters);
this.pPreferences.Controls.Add(this.gBVariables);
this.pPreferences.Location = new System.Drawing.Point(13, 13);
this.pPreferences.Name = "pPreferences";
this.pPreferences.Size = new System.Drawing.Size(437, 466);
......@@ -321,20 +321,20 @@
this.chBClearLog.Text = "Clear Log on every new program execution";
this.chBClearLog.UseVisualStyleBackColor = true;
//
// gBRegisters
//
this.gBRegisters.Controls.Add(this.pBHelpRegDefVal);
this.gBRegisters.Controls.Add(this.lRegDefVal);
this.gBRegisters.Controls.Add(this.nUDRegDefVal);
this.gBRegisters.Controls.Add(this.pBHelpReg);
this.gBRegisters.Controls.Add(this.nUDRegisters);
this.gBRegisters.Controls.Add(this.lMaximumRegisters);
this.gBRegisters.Location = new System.Drawing.Point(4, 4);
this.gBRegisters.Name = "gBRegisters";
this.gBRegisters.Size = new System.Drawing.Size(428, 77);
this.gBRegisters.TabIndex = 0;
this.gBRegisters.TabStop = false;
this.gBRegisters.Text = "Registers";
// gBVariables
//
this.gBVariables.Controls.Add(this.pBHelpRegDefVal);
this.gBVariables.Controls.Add(this.lRegDefVal);
this.gBVariables.Controls.Add(this.nUDRegDefVal);
this.gBVariables.Controls.Add(this.pBHelpReg);
this.gBVariables.Controls.Add(this.nUDVariables);
this.gBVariables.Controls.Add(this.lMaximumVariables);
this.gBVariables.Location = new System.Drawing.Point(4, 4);
this.gBVariables.Name = "gBVariables";
this.gBVariables.Size = new System.Drawing.Size(428, 77);
this.gBVariables.TabIndex = 0;
this.gBVariables.TabStop = false;
this.gBVariables.Text = "Variables";
//
// pBHelpRegDefVal
//
......@@ -352,7 +352,7 @@
this.lRegDefVal.Name = "lRegDefVal";
this.lRegDefVal.Size = new System.Drawing.Size(110, 13);
this.lRegDefVal.TabIndex = 4;
this.lRegDefVal.Text = "Register default value";
this.lRegDefVal.Text = "Variable default value";
//
// nUDRegDefVal
//
......@@ -375,41 +375,41 @@
this.pBHelpReg.TabIndex = 2;
this.pBHelpReg.TabStop = false;
//
// nUDRegisters
// nUDVariables
//
this.nUDRegisters.Increment = new decimal(new int[] {
this.nUDVariables.Increment = new decimal(new int[] {
10,
0,
0,
0});