X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FGUIAm2910SP.java;h=0e89cca1f249614fb96fa6a282da526a5dd763aa;hb=bfd483ea32de08383550ba6903f77c11c33ea36d;hp=a74706468a455fc35facb9dbf719fafc7dc8b055;hpb=30b24889d4ae001113c6cac543fb8c29d15d0ff2;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java
index a7470646..0e89cca1 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java
@@ -63,7 +63,7 @@ public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent
 			else if (STKI0Val == ONE && STKI1Val == ONE)
 				// POP
 				SP = SP <= 0 ? SP : SP - 1;
-		readWriteEnds.get("A").feedSignals(getAsBitVector(SP == 0 ? 7 : SP - 1));
+		readWriteEnds.get("A").feedSignals(getAsBitVector(SP == 0 ? 7 : SP < 0 ? SP : SP - 1));
 		readWriteEnds.get("B").feedSignals(getAsBitVector(SP == 5 ? 4 : SP));
 		readWriteEnds.get("_FULL").feedSignals(SP == -2 ? U : SP == -1 ? X : SP == 5 ? ZERO : ONE);
 
@@ -72,6 +72,41 @@ public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent
 		return SPC;
 	}
 
+	@Override
+	protected Object getHighLevelState(Object state, String stateID)
+	{
+		switch (stateID)
+		{
+		case "q":
+			return getAsBitVector(((BitAndInt) state).i);
+		default:
+			return super.getHighLevelState(state, stateID);
+		}
+	}
+
+	@Override
+	protected Object setHighLevelState(Object lastState, String stateID, Object newHighLevelState)
+	{
+		switch (stateID)
+		{
+		case "q":
+			int i;
+			BitVector newHighLevelStateCasted = (BitVector) newHighLevelState;
+			if (newHighLevelStateCasted.length() != 3)
+				throw new IllegalArgumentException("Expected BitVector of length 3, not " + newHighLevelStateCasted.length());
+			if (newHighLevelStateCasted.isBinary())
+				i = newHighLevelStateCasted.getUnsignedValue().intValue();
+			else
+				i = -1;// this makes setting to U impossible
+			if (i > 5)
+				throw new IllegalArgumentException("Given value not in range (0-5 incl.): " + i);
+			((BitAndInt) lastState).i = i;
+			return lastState;
+		default:
+			return super.setHighLevelState(lastState, stateID, newHighLevelState);
+		}
+	}
+
 	private static class BitAndInt
 	{
 		Bit bit;
@@ -87,7 +122,6 @@ public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent
 			return BitVector.of(X, 3);
 		if (i == -2)
 			return BitVector.of(U, 3);
-		// TODO maybe this is the wrong way around
 		return BitVector.of((i & 0b100) > 0 ? ONE : ZERO, (i & 0b10) > 0 ? ONE : ZERO, (i & 0b1) > 0 ? ONE : ZERO);
 	}