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=352ce123d7d0bab0f34c894a437933b656593403;hb=2d1f3e4780616f3b638133a243fcdb7a6738baf9;hp=fc0ec2bd9f46c134717bbc9e13dfabb6c65a4894;hpb=f30643a40e01919e4544891bb8bd92fa37a5b5a7;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 fc0ec2bd..352ce123 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 @@ -1,9 +1,17 @@ package net.mograsim.logic.model.am2900.machine; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; + import net.mograsim.logic.core.components.CoreClock; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; +import net.mograsim.logic.model.am2900.machine.registers.NumberedRegister; +import net.mograsim.logic.model.am2900.machine.registers.QRegister; import net.mograsim.logic.model.model.LogicModel; import net.mograsim.logic.model.model.LogicModelModifiable; import net.mograsim.logic.model.model.components.ModelComponent; @@ -13,7 +21,6 @@ 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.MainMemory; import net.mograsim.machine.Register; import net.mograsim.machine.mi.AssignableMicroInstructionMemory; import net.mograsim.machine.mi.MicroInstruction; @@ -21,34 +28,51 @@ import net.mograsim.machine.mi.MicroInstructionDefinition; import net.mograsim.machine.mi.StandardMicroInstructionMemory; import net.mograsim.machine.mi.parameters.MicroInstructionParameter; import net.mograsim.machine.mi.parameters.ParameterClassification; +import net.mograsim.machine.standard.memory.AssignableMainMemory; import net.mograsim.machine.standard.memory.WordAddressableMemory; public class Am2900Machine implements Machine { - private Am2900MachineDefinition machineDefinition; + private AbstractAm2900MachineDefinition machineDefinition; private LogicModelModifiable logicModel; private ModelComponent am2900; private Timeline timeline; - private MainMemory mainMemory; + private AssignableMainMemory mainMemory; private AssignableMicroInstructionMemory instMemory; private CoreClock clock; + private long activeInstructionAddress; + + private final Set amicListeners; + private final Map, Consumer>> modelListenersPerRegisterListenerPerRegister; - public Am2900Machine(LogicModelModifiable model, Am2900MachineDefinition am2900MachineDefinition) + public Am2900Machine(LogicModelModifiable model, AbstractAm2900MachineDefinition am2900MachineDefinition) { this.machineDefinition = am2900MachineDefinition; this.logicModel = model; this.am2900 = IndirectModelComponentCreator.createComponent(logicModel, "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900"); + this.amicListeners = new HashSet<>(); + this.modelListenersPerRegisterListenerPerRegister = new HashMap<>(); + CoreModelParameters params = new CoreModelParameters(); params.gateProcessTime = 50; params.wireTravelTime = 10; - mainMemory = new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition()); + mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition())); instMemory = new AssignableMicroInstructionMemory( new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition())); timeline = LogicCoreAdapter.convert(logicModel, params); am2900.setHighLevelState("ram.memory_binding", mainMemory); am2900.setHighLevelState("mpm.memory_binding", instMemory); clock = logicModel.getComponentBySubmodelPath("Am2900.Clock#0", ModelClock.class).getClock(); + clock.registerObserver(c -> + { + if (clock.isOn()) + { + long oldAddress = activeInstructionAddress; + activeInstructionAddress = getCurrentMicroInstructionAddress(); + notifyActiveMicroInstructionChangedListeners(oldAddress, activeInstructionAddress); + } + }); } @Override @@ -60,13 +84,18 @@ public class Am2900Machine implements Machine @Override public void reset() { - logicModel.getComponentByName("Am2900").setHighLevelState("c.out", BitVector.of(Bit.ZERO)); MicroInstructionDefinition muiDef = getDefinition().getMicroInstructionMemoryDefinition().getMicroInstructionDefinition(); ParameterClassification[] paramClassifications = muiDef.getParameterClassifications(); MicroInstructionParameter[] defaultParams = muiDef.createDefaultInstruction().getParameters(); defaultParams[19] = paramClassifications[19].parse("JZ"); MicroInstruction jzMI = MicroInstruction.create(defaultParams); - logicModel.getComponentByName("Am2900").setHighLevelState("muir_2.q", jzMI.toBitVector()); + am2900.setHighLevelState("muir_2.q", jzMI.toBitVector()); + if (!machineDefinition.strict) + { + for (Register r : machineDefinition.getRegisters()) + setRegister(r, BitVector.of(Bit.ZERO, r.getWidth())); + // TODO reset latches? + } } @Override @@ -92,22 +121,79 @@ public class Am2900Machine implements Machine return clock; } + // TODO too much code duplication + @Override public BitVector getRegister(Register r) { - // TODO Auto-generated method stub - return null; + String am2901CellSuffix = getAm2901CellSuffix(r); + BitVector result = BitVector.of(); + for (int i = 0; i < 16; i += 4) + { + String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); + result = result.concat((BitVector) am2900.getHighLevelState(hlsID)); + } + return result; } @Override public void setRegister(Register r, BitVector value) { - // TODO Auto-generated method stub + String am2901CellSuffix = getAm2901CellSuffix(r); + for (int i = 0; i < 16; i += 4) + { + String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); + am2900.setHighLevelState(hlsID, value.subVector(i, i + 4)); + } + } + + @Override + public void addRegisterListener(Register r, Consumer listener) + { + Map, Consumer> modelListenersPerRegisterListener = modelListenersPerRegisterListenerPerRegister + .computeIfAbsent(r, k -> new HashMap<>()); + if (modelListenersPerRegisterListener.containsKey(listener)) + return; + + Consumer modelListener = v -> listener.accept(getRegister(r)); + String am2901CellSuffix = getAm2901CellSuffix(r); + for (int i = 0; i < 16; i += 4) + { + String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); + am2900.addHighLevelStateListener(hlsID, modelListener); + } + } + + @Override + public void removeRegisterListener(Register r, Consumer listener) + { + Map, Consumer> modelListenersPerRegisterListener = modelListenersPerRegisterListenerPerRegister.get(r); + if (modelListenersPerRegisterListener == null) + return; + + Consumer modelListener = modelListenersPerRegisterListener.get(listener); + if (modelListener == null) + return; + String am2901CellSuffix = getAm2901CellSuffix(r); + for (int i = 0; i < 16; i += 4) + { + String hlsID = String.format("am2901_%d-%d.%s", (i + 3), i, am2901CellSuffix); + am2900.removeHighLevelStateListener(hlsID, modelListener); + } + } + + private static String getAm2901CellSuffix(Register r) + { + if (r instanceof QRegister) + return "qreg.q"; + if (r instanceof NumberedRegister) + return "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q"; + throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r); } @Override - public MainMemory getMainMemory() + public AssignableMainMemory getMainMemory() { return mainMemory; } @@ -117,4 +203,33 @@ public class Am2900Machine implements Machine { return instMemory; } + + @Override + public long getActiveMicroInstructionAddress() + { + return activeInstructionAddress; + } + + private long getCurrentMicroInstructionAddress() + { + BitVector vector = (BitVector) am2900.getHighLevelState("mpm_address"); + return vector.isBinary() ? vector.getUnsignedValueLong() : -1; + } + + @Override + public void addActiveMicroInstructionChangedListener(ActiveMicroInstructionChangedListener listener) + { + amicListeners.add(listener); + } + + @Override + public void removeActiveMicroInstructionChangedListener(ActiveMicroInstructionChangedListener listener) + { + amicListeners.remove(listener); + } + + private void notifyActiveMicroInstructionChangedListeners(long oldAddress, long newAddress) + { + amicListeners.forEach(l -> l.instructionChanged(oldAddress, newAddress)); + } } \ No newline at end of file