X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;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=86c60044c330d075141e3fde6ae28ef1a7eb76a8;hp=5683b8eaf415bcd0fb480d911a236394d415b44f;hb=d094b43f1697af4586f135790919f866cc53a9a5;hpb=1234597eaff5990ecc51d90856786702cc33f52e 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 5683b8ea..86c60044 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,9 +16,9 @@ import net.mograsim.machine.Machine; import net.mograsim.machine.MachineDefinition; import net.mograsim.machine.MainMemory; import net.mograsim.machine.Register; +import net.mograsim.machine.mi.AssignableMicroInstructionMemory; import net.mograsim.machine.mi.MicroInstruction; import net.mograsim.machine.mi.MicroInstructionDefinition; -import net.mograsim.machine.mi.MicroInstructionMemory; import net.mograsim.machine.mi.StandardMicroInstructionMemory; import net.mograsim.machine.mi.parameters.MicroInstructionParameter; import net.mograsim.machine.mi.parameters.ParameterClassification; @@ -31,7 +31,7 @@ public class Am2900Machine implements Machine private ModelComponent am2900; private Timeline timeline; private MainMemory mainMemory; - private MicroInstructionMemory instMemory; + private AssignableMicroInstructionMemory instMemory; private CoreClock clock; public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition) @@ -44,7 +44,8 @@ public class Am2900Machine implements Machine params.gateProcessTime = 50; params.wireTravelTime = 10; mainMemory = new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()); - instMemory = new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition()); + instMemory = new AssignableMicroInstructionMemory( + new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition())); logicModel.getComponentBySubmodelPath("Am2900.Am2900MainMemory#0", ModelAm2900MainMemory.class).setMachine(this); logicModel.getComponentBySubmodelPath("Am2900.Am2900MicroInstructionMemory#0", ModelAm2900MicroInstructionMemory.class) .setMachine(this); @@ -113,7 +114,7 @@ public class Am2900Machine implements Machine } @Override - public MicroInstructionMemory getMicroInstructionMemory() + public AssignableMicroInstructionMemory getMicroInstructionMemory() { return instMemory; }