X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVector.java;h=18b2d953054b34860ed21b61c68ccdc0cd4f4b5d;hb=0457df6e156a2d6dddf8cc5af4caf6c041db7e80;hp=cce83f43330a9231ee8a37f1bbcf301784430fe0;hpb=47ea68ed5c444dd14864412639f6a6fd60ab8a0f;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
index cce83f43..18b2d953 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVector.java
@@ -2,6 +2,7 @@ package net.mograsim.logic.core.types;
 
 import static java.lang.String.format;
 
+import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -18,8 +19,22 @@ import java.util.function.UnaryOperator;
  */
 public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit>, RandomAccess
 {
+	public static final BitVector SINGLE_U = new BitVector(Bit.U);
+	public static final BitVector SINGLE_X = new BitVector(Bit.X);
+	public static final BitVector SINGLE_0 = new BitVector(Bit.ZERO);
+	public static final BitVector SINGLE_1 = new BitVector(Bit.ONE);
+	public static final BitVector SINGLE_Z = new BitVector(Bit.Z);
+
+	private static final BitVector[] SINGLE_BIT_MAPPING = { SINGLE_U, SINGLE_X, SINGLE_0, SINGLE_1, SINGLE_Z };
+
 	private final Bit[] bits;
 
+	private BitVector(Bit single)
+	{
+		Objects.requireNonNull(single);
+		bits = new Bit[] { single };
+	}
+
 	private BitVector(Bit[] bits)
 	{
 		this.bits = Objects.requireNonNull(bits); // do this first to "catch" bits==null before the foreach loop
@@ -30,11 +45,15 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 
 	public static BitVector of(Bit... bits)
 	{
+		if (bits.length == 1)
+			return SINGLE_BIT_MAPPING[bits[0].ordinal()];
 		return new BitVector(bits.clone());
 	}
 
 	public static BitVector of(Bit bit, int length)
 	{
+		if (length == 1)
+			return SINGLE_BIT_MAPPING[bit.ordinal()];
 		return new BitVector(bit.makeArray(length));
 	}
 
@@ -68,6 +87,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	public BitVector join(BitVector t)
 	{
 		checkCompatibility(t);
+		if (bits.length == 1)
+			return SINGLE_BIT_MAPPING[bits[0].join(t.bits[0]).ordinal()];
 		return new BitVector(binOp(bits.clone(), t.bits, Bit::join));
 	}
 
@@ -75,6 +96,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	public BitVector and(BitVector t)
 	{
 		checkCompatibility(t);
+		if (bits.length == 1)
+			return SINGLE_BIT_MAPPING[bits[0].and(t.bits[0]).ordinal()];
 		return new BitVector(binOp(bits.clone(), t.bits, Bit::and));
 	}
 
@@ -82,6 +105,8 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	public BitVector or(BitVector t)
 	{
 		checkCompatibility(t);
+		if (bits.length == 1)
+			return SINGLE_BIT_MAPPING[bits[0].or(t.bits[0]).ordinal()];
 		return new BitVector(binOp(bits.clone(), t.bits, Bit::or));
 	}
 
@@ -89,12 +114,16 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 	public BitVector xor(BitVector t)
 	{
 		checkCompatibility(t);
+		if (bits.length == 1)
+			return SINGLE_BIT_MAPPING[bits[0].xor(t.bits[0]).ordinal()];
 		return new BitVector(binOp(bits.clone(), t.bits, Bit::xor));
 	}
 
 	@Override
 	public BitVector not()
 	{
+		if (bits.length == 1)
+			return SINGLE_BIT_MAPPING[bits[0].not().ordinal()];
 		return new BitVector(unOp(bits.clone(), Bit::not));
 	}
 
@@ -347,6 +376,21 @@ public final class BitVector implements StrictLogicType<BitVector>, Iterable<Bit
 		return new BitVector(values);
 	}
 
+	public static BitVector of(long value, int bits)
+	{
+		return of(BigInteger.valueOf(value), bits);
+	}
+
+	public static BitVector of(BigInteger value, int bits)
+	{
+		Bit[] values = new Bit[bits];
+		for (int i = 0; i < bits; i++)
+		{
+			values[bits - i - 1] = Bit.of(value.testBit(i));
+		}
+		return new BitVector(values);
+	}
+
 	/**
 	 * Iterate over the {@link Bit}s of the BitVector <b>from MSB to LSB</b> (left to right).
 	 */