X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FGUIram5_12.java;h=d1871f452f4132a8ea6e2a50c1655365f3c2a01c;hb=d07d97764c8f41ff26f76e59d4d2f1789c2bcc9e;hp=abc8355d11316dc0f5588e19c16fae6cf30fe871;hpb=30b24889d4ae001113c6cac543fb8c29d15d0ff2;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java
index abc8355d..d1871f45 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java
@@ -8,6 +8,8 @@ import static net.mograsim.logic.core.types.Bit.ZERO;
 
 import java.util.Arrays;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
@@ -83,6 +85,32 @@ public class GUIram5_12 extends SimpleRectangularHardcodedGUIComponent
 		return (bits[0] == ONE ? 4 : 0) + (bits[1] == ONE ? 2 : 0) + (bits[2] == ONE ? 1 : 0);
 	}
 
+	Pattern stateIDPattern = Pattern.compile("c(0[10][10]|100)");
+
+	@Override
+	protected Object getHighLevelState(Object state, String stateID)
+	{
+		Matcher m = stateIDPattern.matcher(stateID);
+		if (m.matches())
+			return ((BitVector[]) state)[Integer.parseInt(m.group(1), 2)];
+		return super.getHighLevelState(state, stateID);
+	}
+
+	@Override
+	protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState)
+	{
+		Matcher m = stateIDPattern.matcher(stateID);
+		if (m.matches())
+		{
+			int addr = Integer.parseInt(m.group(1), 2);
+			BitVector newHighLevelStateCasted = (BitVector) newHighLevelState;
+			if (newHighLevelStateCasted.length() != 12)
+				throw new IllegalArgumentException("Expected BitVector of length 12, not " + newHighLevelStateCasted.length());
+			return ((BitVector[]) lastState)[addr] = newHighLevelStateCasted;
+		}
+		return super.setHighLevelState(lastState, stateID, newHighLevelState);
+	}
+
 	static
 	{
 		IndirectGUIComponentCreator.setComponentSupplier(GUIram5_12.class.getCanonicalName(), (m, p, n) -> new GUIram5_12(m, n));