X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=3d486f475afede941b764c2bb54b143f194d6e4c;hb=161ecd36b6dcfe0e38cee3fd6ea8ad42d0705777;hp=e48134f0aa57daa31ad91d3c3f113616b3b78272;hpb=13befb68923c540a13cfe5b5b28bf0f7ddf5c41b;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 e48134f0..3d486f47 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
@@ -16,20 +16,23 @@ 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.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.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
 {
@@ -39,6 +42,7 @@ public class Am2900Machine implements Machine
 	private Timeline timeline;
 	private AssignableMainMemory mainMemory;
 	private AssignableMicroInstructionMemory instMemory;
+	private AssignableMPROM mprom;
 	private CoreClock clock;
 	private long activeInstructionAddress;
 
@@ -52,16 +56,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.hardcodedComponentProcessTime = params.gateProcessTime * 5;
-		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;
+		CoreModelParameters 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 ->
 		{
@@ -177,6 +185,12 @@ public class Am2900Machine implements Machine
 		return instMemory;
 	}
 
+	@Override
+	public AssignableMPROM getMPROM()
+	{
+		return mprom;
+	}
+
 	@Override
 	public long getActiveMicroInstructionAddress()
 	{