Fixed dff4_finewe HLS bit order

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 6eba852..9ffa28c 100644 (file)
--- 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
@@ -442,7 +442,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE4"
+          "pinName": "_WE1"
         },
         "name": "unnamedWire#1",
         "path": [
@@ -467,7 +467,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
+          "pinName": "_WE2"
         },
         "name": "unnamedWire#2",
         "path": [
@@ -517,7 +517,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
+          "pinName": "_WE4"
         },
         "name": "unnamedWire#4",
         "path": [
@@ -550,7 +550,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q1"
+          "pinName": "Q4"
         },
         "pin2": {
           "compName": "WireCrossPoint#1",
@@ -586,7 +586,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q2"
+          "pinName": "Q3"
         },
         "pin2": {
           "compName": "WireCrossPoint#2",
@@ -848,7 +848,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q3"
+          "pinName": "Q2"
         },
         "pin2": {
           "compName": "WireCrossPoint#3",
@@ -888,7 +888,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q4"
+          "pinName": "Q1"
         },
         "name": "unnamedWire#29",
         "path": []
@@ -1486,7 +1486,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D4"
+          "pinName": "D1"
         },
         "name": "unnamedWire#70",
         "path": [
@@ -1503,7 +1503,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D3"
+          "pinName": "D2"
         },
         "pin2": {
           "compName": "mux1_4#4",
@@ -1528,7 +1528,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE2"
+          "pinName": "_WE3"
         },
         "name": "unnamedWire#72",
         "path": [
@@ -1553,7 +1553,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D1"
+          "pinName": "D4"
         },
         "pin2": {
           "compName": "mux1_4#4",
@@ -1835,7 +1835,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D2"
+          "pinName": "D3"
         },
         "name": "unnamedWire#88",
         "path": [

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
index 6aa0738..3a5ec33 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json
@@ -271,7 +271,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q1"
+          "pinName": "Q4"
         },
         "pin2": {
           "compName": "Splitter#3",
@@ -287,7 +287,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q2"
+          "pinName": "Q3"
         },
         "name": "unnamedWire#1",
         "path": []
@@ -299,7 +299,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q3"
+          "pinName": "Q2"
         },
         "name": "unnamedWire#2",
         "path": []
@@ -307,7 +307,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "Q4"
+          "pinName": "Q1"
         },
         "pin2": {
           "compName": "WireCrossPoint#3",
@@ -848,7 +848,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE1"
+          "pinName": "_WE4"
         },
         "pin2": {
           "compName": "_submodelinterface",
@@ -898,7 +898,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE4"
+          "pinName": "_WE1"
         },
         "name": "unnamedWire#38",
         "path": [
@@ -919,7 +919,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE3"
+          "pinName": "_WE2"
         },
         "pin2": {
           "compName": "_submodelinterface",
@@ -948,7 +948,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "_WE2"
+          "pinName": "_WE3"
         },
         "name": "unnamedWire#40",
         "path": [
@@ -969,7 +969,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D1"
+          "pinName": "D4"
         },
         "pin2": {
           "compName": "mux1_4#1",
@@ -985,7 +985,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D2"
+          "pinName": "D3"
         },
         "name": "unnamedWire#42",
         "path": [
@@ -1002,7 +1002,7 @@
       {
         "pin1": {
           "compName": "dff4_finewe#0",
-          "pinName": "D3"
+          "pinName": "D2"
         },
         "pin2": {
           "compName": "mux1_4#1",
@@ -1035,7 +1035,7 @@
         },
         "pin2": {
           "compName": "dff4_finewe#0",
-          "pinName": "D4"
+          "pinName": "D1"
         },
         "name": "unnamedWire#45",
         "path": [

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json
index e3568aa..5b42800 100755 (executable)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_finewe.json
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 55.0
+        "y": 85.0
       },
       "name": "D1",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 65.0
+        "y": 75.0
       },
       "name": "D2",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 75.0
+        "y": 65.0
       },
       "name": "D3",
       "logicWidth": 1,
@@ -41,7 +41,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 85.0
+        "y": 55.0
       },
       "name": "D4",
       "logicWidth": 1,
@@ -50,7 +50,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 5.0
+        "y": 35.0
       },
       "name": "Q1",
       "logicWidth": 1,
@@ -59,7 +59,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 15.0
+        "y": 25.0
       },
       "name": "Q2",
       "logicWidth": 1,
@@ -68,7 +68,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 25.0
+        "y": 15.0
       },
       "name": "Q3",
       "logicWidth": 1,
@@ -77,7 +77,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 35.0
+        "y": 5.0
       },
       "name": "Q4",
       "logicWidth": 1,
@@ -86,7 +86,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 45.0
       },
       "name": "_WE1",
       "logicWidth": 1,
@@ -95,7 +95,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 35.0
       },
       "name": "_WE2",
       "logicWidth": 1,
@@ -104,7 +104,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 35.0
+        "y": 25.0
       },
       "name": "_WE3",
       "logicWidth": 1,
@@ -113,7 +113,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 15.0
       },
       "name": "_WE4",
       "logicWidth": 1,
@@ -471,7 +471,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Q1"
+          "pinName": "Q4"
         },
         "name": "unnamedWire#14",
         "path": []
@@ -479,7 +479,7 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "Q2"
+          "pinName": "Q3"
         },
         "pin2": {
           "compName": "WireCrossPoint#4",
@@ -544,7 +544,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Q3"
+          "pinName": "Q2"
         },
         "name": "unnamedWire#19",
         "path": []
@@ -556,7 +556,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Q4"
+          "pinName": "Q1"
         },
         "name": "unnamedWire#20",
         "path": []
@@ -601,7 +601,7 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "_WE1"
+          "pinName": "_WE4"
         },
         "pin2": {
           "compName": "mux1#0",
@@ -626,7 +626,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "D4"
+          "pinName": "D1"
         },
         "name": "unnamedWire#24",
         "path": [
@@ -643,7 +643,7 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D3"
+          "pinName": "D2"
         },
         "pin2": {
           "compName": "mux1#2",
@@ -668,7 +668,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "D2"
+          "pinName": "D3"
         },
         "name": "unnamedWire#26",
         "path": [
@@ -685,7 +685,7 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D1"
+          "pinName": "D4"
         },
         "pin2": {
           "compName": "mux1#0",
@@ -710,7 +710,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "_WE3"
+          "pinName": "_WE2"
         },
         "name": "unnamedWire#28",
         "path": [
@@ -727,7 +727,7 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "_WE4"
+          "pinName": "_WE1"
         },
         "pin2": {
           "compName": "mux1#3",
@@ -752,7 +752,7 @@
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "_WE2"
+          "pinName": "_WE3"
         },
         "name": "unnamedWire#30",
         "path": [
@@ -802,28 +802,28 @@
       "q1": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#0",
+          "delegateTarget": "dff#3",
           "subStateID": "q"
         }
       },
       "q2": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#1",
+          "delegateTarget": "dff#2",
           "subStateID": "q"
         }
       },
       "q3": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#2",
+          "delegateTarget": "dff#1",
           "subStateID": "q"
         }
       },
       "q4": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff#3",
+          "delegateTarget": "dff#0",
           "subStateID": "q"
         }
       }