X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FModelWordAddressableMemory.java;fp=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FModelWordAddressableMemory.java;h=7490b361f0cfe714c66cb6876fe5eaf4b209e0d1;hb=5babdd65b463ea8f33a950c2a8d4732417d2df18;hp=986dbe5028f7b736696e2d91c789092853f8ef42;hpb=5d7d8cbfe74873cffa0682d66e8812b58c2b47f9;p=Mograsim.git

diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
index 986dbe50..7490b361 100644
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelWordAddressableMemory.java
@@ -3,11 +3,12 @@ package net.mograsim.machine.standard.memory;
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.model.wires.PinUsage;
-import net.mograsim.machine.Machine;
+import net.mograsim.logic.model.modeladapter.LogicCoreAdapter;
+import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.MainMemoryDefinition;
 import net.mograsim.machine.ModelMemory;
 
-public abstract class ModelWordAddressableMemory<M extends Machine> extends ModelMemory<M>
+public abstract class ModelWordAddressableMemory extends ModelMemory
 {
 	private final Pin addrPin, dataPin, rWPin;
 	private CoreWordAddressableMemory memory;
@@ -54,4 +55,26 @@ public abstract class ModelWordAddressableMemory<M extends Machine> extends Mode
 	{
 		return memory;
 	}
-}
+
+	@Override
+	public void setHighLevelState(String stateID, Object newState)
+	{
+		if (stateID.equals("memory_binding"))
+			memory.setMemory((MainMemory) newState);
+		else
+			super.setHighLevelState(stateID, newState);
+	}
+
+	@Override
+	public Object getHighLevelState(String stateID)
+	{
+		if (stateID.equals("memory_binding"))
+			return memory.getMemory();
+		return super.getHighLevelState(stateID);
+	}
+
+	static
+	{
+		LogicCoreAdapter.addComponentAdapter(new WordAddressableMemoryAdapter());
+	}
+}
\ No newline at end of file