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=fa281db411fc01ce7f1519d65a06ef933f110991;hb=f430c331e21b61d3e1a720cdb0638ca3d8bca711;hp=86c60044c330d075141e3fde6ae28ef1a7eb76a8;hpb=d094b43f1697af4586f135790919f866cc53a9a5;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 86c60044..fa281db4 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,55 +1,75 @@ package net.mograsim.logic.model.am2900.machine; +import java.util.HashSet; +import java.util.List; +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.components.ModelAm2900MainMemory; -import net.mograsim.logic.model.am2900.components.ModelAm2900MicroInstructionMemory; +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; import net.mograsim.logic.model.model.LogicModel; 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.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; 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.registers.Register; +import net.mograsim.machine.registers.RegisterGroup; +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; - 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<>(); + 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())); - logicModel.getComponentBySubmodelPath("Am2900.Am2900MainMemory#0", ModelAm2900MainMemory.class).setMachine(this); - logicModel.getComponentBySubmodelPath("Am2900.Am2900MicroInstructionMemory#0", ModelAm2900MicroInstructionMemory.class) - .setMachine(this); 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 @@ -61,13 +81,33 @@ 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) + { + setRegistersToZero(machineDefinition.getUnsortedRegisters()); + setRegisterGroupToZero(machineDefinition.getRegisterGroups()); + // TODO reset latches? + } + } + + private void setRegistersToZero(List registers) + { + for (Register r : registers) + setRegister(r, BitVector.of(Bit.ZERO, r.getWidth())); + } + + private void setRegisterGroupToZero(List registerGroups) + { + for (RegisterGroup rg : registerGroups) + { + setRegistersToZero(rg.getRegisters()); + setRegisterGroupToZero(rg.getSubGroups()); + } } @Override @@ -96,19 +136,36 @@ public class Am2900Machine implements Machine @Override public BitVector getRegister(Register r) { - // TODO Auto-generated method stub - return null; + return castAm2900Register(r).read(am2900); } @Override public void setRegister(Register r, BitVector value) { - // TODO Auto-generated method stub + castAm2900Register(r).write(am2900, value); + } + @Override + public void addRegisterListener(Register r, Consumer listener) + { + castAm2900Register(r).addListener(am2900, listener); + } + + @Override + public void removeRegisterListener(Register r, Consumer listener) + { + castAm2900Register(r).removeListener(am2900, listener); + } + + private static Am2900Register castAm2900Register(Register r) + { + if (r instanceof Am2900Register) + return (Am2900Register) r; + throw new IllegalArgumentException("Not a register of an Am2900Machine: " + r); } @Override - public MainMemory getMainMemory() + public AssignableMainMemory getMainMemory() { return mainMemory; } @@ -118,4 +175,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