X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2Fparameters%2FMnemonicFamily.java;h=b9c137381ec05734bafabb1608cb29c6ffeb1695;hb=a8c93edad3e4fc0651e2d18734ef189c376539a9;hp=aa07f80896ef972bfd47974386255d11755df081;hpb=5e4efdd581f04578be5f59e591f4bcf746df44d8;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 aa07f808..b9c13738 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
@@ -4,34 +4,55 @@ import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.machine.mi.parameters.MicroInstructionParameter.ParameterType;
 
 public class MnemonicFamily implements ParameterClassification
 {
 	private final Mnemonic[] values;
+	private final String[] stringValues;
 	private final Map<String, Mnemonic> byText;
-	private final int vectorLenght;
+	private final int vectorLength;
 	
-	public MnemonicFamily(Mnemonic... values)
+	public MnemonicFamily(MnemonicPair... values)
 	{
-		this.values = values;
+		this.values = new Mnemonic[values.length];
+		this.stringValues = new String[values.length];
+		
+		for(int i = 0; i < values.length; i++)
+		{
+			this.values[i] = createMnemonic(values[i], i);
+			this.stringValues[i] = values[i].name;
+		}
 		if(values.length == 0)
-			vectorLenght = 0;
+			vectorLength = 0;
 		else
 		{
-			vectorLenght = values[0].getValue().width();
+			vectorLength = values[0].value.length();
 			for(int i = 1; i < values.length; i++)
-				if(values[i].getValue().width() != vectorLenght)
+				if(values[i].value.length() != vectorLength)
 					throw new IllegalArgumentException("MnemonicFamily is not of uniform vector length!");
 		}
-		byText = Arrays.stream(values).collect(Collectors.toMap(m -> m.getText(), m -> m));
+		byText = Arrays.stream(this.values).collect(Collectors.toMap(m -> m.getText(), m -> m));
+		if(values.length != byText.keySet().size())
+			throw new IllegalArgumentException("MnemonicFamily contains multiple Mnemonics with the same name!");
 	}
 	
-	public Mnemonic[] getValues()
+	private Mnemonic createMnemonic(MnemonicPair mnemonicPair, int ordinal)
+	{
+		return new Mnemonic(mnemonicPair.name, mnemonicPair.value, this, ordinal);
+	}
+
+	public Mnemonic[] values()
 	{
 		return values.clone();
 	}
 	
+	public Mnemonic get(int ordinal)
+	{
+		return values[ordinal];
+	}
+	
 	public Mnemonic get(String text)
 	{
 		return byText.get(text);
@@ -40,11 +61,16 @@ public class MnemonicFamily implements ParameterClassification
 	public boolean contains(Mnemonic m)
 	{
 		if(m != null)
-			return m.equals(byText.get(m.getText()));
+			return m.owner == this;
 		else
 			return false;
 	}
 	
+	public boolean contains(String value)
+	{
+		return byText.keySet().contains(value);
+	}
+	
 	public int size()
 	{
 		return values.length;
@@ -52,13 +78,13 @@ public class MnemonicFamily implements ParameterClassification
 	
 	public int getVectorLength()
 	{
-		return vectorLenght;
+		return vectorLength;
 	}
 
 	@Override
 	public boolean conforms(MicroInstructionParameter param)
 	{
-		return param instanceof Mnemonic ? contains((Mnemonic) param) : false;
+		return ParameterClassification.super.conforms(param) && (param instanceof Mnemonic ? contains((Mnemonic) param) : false);
 	}
 
 	@Override
@@ -66,4 +92,46 @@ public class MnemonicFamily implements ParameterClassification
 	{
 		return ParameterType.MNEMONIC;
 	}
+
+	@Override
+	public int getExpectedBits()
+	{
+		return vectorLength;
+	}
+
+	public String[] getStringValues()
+	{
+		return stringValues.clone();
+	}
+	
+	
+	
+	@Override
+	public int hashCode()
+	{
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + Arrays.hashCode(values);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj)
+	{
+		return this == obj;
+	}
+
+
+
+	public static class MnemonicPair
+	{
+		public final String name;
+		public final BitVector value;
+		
+		public MnemonicPair(String name, BitVector value)
+		{
+			this.name = name;
+			this.value = value;
+		}
+	}
 }