X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fsnippets%2Fhighlevelstatehandlers%2Fstandard%2Fatomic%2FBitVectorSplittingAtomicHighLevelStateHandler.java;h=dd7af34e969c2fdc528d742fa5032a0d7f860775;hb=a25f554756e1bc9a1f842293aefe60a220d8b950;hp=4b1139beeaf02bdadde4643cb09350df458f94f0;hpb=c310e267d7c8a1003d21c9bbae02b9186a95cd10;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
index 4b1139be..dd7af34e 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
@@ -3,9 +3,13 @@ package net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic
 import java.util.ArrayList;
 import java.util.List;
 
+import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.snippets.SnippetDefinintion;
 import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.HighLevelStateHandlerContext;
+import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandlerSnippetSuppliers;
 
 public class BitVectorSplittingAtomicHighLevelStateHandler implements AtomicHighLevelStateHandler
 {
@@ -60,11 +64,16 @@ public class BitVectorSplittingAtomicHighLevelStateHandler implements AtomicHigh
 		BitVector result = BitVector.of();
 		for (int partIndex = 0; partIndex < vectorPartTargets.size(); partIndex++)
 		{
-			BitVector vectorPart = (BitVector) component.getHighLevelState(vectorPartTargets.get(partIndex));
+			Object subStateUncasted = component.getHighLevelState(vectorPartTargets.get(partIndex));
+			BitVector vectorPart;
+			if (subStateUncasted instanceof Bit)
+				vectorPart = BitVector.of((Bit) subStateUncasted);
+			else
+				vectorPart = (BitVector) subStateUncasted;
 			if (vectorPart.length() != vectorPartLengthes.get(partIndex))
 				throw new IllegalArgumentException(
 						"Illegal vector part length: " + vectorPart.length() + "; expected " + vectorPartLengthes.get(partIndex));
-			result = result.concat(vectorPart);// TODO is the bit order correct?
+			result = vectorPart.concat(result);
 		}
 		return result;
 	}
@@ -73,18 +82,34 @@ public class BitVectorSplittingAtomicHighLevelStateHandler implements AtomicHigh
 	public void setHighLevelState(Object newState)
 	{
 		BitVector newStateCasted = (BitVector) newState;
-		for (int partIndex = 0, bitIndex = 0; partIndex < vectorPartTargets.size(); partIndex++)
+		for (int partIndex = vectorPartTargets.size() - 1, bitIndex = 0; partIndex >= 0; partIndex--)
 		{
 			int vectorPartLength = vectorPartLengthes.get(partIndex);
-			BitVector vectorPart = newStateCasted.subVector(bitIndex, vectorPartLength);// TODO is the bit order correct?
+			BitVector vectorPart = newStateCasted.subVector(bitIndex, bitIndex + vectorPartLength);
 			component.setHighLevelState(vectorPartTargets.get(partIndex), vectorPart);
 			bitIndex += vectorPartLength;
 		}
 	}
 
+	@Override
+	public BitVectorSplittingAtomicHighLevelStateHandlerParams getParamsForSerializing(IdentifierGetter idGetter)
+	{
+		BitVectorSplittingAtomicHighLevelStateHandlerParams params = new BitVectorSplittingAtomicHighLevelStateHandlerParams();
+		params.vectorPartTargets = new ArrayList<>(vectorPartTargets);
+		params.vectorPartLengthes = new ArrayList<>(vectorPartLengthes);
+		return params;
+	}
+
 	public static class BitVectorSplittingAtomicHighLevelStateHandlerParams
 	{
 		public List<String> vectorPartTargets;
 		public List<Integer> vectorPartLengthes;
 	}
+
+	static
+	{
+		StandardHighLevelStateHandlerSnippetSuppliers.atomicHandlerSupplier
+				.setSnippetSupplier(BitVectorSplittingAtomicHighLevelStateHandler.class.getCanonicalName(), SnippetDefinintion.create(
+						BitVectorSplittingAtomicHighLevelStateHandlerParams.class, BitVectorSplittingAtomicHighLevelStateHandler::new));
+	}
 }
\ No newline at end of file