X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FModelWordAddressableMemory.java;h=a1112e68f6741c748a145f338ede9b0c0a708aae;hb=f098cd47d06be0cc654532a5fad0e5e89f0ef93c;hp=7490b361f0cfe714c66cb6876fe5eaf4b209e0d1;hpb=5babdd65b463ea8f33a950c2a8d4732417d2df18;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 7490b361..a1112e68 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
@@ -1,9 +1,15 @@
 package net.mograsim.machine.standard.memory;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
 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.logic.model.modeladapter.LogicCoreAdapter;
+import net.mograsim.logic.model.serializing.IdentifyParams;
+import net.mograsim.logic.model.snippets.HighLevelStateHandler;
 import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.MainMemoryDefinition;
 import net.mograsim.machine.ModelMemory;
@@ -14,6 +20,8 @@ public abstract class ModelWordAddressableMemory extends ModelMemory
 	private CoreWordAddressableMemory memory;
 	private MainMemoryDefinition definition;
 
+	private final List<Consumer<Object>> memoryBindingListeners;
+
 	public ModelWordAddressableMemory(LogicModelModifiable model, MainMemoryDefinition definition, String name)
 	{
 		super(model, 120, 150, name, "RAM", false);
@@ -23,6 +31,60 @@ public abstract class ModelWordAddressableMemory extends ModelMemory
 		addPin(dataPin = new Pin(model, this, "D", definition.getCellWidth(), PinUsage.TRISTATE, getWidth(), 50));
 		addPin(rWPin = new Pin(model, this, "RW", 1, PinUsage.INPUT, getWidth(), 70));
 
+		memoryBindingListeners = new ArrayList<>();
+
+		setHighLevelStateHandler(new HighLevelStateHandler()
+		{
+			@Override
+			public Object get(String stateID)
+			{
+				if (stateID.equals("memory_binding"))
+					return memory.getMemory();
+				throw new IllegalArgumentException("No high level state with ID " + stateID);
+			}
+
+			@Override
+			public void set(String stateID, Object newState)
+			{
+				if (stateID.equals("memory_binding"))
+				{
+					memory.setMemory((MainMemory) newState);
+					memoryBindingListeners.forEach(l -> l.accept(newState));
+				} else
+					throw new IllegalArgumentException("No high level state with ID " + stateID);
+			}
+
+			@Override
+			public void addListener(String stateID, Consumer<Object> stateChanged)
+			{
+				if (stateID.equals("memory_binding"))
+					memoryBindingListeners.add(stateChanged);
+				else
+					throw new IllegalArgumentException("No high level state with ID " + stateID);
+			}
+
+			@Override
+			public void removeListener(String stateID, Consumer<Object> stateChanged)
+			{
+				if (stateID.equals("memory_binding"))
+					memoryBindingListeners.remove(stateChanged);
+				else
+					throw new IllegalArgumentException("No high level state with ID " + stateID);
+			}
+
+			@Override
+			public String getIDForSerializing(IdentifyParams idParams)
+			{
+				return null;
+			}
+
+			@Override
+			public Object getParamsForSerializing(IdentifyParams idParams)
+			{
+				return null;
+			}
+		});
+
 		init();
 	}
 
@@ -56,23 +118,6 @@ public abstract class ModelWordAddressableMemory extends ModelMemory
 		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());