Renamed Am2900Simple/Strict to Am2900Teaching/Expert.

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / machine / Am2900Machine.java

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index cb57ab8..e48134f 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@ -54,6 +54,7 @@ public class Am2900Machine implements Machine
 
                CoreModelParameters params = new CoreModelParameters();
                params.gateProcessTime = 50;
+               params.hardcodedComponentProcessTime = params.gateProcessTime * 5;
                params.wireTravelTime = 10;
                mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()));
                instMemory = new AssignableMicroInstructionMemory(
@@ -88,7 +89,7 @@ public class Am2900Machine implements Machine
                defaultParams[19] = paramClassifications[19].parse("JZ");
                MicroInstruction jzMI = MicroInstruction.create(defaultParams);
                am2900.setHighLevelState("muir_2.q", jzMI.toBitVector());
-               Bit regsValue = machineDefinition.strict ? Bit.U : Bit.ZERO;
+               Bit regsValue = machineDefinition.expert ? Bit.U : Bit.ZERO;
                setRegistersTo(machineDefinition.getUnsortedRegisters(), regsValue);
                setRegisterGroupTo(machineDefinition.getRegisterGroups(), regsValue);
                // TODO reset latches?