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=4abe8dcad96e63b8203f5f0edd651f199c4dd3e1;hb=5c98e2c9bb53deaed767a1761840c15a0418d12e;hp=f705e74ee41bb102e2bea0d4022799a81bde50bf;hpb=0eb525202d3c871a2a20f789af1728248f3cff11;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 f705e74e..4abe8dca 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,44 +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.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 AbstractAm2900MachineDefinition machineDefinition; private LogicModelModifiable logicModel; private ModelComponent am2900; private Timeline timeline; + private CoreModelParameters params; private AssignableMainMemory mainMemory; private AssignableMicroInstructionMemory instMemory; + private AssignableMPROM mprom; 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; @@ -46,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 -> { @@ -81,7 +97,27 @@ public class Am2900Machine implements Machine 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()); + 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 @@ -101,6 +137,12 @@ public class Am2900Machine implements Machine return timeline; } + @Override + public CoreModelParameters getCoreModelParameters() + { + return params; + } + @Override public CoreClock getClock() { @@ -110,15 +152,32 @@ 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 @@ -133,6 +192,12 @@ public class Am2900Machine implements Machine return instMemory; } + @Override + public AssignableMPROM getMPROM() + { + return mprom; + } + @Override public long getActiveMicroInstructionAddress() { @@ -141,8 +206,7 @@ public class Am2900Machine implements Machine private long getCurrentMicroInstructionAddress() { - // TODO: replace with highlevelstate - BitVector vector = logicModel.getWireBySubmodelPath("Am2900.wire_mpm_address").getWireValues(); + BitVector vector = (BitVector) am2900.getHighLevelState("mpm_address"); return vector.isBinary() ? vector.getUnsignedValueLong() : -1; }