Merge branch 'development' of

https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
	net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java

diff --cc net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
index 62785be,3724a42..3deccb0
--- 1/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
--- 2/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
@@@ -16,12 -16,12 +16,12 @@@ public class MnemonicFamily implements 
        {
                this.values = values;
                if(values.length == 0)
 -                      vectorLenght = 0;
 +                      vectorLength = 0;
                else
                {
-                       vectorLength = values[0].getValue().width();
 -                      vectorLenght = values[0].getValue().length();
++                      vectorLength = values[0].getValue().length();
                        for(int i = 1; i < values.length; i++)
-                               if(values[i].getValue().width() != vectorLength)
 -                              if(values[i].getValue().length() != vectorLenght)
++                              if(values[i].getValue().length() != vectorLength)
                                        throw new IllegalArgumentException("MnemonicFamily is not of uniform vector length!");
                }
                byText = Arrays.stream(values).collect(Collectors.toMap(m -> m.getText(), m -> m));

diff --cc net.mograsim.machine/src/net/mograsim/machine/mi/parameters/ParameterClassification.java
index f98def9,b9362a0..3b3f1a2
--- 1/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/ParameterClassification.java
--- 2/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/ParameterClassification.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/mi/parameters/ParameterClassification.java
@@@ -8,10 -8,7 +8,10 @@@ public interface ParameterClassificatio
         * Determines whether a {@link MicroInstructionParameter} is part of this class of parameters.
         * @return true if the classification contains the Parameter, false otherwise
         */
 -      public boolean conforms(MicroInstructionParameter param);
 +      public default boolean conforms(MicroInstructionParameter param)
 +      {
-               return param.getType().equals(getExpectedType()) && param.getValue().width() == getExpectedBits();
++              return param.getType().equals(getExpectedType()) && param.getValue().length() == getExpectedBits();
 +      }
        
        /**
         * @return The type of the parameters in this classification.