Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / am2901 / Am2901ALUFuncDecode.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
index ff3e377..90f0ad9 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json
@@ -132,22 +132,6 @@
         },
         "params": 1
       },
-      {
-        "id": "and",
-        "name": "and#0",
-        "pos": {
-          "x": 100.0,
-          "y": 135.0
-        }
-      },
-      {
-        "id": "nand3",
-        "name": "nand3#0",
-        "pos": {
-          "x": 55.0,
-          "y": 10.0
-        }
-      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -246,6 +230,22 @@
           "y": 19.0
         },
         "params": 1
+      },
+      {
+        "id": "and",
+        "name": "and#0",
+        "pos": {
+          "x": 100.0,
+          "y": 135.0
+        }
+      },
+      {
+        "id": "nand3",
+        "name": "nand3#0",
+        "pos": {
+          "x": 55.0,
+          "y": 10.0
+        }
       }
     ],
     "wires": [