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=3d3d6c395a62a1e67ea16d9345e97f33685f07fa;hb=c91a2fc91d1b1ac78649649808ad0e22aaccaa90;hp=ab0643f1fb790448537ce8c171d86910ff0c0670;hpb=4166a936aca1d531e799d2920ec472952b76d0e3;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 ab0643f1..3d3d6c39 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,46 +1,55 @@ 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.machine.registers.NumberedRegister; -import net.mograsim.logic.model.am2900.machine.registers.QRegister; +import net.mograsim.logic.model.am2900.machine.registers.Am2900Register; +import net.mograsim.logic.model.am2900.machine.registers.muInstrRegister; 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.CoreModelParameters.CoreModelParametersBuilder; import net.mograsim.logic.model.modeladapter.LogicCoreAdapter; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; +import net.mograsim.machine.AssignableMainMemory; import net.mograsim.machine.Machine; import net.mograsim.machine.MachineDefinition; -import net.mograsim.machine.Register; +import net.mograsim.machine.StandardMainMemory; +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; -import net.mograsim.machine.standard.memory.AssignableMainMemory; -import net.mograsim.machine.standard.memory.WordAddressableMemory; +import net.mograsim.machine.registers.Register; +import net.mograsim.machine.registers.RegisterGroup; public class Am2900Machine implements Machine { - private Am2900MachineDefinition machineDefinition; - private LogicModelModifiable logicModel; - private ModelComponent am2900; - private Timeline timeline; - private AssignableMainMemory mainMemory; - private AssignableMicroInstructionMemory instMemory; - private CoreClock clock; + private final AbstractAm2900MachineDefinition machineDefinition; + private final LogicModelModifiable logicModel; + private final ModelComponent am2900; + private final Timeline timeline; + private final CoreModelParameters params; + private final AssignableMainMemory mainMemory; + private final AssignableMicroInstructionMemory instMemory; + private final AssignableMPROM mprom; + private final 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; @@ -48,15 +57,20 @@ 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.wireTravelTime = 10; - mainMemory = new AssignableMainMemory(new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition())); + CoreModelParametersBuilder paramsBuilder = new CoreModelParametersBuilder(); + paramsBuilder.gateProcessTime = 50; + paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5; + paramsBuilder.wireTravelTime = 10; + params = paramsBuilder.build(); + + mainMemory = new AssignableMainMemory(new StandardMainMemory(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 -> { @@ -84,6 +98,26 @@ public class Am2900Machine implements Machine defaultParams[19] = paramClassifications[19].parse("JZ"); MicroInstruction jzMI = MicroInstruction.create(defaultParams); am2900.setHighLevelState("muir_2.q", jzMI.toBitVector()); + Bit regsValue = machineDefinition.expert ? Bit.U : Bit.ZERO; + setRegistersTo(machineDefinition.getUnsortedRegisters(), regsValue); + setRegisterGroupTo(machineDefinition.getRegisterGroups(), regsValue); + // TODO reset latches? + } + + private void setRegistersTo(List registers, Bit value) + { + for (Register r : registers) + if (r != muInstrRegister.instance)// don't reset; sometimes causes a glitch + setRegister(r, BitVector.of(value, r.getWidth())); + } + + private void setRegisterGroupTo(List registerGroups, Bit value) + { + for (RegisterGroup rg : registerGroups) + { + setRegistersTo(rg.getRegisters(), value); + setRegisterGroupTo(rg.getSubGroups(), value); + } } @Override @@ -103,6 +137,12 @@ public class Am2900Machine implements Machine return timeline; } + @Override + public CoreModelParameters getCoreModelParameters() + { + return params; + } + @Override public CoreClock getClock() { @@ -112,37 +152,32 @@ public class Am2900Machine implements Machine @Override public BitVector getRegister(Register r) { - String am2901CellSuffix; - if (r instanceof QRegister) - am2901CellSuffix = "qreg.q"; - else if (r instanceof NumberedRegister) - am2901CellSuffix = "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q"; - else - throw new IllegalArgumentException("Not a register of an Am2900Machine: " + 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; + return castAm2900Register(r).read(am2900); } @Override public void setRegister(Register r, BitVector value) { - String am2901CellSuffix; - if (r instanceof QRegister) - am2901CellSuffix = "qreg.q"; - else if (r instanceof NumberedRegister) - am2901CellSuffix = "regs.c" + ((NumberedRegister) r).getIndexAsBitstring() + ".q"; - else - throw new IllegalArgumentException("Not a register of an Am2900Machine: " + 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)); - } + 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 @@ -157,6 +192,12 @@ public class Am2900Machine implements Machine return instMemory; } + @Override + public AssignableMPROM getMPROM() + { + return mprom; + } + @Override public long getActiveMicroInstructionAddress() {