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 / Am2901ALUInclSourceDecodeInclFunctionDecode.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
index 3531aae..38b9bd5 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
@@ -1,5 +1,5 @@
 {
-  "width": 96.25,
+  "width": 95.0,
   "height": 110.0,
   "interfacePins": [
     {
@@ -85,7 +85,7 @@
     },
     {
       "location": {
-        "x": 96.25,
+        "x": 95.0,
         "y": 45.0
       },
       "name": "Cn+4",
@@ -130,7 +130,7 @@
     },
     {
       "location": {
-        "x": 96.25,
+        "x": 95.0,
         "y": 5.0
       },
       "name": "F1",
@@ -139,7 +139,7 @@
     },
     {
       "location": {
-        "x": 96.25,
+        "x": 95.0,
         "y": 15.0
       },
       "name": "F2",
@@ -148,7 +148,7 @@
     },
     {
       "location": {
-        "x": 96.25,
+        "x": 95.0,
         "y": 25.0
       },
       "name": "F3",
@@ -157,7 +157,7 @@
     },
     {
       "location": {
-        "x": 96.25,
+        "x": 95.0,
         "y": 35.0
       },
       "name": "F4",
@@ -193,7 +193,7 @@
     },
     {
       "location": {
-        "x": 65.0,
+        "x": 55.0,
         "y": 0.0
       },
       "name": "I3",
@@ -202,7 +202,7 @@
     },
     {
       "location": {
-        "x": 55.0,
+        "x": 65.0,
         "y": 0.0
       },
       "name": "I4",
@@ -220,7 +220,7 @@
     },
     {
       "location": {
-        "x": 96.25,
+        "x": 95.0,
         "y": 55.0
       },
       "name": "OVR",
@@ -271,7 +271,7 @@
         "id": "Am2901ALUInclDecode",
         "name": "Am2901ALUInclDecode#0",
         "pos": {
-          "x": 320.0,
+          "x": 315.0,
           "y": 15.0
         }
       },
@@ -279,7 +279,7 @@
         "id": "Am2901SourceDecode",
         "name": "Am2901SourceDecode#0",
         "pos": {
-          "x": 160.0,
+          "x": 155.0,
           "y": 160.0
         }
       },
@@ -287,8 +287,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 215.0,
-          "y": 225.0
+          "x": 209.0,
+          "y": 224.0
         },
         "params": 1
       },
@@ -296,8 +296,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 220.0,
-          "y": 235.0
+          "x": 214.0,
+          "y": 234.0
         },
         "params": 1
       },
@@ -305,8 +305,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 225.0,
-          "y": 245.0
+          "x": 219.0,
+          "y": 244.0
         },
         "params": 1
       },
@@ -314,8 +314,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 230.0,
-          "y": 255.0
+          "x": 224.0,
+          "y": 254.0
         },
         "params": 1
       },
@@ -323,7 +323,7 @@
         "id": "sel2_4",
         "name": "sel2_4#0",
         "pos": {
-          "x": 241.0,
+          "x": 235.0,
           "y": 85.0
         }
       },
@@ -331,7 +331,7 @@
         "id": "sel3_4",
         "name": "sel3_4#0",
         "pos": {
-          "x": 241.0,
+          "x": 235.0,
           "y": 190.0
         }
       }
@@ -391,11 +391,11 @@
             "y": 85.0
           },
           {
-            "x": 175.0,
+            "x": 170.0,
             "y": 85.0
           },
           {
-            "x": 175.0,
+            "x": 170.0,
             "y": 140.0
           }
         ]
@@ -496,7 +496,7 @@
         "name": "unnamedWire#15",
         "path": [
           {
-            "x": 215.0,
+            "x": 210.0,
             "y": 150.0
           }
         ]
@@ -513,7 +513,7 @@
         "name": "unnamedWire#16",
         "path": [
           {
-            "x": 220.0,
+            "x": 215.0,
             "y": 160.0
           }
         ]
@@ -530,7 +530,7 @@
         "name": "unnamedWire#17",
         "path": [
           {
-            "x": 225.0,
+            "x": 220.0,
             "y": 170.0
           }
         ]
@@ -547,7 +547,7 @@
         "name": "unnamedWire#18",
         "path": [
           {
-            "x": 230.0,
+            "x": 225.0,
             "y": 180.0
           }
         ]
@@ -576,7 +576,7 @@
         "name": "unnamedWire#2",
         "path": [
           {
-            "x": 260.0,
+            "x": 220.0,
             "y": 40.0
           }
         ]
@@ -780,11 +780,11 @@
             "y": 5.0
           },
           {
-            "x": 155.0,
+            "x": 150.0,
             "y": 5.0
           },
           {
-            "x": 155.0,
+            "x": 150.0,
             "y": 165.0
           }
         ]
@@ -822,11 +822,11 @@
         "name": "unnamedWire#31",
         "path": [
           {
-            "x": 205.0,
+            "x": 200.0,
             "y": 215.0
           },
           {
-            "x": 205.0,
+            "x": 200.0,
             "y": 165.0
           }
         ]
@@ -843,11 +843,11 @@
         "name": "unnamedWire#32",
         "path": [
           {
-            "x": 200.0,
+            "x": 195.0,
             "y": 205.0
           },
           {
-            "x": 200.0,
+            "x": 195.0,
             "y": 90.0
           }
         ]
