X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=e48134f0aa57daa31ad91d3c3f113616b3b78272;hb=13befb68923c540a13cfe5b5b28bf0f7ddf5c41b;hp=cb57ab892a5896bac4123c4dd454936031dea7ef;hpb=7a3c18fd9777f940aff972ee2a8fa9a761050332;p=Mograsim.git

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 cb57ab89..e48134f0 100644
--- 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?