X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2Fparameters%2FMnemonicFamily.java;h=54c275b445de20bd7c556e5b38eed2189f46d527;hb=c9d1646a7969181829b65dabb5db89ea7a2da69d;hp=a513b60a530f8f8a6305ed89b17cb9a83d26a9a1;hpb=7958e659b3ea9aac43c1a67a0b2921c5323e4c84;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java b/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
index a513b60a..54c275b4 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
@@ -11,14 +11,67 @@ public class MnemonicFamily implements ParameterClassification
 {
 	private final Mnemonic[] values;
 	private final String[] stringValues;
-	private final Map<String, Mnemonic> byText;
-	private final int vectorLength;
+	private Map<String, Mnemonic> byText;
+	private int vectorLength;
+	
+	public MnemonicFamily(String... names)
+	{
+		this.values = new Mnemonic[names.length];
+		this.stringValues = new String[names.length];
+		BitVector[] values = new BitVector[names.length];
+		int bits = (int) Math.ceil(Math.log(names.length));
+		for(int i = 0; i < names.length; i++)
+		{
+			values[i] = BitVector.from(i, bits);
+		}
+		
+		setup(names, values);
+	}
+	
+	public MnemonicFamily(String[] names, long[] values, int bits)
+	{
+		if(names.length != values.length)
+			throw new IllegalArgumentException();
+		this.values = new Mnemonic[values.length];
+		this.stringValues = new String[values.length];
+		BitVector[] vectors = new BitVector[values.length];
+		
+		for(int i = 0; i < vectors.length; i++)
+		{
+			vectors[i] = BitVector.from(values[i], bits);
+		}
+		
+		setup(names, vectors);
+	}
+	
+	public MnemonicFamily(String[] names, BitVector[] values)
+	{
+		if(names.length != values.length)
+			throw new IllegalArgumentException();
+		this.values = new Mnemonic[values.length];
+		this.stringValues = new String[values.length];
+		
+		setup(names, values);
+	}
 	
 	public MnemonicFamily(MnemonicPair... values)
 	{
 		this.values = new Mnemonic[values.length];
 		this.stringValues = new String[values.length];
 		
+		setup(values);
+	}
+	
+	private void setup(String[] names, BitVector[] values)
+	{
+		MnemonicPair[] mnemonics = new MnemonicPair[values.length];
+		for(int i = 0; i < values.length; i++)
+			mnemonics[i] = new MnemonicPair(names[i], values[i]);
+		setup(mnemonics);
+	}
+	
+	private void setup(MnemonicPair[] values)
+	{
 		for(int i = 0; i < values.length; i++)
 		{
 			this.values[i] = createMnemonic(values[i], i);
@@ -37,7 +90,7 @@ public class MnemonicFamily implements ParameterClassification
 		if(values.length != byText.keySet().size())
 			throw new IllegalArgumentException("MnemonicFamily contains multiple Mnemonics with the same name!");
 	}
-	
+
 	private Mnemonic createMnemonic(MnemonicPair mnemonicPair, int ordinal)
 	{
 		return new Mnemonic(mnemonicPair.name, mnemonicPair.value, this, ordinal);