From 5c98e2c9bb53deaed767a1761840c15a0418d12e Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 7 Oct 2020 22:36:05 +0200 Subject: [PATCH] Introduced Machine.getCoreModelParameters --- .../logic/model/am2900/machine/Am2900Machine.java | 9 ++++++++- .../src/net/mograsim/machine/Machine.java | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 3d486f47..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 @@ -40,6 +40,7 @@ public class Am2900Machine implements Machine private LogicModelModifiable logicModel; private ModelComponent am2900; private Timeline timeline; + private CoreModelParameters params; private AssignableMainMemory mainMemory; private AssignableMicroInstructionMemory instMemory; private AssignableMPROM mprom; @@ -60,7 +61,7 @@ public class Am2900Machine implements Machine paramsBuilder.gateProcessTime = 50; paramsBuilder.hardcodedComponentProcessTime = paramsBuilder.gateProcessTime * 5; paramsBuilder.wireTravelTime = 10; - CoreModelParameters params = paramsBuilder.build(); + params = paramsBuilder.build(); mainMemory = new AssignableMainMemory(new StandardMainMemory(am2900MachineDefinition.getMainMemoryDefinition())); instMemory = new AssignableMicroInstructionMemory( @@ -136,6 +137,12 @@ public class Am2900Machine implements Machine return timeline; } + @Override + public CoreModelParameters getCoreModelParameters() + { + return params; + } + @Override public CoreClock getClock() { diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java index 115973f9..6c3c9cc4 100644 --- a/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java +++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/Machine.java @@ -6,6 +6,7 @@ import net.mograsim.logic.core.components.CoreClock; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.model.LogicModel; +import net.mograsim.logic.model.modeladapter.CoreModelParameters; import net.mograsim.machine.mi.AssignableMPROM; import net.mograsim.machine.mi.AssignableMicroInstructionMemory; import net.mograsim.machine.registers.Register; @@ -31,6 +32,8 @@ public interface Machine Timeline getTimeline(); + public CoreModelParameters getCoreModelParameters(); + AssignableMainMemory getMainMemory(); AssignableMicroInstructionMemory getMicroInstructionMemory(); -- 2.17.1