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;h=00c4d6daa5fbbf289fdeb1a7b008f1052da723a9;hp=e48134f0aa57daa31ad91d3c3f113616b3b78272;hb=d8745744bfff69076608f30e60c0d86d1f115833;hpb=1c5ecbd9dc7fd2f410aeacf9532d57b3637e938e 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 e48134f0..00c4d6da 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 @@ -20,9 +20,11 @@ import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.machine.Machine; import net.mograsim.machine.MachineDefinition; +import net.mograsim.machine.mi.AssignableMPROM; import net.mograsim.machine.mi.AssignableMicroInstructionMemory; import net.mograsim.machine.mi.MicroInstruction; import net.mograsim.machine.mi.MicroInstructionDefinition; +import net.mograsim.machine.mi.StandardMPROM; import net.mograsim.machine.mi.StandardMicroInstructionMemory; import net.mograsim.machine.mi.parameters.MicroInstructionParameter; import net.mograsim.machine.mi.parameters.ParameterClassification; @@ -39,6 +41,7 @@ public class Am2900Machine implements Machine private Timeline timeline; private AssignableMainMemory mainMemory; private AssignableMicroInstructionMemory instMemory; + private AssignableMPROM mprom; private CoreClock clock; private long activeInstructionAddress; @@ -59,9 +62,11 @@ public class Am2900Machine implements Machine mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition())); instMemory = new AssignableMicroInstructionMemory( new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition())); + mprom = new AssignableMPROM(new StandardMPROM(am2900MachineDefinition.getMPROMDefinition())); timeline = LogicCoreAdapter.convert(logicModel, params); am2900.setHighLevelState("ram.memory_binding", mainMemory); am2900.setHighLevelState("mpm.memory_binding", instMemory); + am2900.setHighLevelState("mprom.memory_binding", mprom); clock = logicModel.getComponentBySubmodelPath("Am2900.Clock#0", ModelClock.class).getClock(); clock.registerObserver(c -> { @@ -177,6 +182,12 @@ public class Am2900Machine implements Machine return instMemory; } + @Override + public AssignableMPROM getMPROM() + { + return mprom; + } + @Override public long getActiveMicroInstructionAddress() {