From 5d688812b8a5c62e7b3b47464be463266f066f94 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 15 Jul 2019 19:10:58 +0200 Subject: [PATCH] BitVectorSplittingAtomicHighLevelStateHandler now supports Bits --- .../BitVectorSplittingAtomicHighLevelStateHandler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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..c4a56b0c 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,6 +3,7 @@ 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.snippets.highlevelstatehandlers.standard.HighLevelStateHandlerContext; @@ -60,7 +61,12 @@ 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)); -- 2.17.1