X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2904%2FAm2904MSR.json;h=3ebf575af0cde23c8fbebc30920f6498ee4fa7cd;hb=63b01516457d2cac32750158fc8893c6f38fc8ff;hp=927d41f8ebb17ff02dc83b4ed10cd14899df248f;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
index 927d41f8..3ebf575a 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json
@@ -203,136 +203,136 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 74.0,
-          "y": 54.0
+          "x": 369.0,
+          "y": 94.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 74.0,
-          "y": 64.0
+          "x": 374.0,
+          "y": 104.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
+        "name": "WireCrossPoint#4",
         "pos": {
-          "x": 34.0,
-          "y": 234.0
+          "x": 379.0,
+          "y": 114.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 124.0,
-          "y": 174.0
+          "x": 29.0,
+          "y": 284.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
+        "name": "WireCrossPoint#6",
         "pos": {
-          "x": 74.0,
-          "y": 74.0
+          "x": 39.0,
+          "y": 304.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#7",
         "pos": {
-          "x": 164.0,
-          "y": 59.0
+          "x": 19.0,
+          "y": 194.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#8",
         "pos": {
-          "x": 269.0,
-          "y": 39.0
+          "x": 79.0,
+          "y": 254.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "name": "WireCrossPoint#9",
         "pos": {
-          "x": 369.0,
-          "y": 94.0
+          "x": 39.0,
+          "y": 84.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#10",
         "pos": {
-          "x": 374.0,
-          "y": 104.0
+          "x": 74.0,
+          "y": 54.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "name": "WireCrossPoint#11",
         "pos": {
-          "x": 379.0,
-          "y": 114.0
+          "x": 74.0,
+          "y": 64.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#12",
         "pos": {
-          "x": 29.0,
-          "y": 284.0
+          "x": 34.0,
+          "y": 234.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#13",
         "pos": {
-          "x": 39.0,
-          "y": 304.0
+          "x": 124.0,
+          "y": 174.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#14",
         "pos": {
-          "x": 19.0,
-          "y": 194.0
+          "x": 74.0,
+          "y": 74.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "name": "WireCrossPoint#15",
         "pos": {
-          "x": 79.0,
-          "y": 254.0
+          "x": 164.0,
+          "y": 59.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#16",
         "pos": {
-          "x": 39.0,
-          "y": 84.0
+          "x": 269.0,
+          "y": 39.0
         },
         "params": 1
       },
@@ -361,40 +361,40 @@
         }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#0",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#0",
         "pos": {
           "x": 45.0,
           "y": 80.0
         }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#1",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#1",
         "pos": {
           "x": 85.0,
           "y": 220.0
         }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#2",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#2",
         "pos": {
           "x": 90.0,
           "y": 30.0
         }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#3",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#3",
         "pos": {
           "x": 130.0,
           "y": 170.0
         }
       },
       {
-        "id": "mux1_4",
-        "name": "mux1_4#4",
+        "id": "mux1_4_sb",
+        "name": "mux1_4_sb#4",
         "pos": {
           "x": 175.0,
           "y": 120.0
@@ -442,7 +442,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE4"
+          "pinName": "_WE1"
         },
         "name": "unnamedWire#1",
         "path": [
@@ -460,6 +460,141 @@
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EN"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE2"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 150.0,
+            "y": 25.0
+          },
+          {
+            "x": 310.0,
+            "y": 25.0
+          },
+          {
+            "x": 310.0,
+            "y": 115.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EC"
+        },
+        "pin2": {
+          "compName": "and#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 100.0,
+            "y": 20.0
+          },
+          {
+            "x": 190.0,
+            "y": 20.0
+          },
+          {
+            "x": 190.0,
+            "y": 55.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "_EZ"
+        },
+        "pin2": {
+          "compName": "dff4_finewe#0",
+          "pinName": "_WE4"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 15.0
+          },
+          {
+            "x": 320.0,
+            "y": 15.0
+          },
+          {
+            "x": 320.0,
+            "y": 95.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "dff4_finewe#0",
+          "pinName": "Q3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -486,7 +621,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -511,7 +646,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#13",
@@ -532,7 +667,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#14",
@@ -553,7 +688,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#15",
@@ -574,7 +709,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#16",
@@ -582,7 +717,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_2"
         },
         "pin2": {
@@ -598,7 +733,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#18",
@@ -606,7 +741,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "I1_4"
         },
         "pin2": {
@@ -616,31 +751,6 @@
         "name": "unnamedWire#19",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EN"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
-        },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 150.0,
-            "y": 25.0
-          },
-          {
-            "x": 310.0,
-            "y": 25.0
-          },
-          {
-            "x": 310.0,
-            "y": 115.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -738,7 +848,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q3"
+          "pinName": "Q2"
         },
         "pin2": {
           "compName": "WireCrossPoint#3",
@@ -778,43 +888,18 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q4"
+          "pinName": "Q1"
         },
         "name": "unnamedWire#29",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EC"
-        },
-        "pin2": {
-          "compName": "and#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 100.0,
-            "y": 20.0
-          },
-          {
-            "x": 190.0,
-            "y": 20.0
-          },
-          {
-            "x": 190.0,
-            "y": 55.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "not4#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#30",
@@ -822,7 +907,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_2"
         },
         "pin2": {
@@ -838,7 +923,7 @@
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#32",
@@ -846,7 +931,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I1_4"
         },
         "pin2": {
@@ -962,7 +1047,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_4"
         },
         "pin2": {
@@ -977,38 +1062,13 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "_EZ"
-        },
-        "pin2": {
-          "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 15.0
-          },
-          {
-            "x": 320.0,
-            "y": 15.0
-          },
-          {
-            "x": 320.0,
-            "y": 95.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#40",
@@ -1021,7 +1081,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1058,7 +1118,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#43",
@@ -1066,11 +1126,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#44",
@@ -1095,11 +1155,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#46",
@@ -1107,11 +1167,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#47",
@@ -1119,11 +1179,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#48",
@@ -1135,24 +1195,12 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#49",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q"
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#10",
@@ -1179,7 +1227,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1195,7 +1243,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#53",
@@ -1203,7 +1251,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "I0_1"
         },
         "pin2": {
@@ -1248,7 +1296,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#57",
@@ -1272,7 +1320,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#59",
@@ -1285,19 +1333,7 @@
       },
       {
         "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -1309,7 +1345,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -1330,7 +1366,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#62",
@@ -1347,11 +1383,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#63",
@@ -1359,11 +1395,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y2"
         },
         "name": "unnamedWire#64",
@@ -1371,11 +1407,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#65",
@@ -1383,11 +1419,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "mux1_4#1",
+          "compName": "mux1_4_sb#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#66",
@@ -1416,7 +1452,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "S0"
         },
         "name": "unnamedWire#68",
@@ -1428,7 +1464,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#69",
@@ -1445,24 +1481,12 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "Y4"
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D4"
+          "pinName": "D1"
         },
         "name": "unnamedWire#70",
         "path": [
@@ -1479,10 +1503,10 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D3"
+          "pinName": "D2"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "Y3"
         },
         "name": "unnamedWire#71",
@@ -1504,7 +1528,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE2"
+          "pinName": "_WE3"
         },
         "name": "unnamedWire#72",
         "path": [
@@ -1529,10 +1553,10 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D1"
+          "pinName": "D4"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "Y1"
         },
         "name": "unnamedWire#73",
@@ -1549,11 +1573,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "Y4"
         },
         "name": "unnamedWire#74",
@@ -1561,11 +1585,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#75",
@@ -1573,11 +1597,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "Y2"
         },
         "name": "unnamedWire#76",
@@ -1585,11 +1609,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#3",
+          "compName": "mux1_4_sb#3",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#77",
@@ -1597,11 +1621,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I0_4"
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "Y4"
         },
         "name": "unnamedWire#78",
@@ -1618,11 +1642,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#79",
@@ -1639,23 +1663,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "O1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I0_2"
         },
         "pin2": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "Y2"
         },
         "name": "unnamedWire#80",
@@ -1672,11 +1684,11 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#2",
+          "compName": "mux1_4_sb#2",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#81",
@@ -1697,7 +1709,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "S0"
         },
         "name": "unnamedWire#82",
@@ -1789,7 +1801,7 @@
       },
       {
         "pin1": {
-          "compName": "mux1_4#4",
+          "compName": "mux1_4_sb#4",
           "pinName": "Y2"
         },
         "pin2": {
@@ -1823,7 +1835,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D2"
+          "pinName": "D3"
         },
         "name": "unnamedWire#88",
         "path": [
@@ -1849,18 +1861,6 @@
         "name": "unnamedWire#89",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "dff4_finewe#0",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#15",
@@ -1901,10 +1901,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_4#0",
+          "compName": "mux1_4_sb#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#92",
         "path": []
       }
     ],
@@ -1929,6 +1929,34 @@
           "delegateTarget": "dff4_finewe#0",
           "subStateID": "q"
         }
+      },
+      "q1": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q1"
+        }
+      },
+      "q2": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q2"
+        }
+      },
+      "q3": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q3"
+        }
+      },
+      "q4": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "dff4_finewe#0",
+          "subStateID": "q4"
+        }
       }
     }
   },