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;fp=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=3d486f475afede941b764c2bb54b143f194d6e4c;hb=161ecd36b6dcfe0e38cee3fd6ea8ad42d0705777;hp=a7f7379e598905a8d16b57d603f0a27dc0fd98b2;hpb=9719354a14003c6da81fc6237b2d940612c1dc0f;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 a7f7379e..3d486f47 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 @@ -16,6 +16,7 @@ import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.atomic.ModelClock; import net.mograsim.logic.model.modeladapter.CoreModelParameters; +import net.mograsim.logic.model.modeladapter.CoreModelParameters.CoreModelParametersBuilder; import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.machine.AssignableMainMemory; @@ -55,10 +56,12 @@ public class Am2900Machine implements Machine "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900"); this.amicListeners = new HashSet<>(); - CoreModelParameters params = new CoreModelParameters(); - params.gateProcessTime = 50; - params.hardcodedComponentProcessTime = params.gateProcessTime * 5; - params.wireTravelTime = 10; + CoreModelParametersBuilder paramsBuilder = new CoreModelParametersBuilder(); + paramsBuilder.gateProcessTime = 50; + paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5; + paramsBuilder.wireTravelTime = 10; + CoreModelParameters params = paramsBuilder.build(); + mainMemory = new AssignableMainMemory(new StandardMainMemory(am2900MachineDefinition.getMainMemoryDefinition())); instMemory = new AssignableMicroInstructionMemory( new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition()));