X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIram2.java;h=4892203e21b3ffac9322526a45daae71e4260be9;hb=01c5d7035474a5eb58f216b6831b2c0d8c174efa;hp=f94ca923a20d26e2ebc09f5ac2f985f9e4c2671d;hpb=b37ba7609a925cc945bbac0f6ead619d07912238;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram2.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram2.java
index f94ca923..4892203e 100644
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram2.java
+++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIram2.java
@@ -1,14 +1,20 @@
 package net.mograsim.logic.ui.model.components.mi.nandbased;
 
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
+import net.mograsim.logic.ui.model.components.submodels.SimpleRectangularSubmodelComponent;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
 
 public class GUIram2 extends SimpleRectangularSubmodelComponent
 {
+	private GUIdlatch4 cell00;
+	private GUIdlatch4 cell01;
+	private GUIdlatch4 cell10;
+	private GUIdlatch4 cell11;
+
 	public GUIram2(ViewModelModifiable model)
 	{
 		super(model, 1, "GUIram2");
@@ -43,10 +49,10 @@ public class GUIram2 extends SimpleRectangularSubmodelComponent
 		GUIdemux2   demuxA   = new GUIdemux2  (submodelModifiable);
 		GUIdemux2   demuxB   = new GUIdemux2  (submodelModifiable);
 		GUIand41    weAndB   = new GUIand41   (submodelModifiable);
-		GUIdlatch4  cell00   = new GUIdlatch4 (submodelModifiable);
-		GUIdlatch4  cell01   = new GUIdlatch4 (submodelModifiable);
-		GUIdlatch4  cell10   = new GUIdlatch4 (submodelModifiable);
-		GUIdlatch4  cell11   = new GUIdlatch4 (submodelModifiable);
+		cell00   = new GUIdlatch4 (submodelModifiable);
+		cell01   = new GUIdlatch4 (submodelModifiable);
+		cell10   = new GUIdlatch4 (submodelModifiable);
+		cell11   = new GUIdlatch4 (submodelModifiable);
 		GUIand41    andA00   = new GUIand41   (submodelModifiable);
 		GUIandor414 andorA01 = new GUIandor414(submodelModifiable);
 		GUIandor414 andorA10 = new GUIandor414(submodelModifiable);
@@ -271,5 +277,46 @@ public class GUIram2 extends SimpleRectangularSubmodelComponent
 		new GUIWire(submodelModifiable, andorB11.getPin("Y3"), QB3                           , new Point(180, 760), new Point(180, 890), new Point(335, 890), new Point(335, 650));
 		new GUIWire(submodelModifiable, andorB11.getPin("Y4"), QB4                           , new Point(175, 770), new Point(175, 895), new Point(340, 895), new Point(340, 750));
 		//@formatter:on
+
+		addHighLevelStateSubcomponentID("c00", cell00);
+		addHighLevelStateSubcomponentID("c01", cell01);
+		addHighLevelStateSubcomponentID("c10", cell10);
+		addHighLevelStateSubcomponentID("c11", cell11);
+		addAtomicHighLevelStateID("q");
+	}
+
+	@Override
+	public void setAtomicHighLevelState(String stateID, Object newState)
+	{
+		switch (stateID)
+		{
+		case "q":
+			BitVector newStateCasted = (BitVector) newState;
+			setHighLevelState("c00.q", newStateCasted.subVector(0, 4));
+			setHighLevelState("c01.q", newStateCasted.subVector(4, 8));
+			setHighLevelState("c10.q", newStateCasted.subVector(8, 12));
+			setHighLevelState("c11.q", newStateCasted.subVector(12, 16));
+			break;
+		default:
+			// should not happen because we tell SubmodelComponent to only allow these state IDs.
+			throw new IllegalStateException("Illegal atomic state ID: " + stateID);
+		}
+	}
+
+	@Override
+	public Object getAtomicHighLevelState(String stateID)
+	{
+		switch (stateID)
+		{
+		case "q":
+			BitVector q00 = (BitVector) getHighLevelState("c00.q");
+			BitVector q01 = (BitVector) getHighLevelState("c01.q");
+			BitVector q10 = (BitVector) getHighLevelState("c10.q");
+			BitVector q11 = (BitVector) getHighLevelState("c11.q");
+			return q00.concat(q01).concat(q10).concat(q11);
+		default:
+			// should not happen because we tell SubmodelComponent to only allow these state IDs.
+			throw new IllegalStateException("Illegal atomic state ID: " + stateID);
+		}
 	}
 }
\ No newline at end of file