Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / mi / MicroInstruction.java

diff --git a/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstruction.java b/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstruction.java
index 07a15d2..d45c277 100644 (file)
--- a/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstruction.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/mi/MicroInstruction.java
@@ -1,20 +1,32 @@
 package net.mograsim.machine.mi;
 
+import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.machine.mi.parameters.MicroInstructionParameter;
 import net.mograsim.machine.mi.parameters.Mnemonic;
 
-public interface MicroInstruction {
-       
+public interface MicroInstruction
+{
+
        public MicroInstructionParameter getParameter(int index);
+
        public void setParameter(int index, MicroInstructionParameter param);
-       
+
        /**
         * @return The amount of {@link Mnemonic}s, the instruction is composed of
         */
        public int getSize();
-       
-       public static MicroInstruction create(MicroInstructionParameter... parameters)
+
+       public static MicroInstruction create(Runnable updateCallback, MicroInstructionParameter... parameters)
+       {
+               return new StandardMicroInstruction(updateCallback, parameters);
+       }
+
+       default BitVector toBitVector()
        {
-               return new StandardMicroInstruction(parameters);
+               BitVector vector = BitVector.of();
+               int size = getSize();
+               for (int i = 0; i < size; i++)
+                       vector = vector.concat(getParameter(i).getValue());
+               return vector;
        }
 }