X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fwires%2FWireArray.java;h=a0bd7f8b00cf8a53a3487bac3c6a17ab6c1170ad;hb=18cf2f85ed378005aa93c8b88fe5fa055a108fad;hp=4b5fdc791a760e4f16e100465a10ca281b656edd;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/wires/WireArray.java b/era.mi/src/era/mi/logic/wires/WireArray.java
index 4b5fdc79..a0bd7f8b 100644
--- a/era.mi/src/era/mi/logic/wires/WireArray.java
+++ b/era.mi/src/era/mi/logic/wires/WireArray.java
@@ -61,12 +61,7 @@ public class WireArray
 			Bit[] bits = input.getValues();
 			for (int i = 0; i < length; i++)
 			{
-				if (Bit.Z.equals(bits[i]) || newValues[i].equals(bits[i]))
-					continue;
-				else if (Bit.Z.equals(newValues[i]))
-					newValues[i] = bits[i];
-				else
-					newValues[i] = Bit.X;
+				newValues[i] = newValues[i].combineWith(bits[i]);
 			}
 		}
 
@@ -257,7 +252,7 @@ public class WireArray
 
 		private void initValues()
 		{
-			inputValues = Bit.Z.makeArray(length);
+			inputValues = Bit.U.makeArray(length);
 		}
 
 		/**