From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sun, 11 Oct 2020 21:58:57 +0000 (+0200)
Subject: Pins of demux2 are now ordered MSB on top; improved ram5_12 a bit
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=18ca9fbf3ca2d74f2bf363d27e9bc399af3de0a4;p=Mograsim.git

Pins of demux2 are now ordered MSB on top; improved ram5_12 a bit
---

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json
index 2f07c5b4..43300bcd 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json
@@ -5,7 +5,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 15.0
       },
       "name": "S0",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 5.0
       },
       "name": "S1",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 5.0
+        "y": 35.0
       },
       "name": "Y00",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 15.0
+        "y": 25.0
       },
       "name": "Y01",
       "logicWidth": 1,
@@ -41,7 +41,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 25.0
+        "y": 15.0
       },
       "name": "Y10",
       "logicWidth": 1,
@@ -50,7 +50,7 @@
     {
       "location": {
         "x": 35.0,
-        "y": 35.0
+        "y": 5.0
       },
       "name": "Y11",
       "logicWidth": 1,
@@ -64,8 +64,8 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 10.0,
-          "y": 2.5
+          "x": 15.0,
+          "y": 32.5
         },
         "params": 1
       },
@@ -73,8 +73,8 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 10.0,
-          "y": 27.5
+          "x": 15.0,
+          "y": 57.5
         },
         "params": 1
       },
@@ -82,8 +82,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 6.5,
-          "y": 11.5
+          "x": 9.0,
+          "y": 36.5
         },
         "params": 1
       },
@@ -91,8 +91,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 6.5,
-          "y": 16.5
+          "x": 39.0,
+          "y": 26.5
         },
         "params": 1
       },
@@ -100,8 +100,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 36.5,
-          "y": 61.5
+          "x": 4.0,
+          "y": 11.5
         },
         "params": 1
       },
@@ -110,7 +110,7 @@
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 4.0,
-          "y": 36.5
+          "y": 61.5
         },
         "params": 1
       },
@@ -118,8 +118,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 4.0,
-          "y": 41.5
+          "x": 44.0,
+          "y": 11.5
         },
         "params": 1
       },
@@ -127,8 +127,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 31.5,
-          "y": 66.5
+          "x": 44.0,
+          "y": 41.5
         },
         "params": 1
       },
@@ -136,17 +136,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 31.5,
-          "y": 11.5
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
-        "pos": {
-          "x": 34.0,
-          "y": 36.5
+          "x": 39.0,
+          "y": 66.5
         },
         "params": 1
       },
@@ -154,47 +145,52 @@
         "id": "and",
         "name": "and#0",
         "pos": {
-          "x": 40.0,
-          "y": 2.5
+          "x": 50.0,
+          "y": 77.5
         }
       },
       {
         "id": "and",
         "name": "and#1",
         "pos": {
-          "x": 40.0,
-          "y": 27.5
+          "x": 50.0,
+          "y": 52.5
         }
       },
       {
         "id": "and",
         "name": "and#2",
         "pos": {
-          "x": 40.0,
-          "y": 52.5
+          "x": 50.0,
+          "y": 27.5
         }
       },
       {
         "id": "and",
         "name": "and#3",
         "pos": {
-          "x": 40.0,
-          "y": 77.5
+          "x": 50.0,
+          "y": 2.5
         }
       }
     ],
     "wires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S0"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#0",
-        "path": []
+        "path": [
+          {
+            "x": 10.0,
+            "y": 27.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -202,7 +198,7 @@
           "pinName": "S1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#1",
@@ -210,123 +206,85 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "S0"
         },
         "pin2": {
-          "compName": "NandGate#0",
-          "pinName": "A"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 7.5
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#3",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 32.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#3",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#4",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#6",
-        "path": []
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 47.5
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#6",
         "path": [
           {
-            "x": 7.5,
-            "y": 62.5
+            "x": 5.0,
+            "y": 72.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 67.5
-          },
-          {
-            "x": 32.5,
-            "y": 67.5
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
       },
       {
         "pin1": {
@@ -334,10 +292,10 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#8",
         "path": []
       },
       {
@@ -346,140 +304,135 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#9",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#10",
         "path": [
           {
-            "x": 32.5,
-            "y": 7.5
+            "x": 45.0,
+            "y": 82.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#11",
         "path": [
           {
-            "x": 35.0,
-            "y": 17.5
+            "x": 40.0,
+            "y": 92.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#12",
         "path": [
           {
-            "x": 37.5,
-            "y": 32.5
+            "x": 40.0,
+            "y": 57.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#15",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 42.5
-          }
-        ]
+        "name": "unnamedWire#13",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#2",
-          "pinName": "A"
+          "pinName": "B"
         },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 32.5,
-            "y": 57.5
-          }
-        ]
+        "name": "unnamedWire#14",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#2",
-          "pinName": "B"
+          "pinName": "A"
         },
-        "name": "unnamedWire#17",
-        "path": []
+        "name": "unnamedWire#15",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 32.5
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#3",
-          "pinName": "A"
+          "pinName": "B"
         },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#16",
         "path": [
           {
-            "x": 37.5,
-            "y": 82.5
+            "x": 40.0,
+            "y": 17.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
           "compName": "and#3",
-          "pinName": "B"
+          "pinName": "A"
         },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#17",
         "path": [
           {
-            "x": 32.5,
-            "y": 92.5
+            "x": 45.0,
+            "y": 7.5
           }
         ]
       },
@@ -492,7 +445,17 @@
           "compName": "_submodelinterface",
           "pinName": "Y00"
         },
-        "name": "unnamedWire#20"
+        "name": "unnamedWire#18",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 82.5
+          },
+          {
+            "x": 80.0,
+            "y": 87.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -503,7 +466,17 @@
           "compName": "_submodelinterface",
           "pinName": "Y01"
         },
-        "name": "unnamedWire#21"
+        "name": "unnamedWire#19",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 57.5
+          },
+          {
+            "x": 80.0,
+            "y": 62.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -514,7 +487,17 @@
           "compName": "_submodelinterface",
           "pinName": "Y10"
         },
-        "name": "unnamedWire#22"
+        "name": "unnamedWire#20",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 32.5
+          },
+          {
+            "x": 80.0,
+            "y": 37.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -525,7 +508,29 @@
           "compName": "_submodelinterface",
           "pinName": "Y11"
         },
-        "name": "unnamedWire#23"
+        "name": "unnamedWire#21",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 7.5
+          },
+          {
+            "x": 80.0,
+            "y": 12.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#22",
+        "path": []
       }
     ],
     "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json
index f4aa4c52..63d22d79 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram5_12.json
@@ -773,19 +773,19 @@
         },
         "pin2": {
           "compName": "demux2#0",
-          "pinName": "S0"
+          "pinName": "S1"
         },
         "name": "unnamedWire#28",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
+          "compName": "demux2#0",
+          "pinName": "S0"
         },
         "pin2": {
-          "compName": "demux2#0",
-          "pinName": "S1"
+          "compName": "Splitter#1",
+          "pinName": "O0"
         },
         "name": "unnamedWire#29",
         "path": []
@@ -1275,13 +1275,13 @@
       "c001": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff12_we#1"
+          "delegateTarget": "dff12_we#0"
         }
       },
       "c010": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dff12_we#0"
+          "delegateTarget": "dff12_we#1"
         }
       },
       "c011": {