Merge remote-tracking branch 'origin/development' into development

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
index 36f9c24..b3fb717 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java
@@ -5,7 +5,7 @@ import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.components.GUIBitDisplay;
 import net.mograsim.logic.ui.model.components.GUIManualSwitch;
 import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
-import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901DestDecode;
+import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901ALUOneBit;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 
 public class SubmodelComponentTestbench
@@ -18,7 +18,7 @@ public class SubmodelComponentTestbench
        @SuppressWarnings("unused") // for GUIWires being created
        public static void createTestbench(ViewModelModifiable model)
        {
-               SimpleRectangularSubmodelComponent comp = new GUIAm2901DestDecode(model);
+               SimpleRectangularSubmodelComponent comp = new GUIAm2901ALUOneBit(model);
 
                comp.moveTo(100, 0);
                for (int i = 0; i < comp.getInputPins().size(); i++)

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/am2901/GUIAm2901ALUOneBit.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/am2901/GUIAm2901ALUOneBit.java
new file mode 100644 (file)
index 0000000..7199b7c
--- /dev/null
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/am2901/GUIAm2901ALUOneBit.java
@@ -0,0 +1,89 @@
+package net.mograsim.logic.ui.model.components.mi.nandbased.am2901;
+
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.components.GUINandGate;
+import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUIand;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUIfulladder;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUImux1;
+import net.mograsim.logic.ui.model.components.mi.nandbased.GUIxor;
+import net.mograsim.logic.ui.model.wires.GUIWire;
+import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.model.wires.WireCrossPoint;
+
+public class GUIAm2901ALUOneBit extends SimpleRectangularSubmodelComponent
+{
+       public GUIAm2901ALUOneBit(ViewModelModifiable model)
+       {
+               super(model, 1, "GUIAm2901ALUOneBit");
+               setSubmodelScale(.2);
+               setInputCount(9);
+               setOutputCount(2);
+               initSubmodelComponents();
+       }
+
+       @SuppressWarnings("unused") // for GUIWires being created
+       private void initSubmodelComponents()
+       {
+               Pin Cin = getInputSubmodelPins().get(0);
+               Pin CoutE = getInputSubmodelPins().get(1);
+               Pin CinE = getInputSubmodelPins().get(2);
+               Pin R = getInputSubmodelPins().get(3);
+               Pin RN = getInputSubmodelPins().get(4);
+               Pin S = getInputSubmodelPins().get(5);
+               Pin SN = getInputSubmodelPins().get(6);
+               Pin FN = getInputSubmodelPins().get(7);
+               Pin L = getInputSubmodelPins().get(8);
+               Pin Cout = getOutputSubmodelPins().get(0);
+               Pin F = getOutputSubmodelPins().get(1);
+
+               GUIand Cinand = new GUIand(submodelModifiable);
+               GUIxor Rxor = new GUIxor(submodelModifiable);
+               GUIxor Sxor = new GUIxor(submodelModifiable);
+               GUIfulladder add = new GUIfulladder(submodelModifiable);
+               GUINandGate nand = new GUINandGate(submodelModifiable, 1);
+               GUIand Coutand = new GUIand(submodelModifiable);
+               GUImux1 Fsel = new GUImux1(submodelModifiable);
+               GUIxor Fxor = new GUIxor(submodelModifiable);
+
+               WireCrossPoint cpRXored = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpSXored = new WireCrossPoint(submodelModifiable, 1);
+
+               Cinand.moveTo(10, 20);
+               Rxor.moveTo(10, 190);
+               Sxor.moveTo(10, 290);
+               add.moveTo(60, 20);
+               nand.moveTo(60, 55);
+               Coutand.moveTo(135, 20);
+               Fsel.moveTo(90, 70);
+               Fxor.moveTo(135, 70);
+               cpRXored.moveCenterTo(50, 60);
+               cpSXored.moveCenterTo(55, 70);
+
+               new GUIWire(submodelModifiable, Cin, Cinand.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, CoutE, Coutand.getInputPins().get(0), new Point(5, 75), new Point(5, 10), new Point(130, 10),
+                               new Point(130, 25));
+               new GUIWire(submodelModifiable, CinE, Cinand.getInputPins().get(1), new Point(7.5, 125), new Point(7.5, 35));
+               new GUIWire(submodelModifiable, R, Rxor.getInputPins().get(0));
+               new GUIWire(submodelModifiable, RN, Rxor.getInputPins().get(1));
+               new GUIWire(submodelModifiable, S, Sxor.getInputPins().get(0));
+               new GUIWire(submodelModifiable, SN, Sxor.getInputPins().get(1));
+               new GUIWire(submodelModifiable, FN, Fxor.getInputPins().get(1), new Point(130, 375), new Point(130, 85));
+               new GUIWire(submodelModifiable, L, Fsel.getInputPins().get(0), new Point(87.5, 425), new Point(87.5, 75));
+               new GUIWire(submodelModifiable, Cinand.getOutputPins().get(0), add.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, Rxor.getOutputPins().get(0), cpRXored, new Point(50, 195));
+               new GUIWire(submodelModifiable, cpRXored, add.getInputPins().get(1), new Point(50, 35));
+               new GUIWire(submodelModifiable, cpRXored, nand.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, Sxor.getOutputPins().get(0), cpSXored, new Point(55, 295));
+               new GUIWire(submodelModifiable, cpSXored, add.getInputPins().get(2), new Point(55, 45));
+               new GUIWire(submodelModifiable, cpSXored, nand.getInputPins().get(1), new Point[0]);
+               new GUIWire(submodelModifiable, add.getOutputPins().get(0), Fsel.getInputPins().get(1), new Point(100, 25), new Point(100, 65),
+                               new Point(85, 65), new Point(85, 85));
+               new GUIWire(submodelModifiable, add.getOutputPins().get(1), Coutand.getInputPins().get(1), new Point[0]);
+               new GUIWire(submodelModifiable, nand.getOutputPin(), Fsel.getInputPins().get(2), new Point(82.5, 65), new Point(82.5, 95));
+               new GUIWire(submodelModifiable, Fsel.getOutputPins().get(0), Fxor.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, Coutand.getOutputPins().get(0), Cout, new Point[0]);
+               new GUIWire(submodelModifiable, Fxor.getOutputPins().get(0), F, new Point[0]);
+       }
+}
\ No newline at end of file

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/am2901/GUIAm2901SourceDecode.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/am2901/GUIAm2901SourceDecode.java
new file mode 100644 (file)
index 0000000..b66427e
--- /dev/null
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/am2901/GUIAm2901SourceDecode.java
@@ -0,0 +1,152 @@
+package net.mograsim.logic.ui.model.components.mi.nandbased.am2901;
+
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.components.GUINandGate;
+import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
+import net.mograsim.logic.ui.model.wires.GUIWire;
+import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.model.wires.WireCrossPoint;
+
+public class GUIAm2901SourceDecode extends SimpleRectangularSubmodelComponent
+{
+       public GUIAm2901SourceDecode(ViewModelModifiable model)
+       {
+               super(model, 1, "Am2901SourceDecode");
+               setSubmodelScale(.25);
+               setInputCount(3);
+               setOutputCount(5);
+               initSubmodelComponents();
+       }
+
+       @SuppressWarnings("unused") // for GUIWires being created
+       private void initSubmodelComponents()
+       {
+               Pin I2 = getInputSubmodelPins().get(0);
+               Pin I1 = getInputSubmodelPins().get(1);
+               Pin I0 = getInputSubmodelPins().get(2);
+               Pin SQ = getOutputSubmodelPins().get(0);
+               Pin RA = getOutputSubmodelPins().get(1);
+               Pin SB = getOutputSubmodelPins().get(2);
+               Pin SA = getOutputSubmodelPins().get(3);
+               Pin RD = getOutputSubmodelPins().get(4);
+
+               GUINandGate notI2 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate notI1 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate notI0 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand21 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand22 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand23 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand24 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand25 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand31 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand32 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand33 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand34 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand35 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand41 = new GUINandGate(submodelModifiable, 1);
+               GUINandGate nand42 = new GUINandGate(submodelModifiable, 1);
+
+               WireCrossPoint cpI21 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpI22 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpI23 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpI1 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpI01 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpI02 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNotI2 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNotI11 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNotI12 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNotI13 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNotI0 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNand22 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNand23 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNand24 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNand31 = new WireCrossPoint(submodelModifiable, 1);
+               WireCrossPoint cpNand35 = new WireCrossPoint(submodelModifiable, 1);
+
+               notI2.moveTo(10, 10);
+               notI1.moveTo(10, 50);
+               notI0.moveTo(10, 90);
+               nand21.moveTo(40, 10);
+               nand22.moveTo(40, 50);
+               nand23.moveTo(40, 90);
+               nand24.moveTo(40, 130);
+               nand25.moveTo(40, 170);
+               nand31.moveTo(70, 10);
+               nand32.moveTo(70, 50);
+               nand33.moveTo(70, 90);
+               nand34.moveTo(70, 130);
+               nand35.moveTo(70, 170);
+               nand41.moveTo(100, 10);
+               nand42.moveTo(100, 170);
+               cpI21.moveCenterTo(5, 20);
+               cpI22.moveCenterTo(7.5, 20);
+               cpI23.moveCenterTo(5, 145);
+               cpI1.moveCenterTo(7.5, 60);
+               cpI01.moveCenterTo(7.5, 100);
+               cpI02.moveCenterTo(7.5, 105);
+               cpNotI2.moveCenterTo(32.5, 55);
+               cpNotI11.moveCenterTo(35, 60);
+               cpNotI12.moveCenterTo(35, 65);
+               cpNotI13.moveCenterTo(35, 135);
+               cpNotI0.moveCenterTo(37.5, 100);
+               cpNand22.moveCenterTo(65, 60);
+               cpNand23.moveCenterTo(65, 100);
+               cpNand24.moveCenterTo(65, 140);
+               cpNand31.moveCenterTo(95, 20);
+               cpNand35.moveCenterTo(95, 180);
+
+               new GUIWire(submodelModifiable, I2, cpI21, new Point[0]);
+               new GUIWire(submodelModifiable, cpI21, nand21.getInputPins().get(0), new Point(5, 5), new Point(35, 5), new Point(35, 15));
+               new GUIWire(submodelModifiable, cpI21, cpI22, new Point[0]);
+               new GUIWire(submodelModifiable, cpI22, notI2.getInputPins().get(0), new Point(7.5, 15));
+               new GUIWire(submodelModifiable, cpI22, notI2.getInputPins().get(1), new Point(7.5, 25));
+               new GUIWire(submodelModifiable, cpI21, cpI23, new Point[0]);
+               new GUIWire(submodelModifiable, cpI23, nand24.getInputPins().get(1), new Point[0]);
+               new GUIWire(submodelModifiable, cpI23, nand35.getInputPins().get(1), new Point(5, 195), new Point(65, 195), new Point(65, 185));
+               new GUIWire(submodelModifiable, I1, cpI1, new Point[0]);
+               new GUIWire(submodelModifiable, cpI1, notI1.getInputPins().get(0), new Point(7.5, 55));
+               new GUIWire(submodelModifiable, cpI1, notI1.getInputPins().get(1), new Point(7.5, 65));
+               new GUIWire(submodelModifiable, I0, cpI01, new Point[0]);
+               new GUIWire(submodelModifiable, cpI01, notI0.getInputPins().get(0), new Point(7.5, 95));
+               new GUIWire(submodelModifiable, cpI01, cpI02, new Point[0]);
+               new GUIWire(submodelModifiable, cpI02, notI0.getInputPins().get(1), new Point[0]);
+               new GUIWire(submodelModifiable, cpI02, nand23.getInputPins().get(1), new Point(7.5, 112.5), new Point(32.5, 112.5),
+                               new Point(32.5, 105));
+               new GUIWire(submodelModifiable, notI2.getOutputPin(), cpNotI2, new Point(32.5, 20));
+               new GUIWire(submodelModifiable, cpNotI2, nand22.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI2, nand23.getInputPins().get(0), new Point(32.5, 95));
+               new GUIWire(submodelModifiable, notI1.getOutputPin(), cpNotI11, new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI11, nand21.getInputPins().get(1), new Point(35, 25));
+               new GUIWire(submodelModifiable, cpNotI11, cpNotI12, new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI12, nand22.getInputPins().get(1), new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI12, cpNotI13, new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI13, nand24.getInputPins().get(0), new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI13, nand25.getInputPins().get(0), new Point(35, 175));
+               new GUIWire(submodelModifiable, notI0.getOutputPin(), cpNotI0, new Point[0]);
+               new GUIWire(submodelModifiable, cpNotI0, nand31.getInputPins().get(1), new Point(37.5, 35), new Point(65, 35), new Point(65, 25));
+               new GUIWire(submodelModifiable, cpNotI0, nand25.getInputPins().get(1), new Point(37.5, 185));
+               new GUIWire(submodelModifiable, nand21.getOutputPin(), nand31.getInputPins().get(0));
+               new GUIWire(submodelModifiable, nand22.getOutputPin(), cpNand22, new Point[0]);
+               new GUIWire(submodelModifiable, cpNand22, nand32.getInputPins().get(0), new Point(65, 55));
+               new GUIWire(submodelModifiable, cpNand22, nand32.getInputPins().get(1), new Point(65, 65));
+               new GUIWire(submodelModifiable, nand23.getOutputPin(), cpNand23, new Point[0]);
+               new GUIWire(submodelModifiable, cpNand23, nand33.getInputPins().get(0), new Point(65, 95));
+               new GUIWire(submodelModifiable, cpNand23, nand33.getInputPins().get(1), new Point(65, 105));
+               new GUIWire(submodelModifiable, nand24.getOutputPin(), cpNand24, new Point[0]);
+               new GUIWire(submodelModifiable, cpNand24, nand34.getInputPins().get(0), new Point(65, 135));
+               new GUIWire(submodelModifiable, cpNand24, nand34.getInputPins().get(1), new Point(65, 145));
+               new GUIWire(submodelModifiable, nand25.getOutputPin(), nand35.getInputPins().get(0));
+               new GUIWire(submodelModifiable, nand31.getOutputPin(), cpNand31, new Point[0]);
+               new GUIWire(submodelModifiable, cpNand31, nand41.getInputPins().get(0), new Point(95, 15));
+               new GUIWire(submodelModifiable, cpNand31, nand41.getInputPins().get(1), new Point(95, 25));
+               new GUIWire(submodelModifiable, nand32.getOutputPin(), RA, new Point[0]);
+               new GUIWire(submodelModifiable, nand33.getOutputPin(), SB, new Point[0]);
+               new GUIWire(submodelModifiable, nand34.getOutputPin(), SA, new Point[0]);
+               new GUIWire(submodelModifiable, nand35.getOutputPin(), cpNand35, new Point[0]);
+               new GUIWire(submodelModifiable, cpNand35, nand42.getInputPins().get(0), new Point(95, 175));
+               new GUIWire(submodelModifiable, cpNand35, nand42.getInputPins().get(1), new Point(95, 185));
+               new GUIWire(submodelModifiable, nand41.getOutputPin(), SQ, new Point[0]);
+               new GUIWire(submodelModifiable, nand42.getOutputPin(), RD, new Point[0]);
+       }
+}
\ No newline at end of file