Integrated new types, tests still work, not used yet

[Mograsim.git] / era.mi / src / era / mi / logic / components / TriStateBuffer.java

diff --git a/era.mi/src/era/mi/logic/components/TriStateBuffer.java b/era.mi/src/era/mi/logic/components/TriStateBuffer.java
index 0a7133f..c0dd76e 100644 (file)
--- a/era.mi/src/era/mi/logic/components/TriStateBuffer.java
+++ b/era.mi/src/era/mi/logic/components/TriStateBuffer.java
@@ -2,49 +2,48 @@ package era.mi.logic.components;
 
 import java.util.List;
 
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire.WireEnd;
 
 public class TriStateBuffer extends BasicComponent
 {
-       WireArray in, enable;
-       WireArrayEnd outI;
+       WireEnd in, enable;
+       WireEnd out;
 
-       public TriStateBuffer(int processTime, WireArray in, WireArray out, WireArray enable)
+       public TriStateBuffer(int processTime, WireEnd in, WireEnd out, WireEnd enable)
        {
                super(processTime);
-               if (in.length != out.length)
+               if (in.length() != out.length())
                        throw new IllegalArgumentException(
-                                       "Tri-state output must have the same amount of bits as the input. Input: " + in.length + " Output: " + out.length);
-               if (enable.length != 1)
-                       throw new IllegalArgumentException("Tri-state enable must have exactly one bit, not " + enable.length + ".");
+                                       "Tri-state output must have the same amount of bits as the input. Input: " + in.length() + " Output: " + out.length());
+               if (enable.length() != 1)
+                       throw new IllegalArgumentException("Tri-state enable must have exactly one bit, not " + enable.length() + ".");
                this.in = in;
                in.addObserver(this);
                this.enable = enable;
                enable.addObserver(this);
-               outI = out.createInput();
+               this.out = out;
        }
 
        @Override
        protected void compute()
        {
                if (enable.getValue() == Bit.ONE)
-                       outI.feedSignals(in.getValues());
+                       out.feedSignals(in.getValues());
                else
-                       outI.clearSignals();
+                       out.clearSignals();
        }
 
        @Override
-       public List<WireArray> getAllInputs()
+       public List<WireEnd> getAllInputs()
        {
                return List.of(in, enable);
        }
 
        @Override
-       public List<WireArray> getAllOutputs()
+       public List<WireEnd> getAllOutputs()
        {
-               return List.of(outI.owner);
+               return List.of(out);
        }
 
 }