X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FGUIAm2910RegCntr.java;h=00635bf7e36e3eee06f7c83b8d6b89c2d5a3d394;hb=bfd483ea32de08383550ba6903f77c11c33ea36d;hp=29136425bb3f8a964bd29bade59f0eda272d8846;hpb=bbe38c55aaa999d025f534245f9207a88643f6e5;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
index 29136425..00635bf7 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java
@@ -8,6 +8,7 @@ import java.util.Arrays;
 import java.util.Map;
 
 import net.mograsim.logic.core.types.Bit;
+import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
@@ -32,7 +33,7 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent
 	}
 
 	@Override
-	protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
+	public Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
 	{
 		Bit[] QC = (Bit[]) lastState;
 		if (QC == null)
@@ -60,7 +61,6 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent
 			{
 				Bit carry = Bit.ZERO;
 				// TODO extract to helper. This code almost also exists in GUIinc12.
-				// TODO maybe invert loop direction
 				for (int i = 11; i >= 0; i--)
 				{
 					Bit a = QC[i];
@@ -75,6 +75,34 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent
 		return QC;
 	}
 
+	@Override
+	protected Object getHighLevelState(Object state, String stateID)
+	{
+		switch (stateID)
+		{
+		case "q":
+			return BitVector.of(Arrays.copyOfRange((Bit[]) state, 0, 12));
+		default:
+			return super.getHighLevelState(state, stateID);
+		}
+	}
+
+	@Override
+	protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState)
+	{
+		switch (stateID)
+		{
+		case "q":
+			BitVector newHighLevelStateCasted = (BitVector) newHighLevelState;
+			if (newHighLevelStateCasted.length() != 12)
+				throw new IllegalArgumentException("Expected BitVector of length 12, not " + newHighLevelStateCasted.length());
+			System.arraycopy(newHighLevelStateCasted.getBits(), 0, lastState, 0, 12);
+			return lastState;
+		default:
+			return super.setHighLevelState(lastState, stateID, newHighLevelState);
+		}
+	}
+
 	static
 	{
 		IndirectGUIComponentCreator.setComponentSupplier(GUIAm2910RegCntr.class.getCanonicalName(),