X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAm2900Machine.java;h=5aa348ca37b76e09f8d34d939b57dfaf1cfae1f8;hb=fa5e3151a923b6cb6120f62436e24ac103a9290c;hp=f8abe44387f2a725cd9e7dbcb7e6eef2846801dc;hpb=45942cbbb4b10a99cef716c56fe14642f7c45722;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
index f8abe443..5aa348ca 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
@@ -1,34 +1,45 @@
 package net.mograsim.logic.model.am2900.machine;
 
-import net.mograsim.logic.core.components.Clock;
+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.ViewModel;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.modeladapter.LogicModelParameters;
-import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
-import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.model.LogicModel;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.model.components.atomic.ModelClock;
+import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch;
+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.MicroInstructionMemory;
+import net.mograsim.machine.mi.StandardMicroInstructionMemory;
+import net.mograsim.machine.standard.memory.WordAddressableMemory;
 
 public class Am2900Machine implements Machine
 {
 	private Am2900MachineDefinition machineDefinition;
-	private ViewModelModifiable viewModel;
+	private LogicModelModifiable logicModel;
 	private Timeline timeline;
-	private Clock clock;
+	private MainMemory mainMemory;
+	private MicroInstructionMemory instMemory;
+	private CoreClock clock;
 
 	public Am2900Machine(Am2900MachineDefinition am2900MachineDefinition)
 	{
 		this.machineDefinition = am2900MachineDefinition;
-		viewModel = new ViewModelModifiable();
-		IndirectGUIComponentCreator.createComponent(viewModel,
-				"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIAm2900.json");
-		LogicModelParameters params = new LogicModelParameters();
+		logicModel = new LogicModelModifiable();
+		IndirectModelComponentCreator.createComponent(logicModel,
+				"resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/Am2900.json", "Am2900");
+		CoreModelParameters params = new CoreModelParameters();
 		params.gateProcessTime = 50;
 		params.wireTravelTime = 10;
-		timeline = ViewLogicModelAdapter.convert(viewModel, params);
+		mainMemory = new WordAddressableMemory(am2900MachineDefinition.getMainMemoryDefinition());
+		instMemory = new StandardMicroInstructionMemory(am2900MachineDefinition.getMicroInstructionMemoryDefinition());
+		timeline = LogicCoreAdapter.convert(logicModel, params);
+		logicModel.getComponentByPath("Am2900.@c", ModelManualSwitch.class).getManualSwitch();
 	}
 
 	@Override
@@ -45,9 +56,9 @@ public class Am2900Machine implements Machine
 	}
 
 	@Override
-	public ViewModel getModel()
+	public LogicModel getModel()
 	{
-		return viewModel;
+		return logicModel;
 	}
 
 	@Override
@@ -57,7 +68,7 @@ public class Am2900Machine implements Machine
 	}
 
 	@Override
-	public Clock getClock()
+	public CoreClock getClock()
 	{
 		return clock;
 	}
@@ -76,4 +87,16 @@ public class Am2900Machine implements Machine
 
 	}
 
+	@Override
+	public MainMemory getMainMemory()
+	{
+		return mainMemory;
+	}
+
+	@Override
+	public MicroInstructionMemory getMicroInstructionMemory()
+	{
+		return instMemory;
+	}
+
 }