X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FGUIdff4_finewe.java;h=dec8f6307c27d5fd082a1d06411e601ce386441f;hb=6148b4aacb504eee498efab5c8657a24f9de2a64;hp=758a9450058ae1c0669e1e81a495a8c344248fb1;hpb=d4e7fabad51c0334ef1776564c87da38ab3c2089;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java
index 758a9450..dec8f630 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java
@@ -6,14 +6,17 @@ import static net.mograsim.logic.core.types.Bit.X;
 import static net.mograsim.logic.core.types.Bit.Z;
 import static net.mograsim.logic.core.types.Bit.ZERO;
 
+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;
 import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
 
@@ -22,25 +25,24 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent
 	public GUIdff4_finewe(ViewModelModifiable model, String name)
 	{
 		super(model, name, "D flip flop\n4 bits");
-		setSize(35, 100);
-		addPin(new Pin(this, "C", 1, 0, 5), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE1", 1, 0, 15), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE2", 1, 0, 25), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE3", 1, 0, 35), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE4", 1, 0, 45), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "_WE", 1, 0, 55), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D1", 1, 0, 65), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D2", 1, 0, 75), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D3", 1, 0, 85), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "D4", 1, 0, 95), Usage.INPUT, Position.RIGHT);
-		addPin(new Pin(this, "Q1", 1, 35, 5), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "Q2", 1, 35, 15), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "Q3", 1, 35, 25), Usage.OUTPUT, Position.LEFT);
-		addPin(new Pin(this, "Q4", 1, 35, 35), Usage.OUTPUT, Position.LEFT);
+		setSize(35, 90);
+		addPin(new Pin(this, "C", 1, PinUsage.INPUT, 0, 5), Position.RIGHT);
+		addPin(new Pin(this, "_WE1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT);
+		addPin(new Pin(this, "_WE2", 1, PinUsage.INPUT, 0, 25), Position.RIGHT);
+		addPin(new Pin(this, "_WE3", 1, PinUsage.INPUT, 0, 35), Position.RIGHT);
+		addPin(new Pin(this, "_WE4", 1, PinUsage.INPUT, 0, 45), Position.RIGHT);
+		addPin(new Pin(this, "D1", 1, PinUsage.INPUT, 0, 55), Position.RIGHT);
+		addPin(new Pin(this, "D2", 1, PinUsage.INPUT, 0, 65), Position.RIGHT);
+		addPin(new Pin(this, "D3", 1, PinUsage.INPUT, 0, 75), Position.RIGHT);
+		addPin(new Pin(this, "D4", 1, PinUsage.INPUT, 0, 85), Position.RIGHT);
+		addPin(new Pin(this, "Q1", 1, PinUsage.OUTPUT, 35, 5), Position.LEFT);
+		addPin(new Pin(this, "Q2", 1, PinUsage.OUTPUT, 35, 15), Position.LEFT);
+		addPin(new Pin(this, "Q3", 1, PinUsage.OUTPUT, 35, 25), Position.LEFT);
+		addPin(new Pin(this, "Q4", 1, PinUsage.OUTPUT, 35, 35), Position.LEFT);
 	}
 
 	@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)
@@ -48,7 +50,7 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent
 
 		Bit CVal = readEnds.get("C").getValue();
 
-		if (QC[0] == ZERO && CVal == ONE && readEnds.get("_WE").getValue() == ZERO)
+		if (QC[0] == ZERO && CVal == ONE)
 			for (int i = 1; i < 5; i++)
 			{
 				Bit WEiVal = readEnds.get("_WE" + i).getValue();
@@ -70,6 +72,34 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent
 		return QC;
 	}
 
+	@Override
+	protected Object getHighLevelState(Object state, String stateID)
+	{
+		switch (stateID)
+		{
+		case "q":
+			return BitVector.of(Arrays.copyOfRange((Bit[]) state, 1, 5));
+		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() != 4)
+				throw new IllegalArgumentException("Expected BitVector of length 4, not " + newHighLevelStateCasted.length());
+			System.arraycopy(newHighLevelStateCasted.getBits(), 0, lastState, 1, 4);
+			return lastState;
+		default:
+			return super.setHighLevelState(lastState, stateID, newHighLevelState);
+		}
+	}
+
 	static
 	{
 		IndirectGUIComponentCreator.setComponentSupplier(GUIdff4_finewe.class.getCanonicalName(), (m, p, n) -> new GUIdff4_finewe(m, n));