Revisited some hardcoded components

[Mograsim.git] / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / components / GUIinc12.java

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java
index 0b94583..c3848d4 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java
@@ -1,6 +1,5 @@
 package net.mograsim.logic.model.am2900.components;
 
-import static net.mograsim.logic.core.types.Bit.ONE;
 import static net.mograsim.logic.core.types.Bit.U;
 import static net.mograsim.logic.core.types.Bit.X;
 import static net.mograsim.logic.core.types.Bit.Z;
@@ -15,6 +14,7 @@ import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
 
@@ -24,13 +24,13 @@ public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent
        {
                super(model, name, "Incrementer");
                setSize(40, 20);
-               addPin(new Pin(this, "A", 12, 20, 20), Usage.INPUT, Position.TOP);
-               addPin(new Pin(this, "CI", 1, 40, 10), Usage.INPUT, Position.LEFT);
-               addPin(new Pin(this, "Y", 12, 20, 0), Usage.OUTPUT, Position.BOTTOM);
+               addPin(new Pin(this, "A", 12, PinUsage.INPUT, 20, 20), Position.TOP);
+               addPin(new Pin(this, "CI", 1, PinUsage.INPUT, 40, 10), Position.LEFT);
+               addPin(new Pin(this, "Y", 12, PinUsage.OUTPUT, 20, 0), Position.BOTTOM);
        }
 
        @Override
-       protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
+       public Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
        {
                Bit[] ABits = readEnds.get("A").getValues().getBits();
                Bit CIVal = readEnds.get("CI").getValue();
@@ -47,23 +47,11 @@ public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent
                {
                        Bit carry = Bit.ONE;
                        // TODO extract to helper. This code almost also exists in GUIAM2910RegCntr.
-                       // TODO maybe invert loop direction
                        for (int i = 11; i >= 0; i--)
                        {
                                Bit a = ABits[i];
-                               Bit z;
-                               if (a.isBinary() && carry.isBinary())
-                               {
-                                       boolean aBool = a == ONE;
-                                       boolean carryBool = carry == ONE;
-                                       z = aBool ^ carryBool ? ONE : ZERO;
-                                       carry = aBool && carryBool ? ONE : ZERO;
-                               } else
-                               {
-                                       carry = carry.join(a);
-                                       z = carry;
-                               }
-                               YBits[i] = z;
+                               YBits[i] = a.xor(carry);
+                               carry = a.and(carry);
                        }
                }
                readWriteEnds.get("Y").feedSignals(YBits);