X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2Fgates%2FMultiInputGate.java;h=d7fecc19f54f69066b79d5b1fa37fcb45d423440;hb=9b4850366c29fbd800ee8df1858c398d8c35a0c0;hp=afc89511e72cb0f208d22ae759be6c01c1bff5ef;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputGate.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputGate.java
index afc89511..d7fecc19 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputGate.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/gates/MultiInputGate.java
@@ -4,8 +4,8 @@ import java.util.List;
 
 import net.mograsim.logic.core.components.BasicComponent;
 import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.types.MutationOperation;
 import net.mograsim.logic.core.types.BitVector.BitVectorMutator;
+import net.mograsim.logic.core.types.MutationOperation;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
@@ -13,26 +13,33 @@ public abstract class MultiInputGate extends BasicComponent
 {
 	protected ReadEnd[] in;
 	protected ReadWriteEnd out;
-	protected final int length;
+	protected final int width;
 	protected MutationOperation op;
+	protected boolean invert = false;
 
 	protected MultiInputGate(Timeline timeline, int processTime, MutationOperation op, ReadWriteEnd out, ReadEnd... in)
 	{
 		super(timeline, processTime);
 		this.op = op;
-		length = out.length();
+		width = out.width();
 		this.in = in.clone();
 		if (in.length < 1)
 			throw new IllegalArgumentException(String.format("Cannot create gate with %d wires.", in.length));
 		for (ReadEnd w : in)
 		{
-			if (w.length() != length)
+			if (w.width() != width)
 				throw new IllegalArgumentException("All wires connected to the gate must be of uniform length.");
-			w.addObserver(this);
+			w.registerObserver(this);
 		}
 		this.out = out;
 	}
 
+	protected MultiInputGate(Timeline timeline, int processTime, MutationOperation op, boolean invert, ReadWriteEnd out, ReadEnd... in)
+	{
+		this(timeline, processTime, op, out, in);
+		this.invert = invert;
+	}
+
 	@Override
 	public List<ReadEnd> getAllInputs()
 	{
@@ -51,6 +58,6 @@ public abstract class MultiInputGate extends BasicComponent
 		BitVectorMutator mutator = BitVectorMutator.empty();
 		for (ReadEnd w : in)
 			op.apply(mutator, w.getValues());
-		out.feedSignals(mutator.get());
+		out.feedSignals(invert ? mutator.toBitVector().not() : mutator.toBitVector());
 	}
 }