X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fmi%2FMicroInstructionDefinition.java;h=6625fa666464f5bd235b42800634994a13d2936b;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=229c761f74283013bc211de243ead48e1bca6095;hpb=259c5b8d38b6ed641fd9b5d78fe20969c67015dc;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionDefinition.java b/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionDefinition.java
index 229c761f..6625fa66 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionDefinition.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstructionDefinition.java
@@ -1,13 +1,11 @@
 package net.mograsim.machine.mi;
 
-import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Optional;
 
-import net.mograsim.machine.mi.parameters.IntegerClassification;
-import net.mograsim.machine.mi.parameters.IntegerImmediate;
+import net.mograsim.logic.core.types.Bit;
 import net.mograsim.machine.mi.parameters.MicroInstructionParameter;
-import net.mograsim.machine.mi.parameters.MnemonicFamily;
 import net.mograsim.machine.mi.parameters.ParameterClassification;
-import net.mograsim.machine.mi.parameters.MicroInstructionParameter.ParameterType;
 
 public interface MicroInstructionDefinition
 {
@@ -15,13 +13,12 @@ public interface MicroInstructionDefinition
 	 * @return The {@link ParameterClassification}s of which a MicroInstruction is composed.
 	 */
 	public ParameterClassification[] getParameterClassifications();
-	
+
 	/**
 	 * @throws IndexOutOfBoundsException
 	 */
 	public ParameterClassification getParameterClassification(int index);
-	
-	
+
 	/**
 	 * @return The amount of {@link MicroInstructionParameter}s in a {@link MicroInstruction} that follows this definition.
 	 */
@@ -29,36 +26,27 @@ public interface MicroInstructionDefinition
 	{
 		return getParameterClassifications().length;
 	}
-	
-	public default MicroInstruction createDefaultInstruction()
+
+	/**
+	 * @return The amount of {@link Bit}s in a {@link MicroInstruction} that follows this definition.
+	 */
+	public default int sizeInBits()
+	{
+		return Arrays.stream(getParameterClassifications()).mapToInt(e -> e.getExpectedBits()).reduce(0, (a, b) -> a + b);
+	}
+
+	public default MicroInstruction createDefaultInstruction(Runnable updateCallback)
 	{
 		int size = size();
 		MicroInstructionParameter[] params = new MicroInstructionParameter[size];
 		ParameterClassification[] classes = getParameterClassifications();
-		for(int i = 0; i < size; i++)
+		for (int i = 0; i < size; i++)
 		{
-			MicroInstructionParameter newParam;
 			ParameterClassification classification = classes[i];
-			ParameterType type = classification.getExpectedType();
-			switch(type)
-			{
-			case BOOLEAN_IMMEDIATE:
-			case MNEMONIC:
-				newParam = ((MnemonicFamily) classification).get(0);
-				break;
-			case INTEGER_IMMEDIATE:
-				newParam = new IntegerImmediate(BigInteger.valueOf(0), ((IntegerClassification) classification).getExpectedBits());
-				break;
-			default:
-				throw new IllegalStateException("Unknown ParameterType " + type);
-			}
-			params[i] = newParam;
+			params[i] = classification.getDefault();
 		}
-		return new StandardMicroInstruction(params);
-	}
-	
-	public static MicroInstructionDefinition create(ParameterClassification... classes)
-	{
-		return new StandardMicroInstructionDefinition(classes);
+		return new StandardMicroInstruction(updateCallback, params);
 	}
+
+	public Optional<String> getParameterDescription(int index);
 }
\ No newline at end of file