@@ -864,11 +864,11 @@
         "name": "unnamedWire#33",
         "path": [
           {
-            "x": 210.0,
+            "x": 205.0,
             "y": 185.0
           },
           {
-            "x": 210.0,
+            "x": 205.0,
             "y": 205.0
           }
         ]
@@ -897,11 +897,11 @@
         "name": "unnamedWire#36",
         "path": [
           {
-            "x": 280.0,
+            "x": 275.0,
             "y": 90.0
           },
           {
-            "x": 280.0,
+            "x": 275.0,
             "y": 60.0
           }
         ]
@@ -918,11 +918,11 @@
         "name": "unnamedWire#37",
         "path": [
           {
-            "x": 285.0,
+            "x": 280.0,
             "y": 100.0
           },
           {
-            "x": 285.0,
+            "x": 280.0,
             "y": 70.0
           }
         ]
@@ -939,11 +939,11 @@
         "name": "unnamedWire#38",
         "path": [
           {
-            "x": 290.0,
+            "x": 285.0,
             "y": 110.0
           },
           {
-            "x": 290.0,
+            "x": 285.0,
             "y": 80.0
           }
         ]
@@ -960,11 +960,11 @@
         "name": "unnamedWire#39",
         "path": [
           {
-            "x": 295.0,
+            "x": 290.0,
             "y": 120.0
           },
           {
-            "x": 295.0,
+            "x": 290.0,
             "y": 90.0
           }
         ]
@@ -998,11 +998,11 @@
         "name": "unnamedWire#40",
         "path": [
           {
-            "x": 300.0,
+            "x": 295.0,
             "y": 195.0
           },
           {
-            "x": 300.0,
+            "x": 295.0,
             "y": 100.0
           }
         ]
@@ -1019,11 +1019,11 @@
         "name": "unnamedWire#41",
         "path": [
           {
-            "x": 305.0,
+            "x": 300.0,
             "y": 205.0
           },
           {
-            "x": 305.0,
+            "x": 300.0,
             "y": 110.0
           }
         ]
@@ -1040,11 +1040,11 @@
         "name": "unnamedWire#42",
         "path": [
           {
-            "x": 310.0,
+            "x": 305.0,
             "y": 215.0
           },
           {
-            "x": 310.0,
+            "x": 305.0,
             "y": 120.0
           }
         ]
@@ -1061,11 +1061,11 @@
         "name": "unnamedWire#43",
         "path": [
           {
-            "x": 315.0,
+            "x": 310.0,
             "y": 225.0
           },
           {
-            "x": 315.0,
+            "x": 310.0,
             "y": 130.0
           }
         ]
@@ -1094,11 +1094,11 @@
         "name": "unnamedWire#45",
         "path": [
           {
-            "x": 380.0,
+            "x": 375.0,
             "y": 30.0
           },
           {
-            "x": 380.0,
+            "x": 375.0,
             "y": 60.0
           }
         ]
@@ -1115,11 +1115,11 @@
         "name": "unnamedWire#46",
         "path": [
           {
-            "x": 375.0,
+            "x": 370.0,
             "y": 40.0
           },
           {
-            "x": 375.0,
+            "x": 370.0,
             "y": 100.0
           }
         ]
@@ -1136,11 +1136,11 @@
         "name": "unnamedWire#47",
         "path": [
           {
-            "x": 370.0,
+            "x": 365.0,
             "y": 50.0
           },
           {
-            "x": 370.0,
+            "x": 365.0,
             "y": 140.0
           }
         ]
@@ -1157,11 +1157,11 @@
         "name": "unnamedWire#48",
         "path": [
           {
-            "x": 365.0,
+            "x": 360.0,
             "y": 60.0
           },
           {
-            "x": 365.0,
+            "x": 360.0,
             "y": 180.0
           }
         ]
@@ -1178,11 +1178,11 @@
         "name": "unnamedWire#49",
         "path": [
           {
-            "x": 360.0,
+            "x": 355.0,
             "y": 70.0
           },
           {
-            "x": 360.0,
+            "x": 355.0,
             "y": 220.0
           }
         ]
@@ -1216,7 +1216,7 @@
         "name": "unnamedWire#50",
         "path": [
           {
-            "x": 220.0,
+            "x": 260.0,
             "y": 30.0
           }
         ]
@@ -1233,11 +1233,11 @@
         "name": "unnamedWire#6",
         "path": [
           {
-            "x": 210.0,
+            "x": 205.0,
             "y": 175.0
           },
           {
-            "x": 210.0,
+            "x": 205.0,
             "y": 100.0
           }
         ]
@@ -1262,11 +1262,11 @@
             "y": 55.0
           },
           {
-            "x": 190.0,
+            "x": 185.0,
             "y": 55.0
           },
           {
-            "x": 190.0,
+            "x": 185.0,
             "y": 110.0
           }
         ]
@@ -1291,11 +1291,11 @@
             "y": 65.0
           },
           {
-            "x": 185.0,
+            "x": 180.0,
             "y": 65.0
           },
           {
-            "x": 185.0,
+            "x": 180.0,
             "y": 120.0
           }
         ]
@@ -1320,11 +1320,11 @@
             "y": 75.0
           },
           {
-            "x": 180.0,
+            "x": 175.0,
             "y": 75.0
           },
           {
-            "x": 180.0,
+            "x": 175.0,
             "y": 130.0
           }
         ]