projects / Mograsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8770c9f)
Adjusted Am2910 layout to new sel4_12
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Sat, 11 Apr 2020 13:22:54 +0000 (15:22 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Sat, 11 Apr 2020 13:22:54 +0000 (15:22 +0200)
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json patch | blob | history
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java patch | blob | history

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
index 70a7d77..425805f 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@ -136,7 +136,7 @@
         "name": "Am2910RegCntr#0",
         "pos": {
           "x": 130.0,
-          "y": 15.0
+          "y": 10.0
         }
       },
       {
@@ -144,7 +144,7 @@
         "name": "Am2910InstrPLA#0",
         "pos": {
           "x": 30.0,
-          "y": 90.0
+          "y": 100.0
         }
       },
       {
@@ -191,7 +191,7 @@
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 264.0,
-          "y": 99.0
+          "y": 94.0
         },
         "params": 12
       },
@@ -200,7 +200,7 @@
         "name": "WireCrossPoint#1",
         "pos": {
           "x": 229.0,
-          "y": 59.0
+          "y": 54.0
         },
         "params": 1
       },
@@ -208,7 +208,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 174.0,
+          "x": 199.0,
           "y": 179.0
         },
         "params": 12
@@ -217,8 +217,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 164.0,
-          "y": 59.0
+          "x": 149.0,
+          "y": 54.0
         },
         "params": 12
       },
@@ -227,7 +227,7 @@
         "name": "WireCrossPoint#4",
         "pos": {
           "x": 149.0,
-          "y": 9.0
+          "y": 4.0
         },
         "params": 12
       },
@@ -254,7 +254,7 @@
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 199.0,
-          "y": 34.0
+          "y": 29.0
         },
         "params": 1
       },
@@ -263,7 +263,7 @@
         "name": "WireCrossPoint#8",
         "pos": {
           "x": 239.0,
-          "y": 69.0
+          "y": 64.0
         },
         "params": 1
       },
@@ -281,7 +281,7 @@
         "name": "dff12#0",
         "pos": {
           "x": 245.0,
-          "y": 105.0
+          "y": 100.0
         }
       },
       {
@@ -297,7 +297,7 @@
         "name": "nor12#0",
         "pos": {
           "x": 175.0,
-          "y": 45.0
+          "y": 40.0
         }
       },
       {
@@ -305,15 +305,15 @@
         "name": "ram5_12#0",
         "pos": {
           "x": 245.0,
-          "y": 55.0
+          "y": 50.0
         }
       },
       {
         "id": "sel4_12",
         "name": "sel4_12#0",
         "pos": {
-          "x": 135.0,
-          "y": 110.0
+          "x": 130.0,
+          "y": 100.0
         }
       }
     ],
@@ -325,7 +325,7 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "SA"
+          "pinName": "S1"
         },
         "name": "unnamedWire#0",
         "path": []
@@ -337,7 +337,7 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "SB"
+          "pinName": "S2"
         },
         "name": "unnamedWire#1",
         "path": []
@@ -349,7 +349,7 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "SC"
+          "pinName": "S3"
         },
         "name": "unnamedWire#2",
         "path": []
@@ -361,7 +361,7 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "SD"
+          "pinName": "S4"
         },
         "name": "unnamedWire#3",
         "path": []
@@ -383,15 +383,15 @@
           },
           {
             "x": 280.0,
-            "y": 150.0
+            "y": 145.0
           },
           {
             "x": 240.0,
-            "y": 150.0
+            "y": 145.0
           },
           {
             "x": 240.0,
-            "y": 125.0
+            "y": 120.0
           }
         ]
       },
@@ -408,11 +408,11 @@
         "path": [
           {
             "x": 290.0,
-            "y": 125.0
+            "y": 120.0
           },
           {
             "x": 290.0,
-            "y": 100.0
+            "y": 95.0
           }
         ]
       },
@@ -462,12 +462,7 @@
           "pinName": ""
         },
         "name": "unnamedWire#9",
-        "path": [
-          {
-            "x": 150.0,
-            "y": 60.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -482,15 +477,15 @@
         "path": [
           {
             "x": 225.0,
-            "y": 60.0
+            "y": 55.0
           },
           {
             "x": 225.0,
-            "y": 80.0
+            "y": 75.0
           },
           {
             "x": 70.0,
-            "y": 80.0
+            "y": 75.0
           }
         ]
       },
@@ -507,11 +502,11 @@
         "path": [
           {
             "x": 115.0,
-            "y": 95.0
+            "y": 105.0
           },
           {
             "x": 115.0,
-            "y": 35.0
+            "y": 30.0
           }
         ]
       },
@@ -528,11 +523,11 @@
         "path": [
           {
             "x": 120.0,
-            "y": 105.0
+            "y": 115.0
           },
           {
             "x": 120.0,
-            "y": 45.0
+            "y": 40.0
           }
         ]
       },
@@ -549,7 +544,7 @@
         "path": [
           {
             "x": 230.0,
-            "y": 155.0
+            "y": 165.0
           }
         ]
       },
@@ -566,7 +561,7 @@
         "path": [
           {
             "x": 235.0,
-            "y": 165.0
+            "y": 175.0
           },
           {
             "x": 235.0,
@@ -613,7 +608,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#17",
-        "path": []
+        "path": [
+          {
+            "x": 200.0,
+            "y": 130.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -634,13 +634,13 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "C"
+          "pinName": "I3"
         },
         "name": "unnamedWire#19",
         "path": [
           {
-            "x": 185.0,
-            "y": 85.0
+            "x": 160.0,
+            "y": 80.0
           }
         ]
       },
@@ -651,13 +651,13 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "D"
+          "pinName": "I4"
         },
         "name": "unnamedWire#20",
         "path": [
           {
-            "x": 205.0,
-            "y": 100.0
+            "x": 170.0,
+            "y": 95.0
           }
         ]
       },
@@ -668,7 +668,7 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "B"
+          "pinName": "I2"
         },
         "name": "unnamedWire#21",
         "path": []
@@ -716,20 +716,20 @@
         },
         "pin2": {
           "compName": "sel4_12#0",
-          "pinName": "A"
+          "pinName": "I1"
         },
         "name": "unnamedWire#25",
         "path": [
           {
             "x": 125.0,
-            "y": 10.0
+            "y": 5.0
           },
           {
             "x": 125.0,
             "y": 65.0
           },
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 65.0
           }
         ]
@@ -751,7 +751,7 @@
           },
           {
             "x": 50.0,
-            "y": 20.0
+            "y": 15.0
           }
         ]
       },
@@ -765,7 +765,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#27",
-        "path": []
+        "path": [
+          {
+            "x": 175.0,
+            "y": 180.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -891,7 +896,7 @@
         "path": [
           {
             "x": 240.0,
-            "y": 110.0
+            "y": 105.0
           }
         ]
       },
@@ -929,7 +934,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#38",
-        "path": []
+        "path": [
+          {
+            "x": 240.0,
+            "y": 30.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -997,11 +1007,11 @@
         "path": [
           {
             "x": 45.0,
-            "y": 180.0
+            "y": 190.0
           },
           {
             "x": 50.0,
-            "y": 180.0
+            "y": 190.0
           }
         ]
       },
@@ -1018,11 +1028,11 @@
         "path": [
           {
             "x": 60.0,
-            "y": 185.0
+            "y": 195.0
           },
           {
             "x": 75.0,
-            "y": 185.0
+            "y": 195.0
           }
         ]
       },
@@ -1039,11 +1049,11 @@
         "path": [
           {
             "x": 75.0,
-            "y": 180.0
+            "y": 190.0
           },
           {
             "x": 100.0,
-            "y": 180.0
+            "y": 190.0
           }
         ]
       },
@@ -1064,7 +1074,7 @@
           },
           {
             "x": 25.0,
-            "y": 95.0
+            "y": 105.0
           }
         ]
       },
diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
index 160d589..4d49fde 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java
@@ -27,7 +27,7 @@ public class ModelComponentTestbench
        {
                Am2900Loader.setup();
 //             ModelComponent comp = new StrictAm2900MachineDefinition().createNew(model).getAm2900();
-               ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "sel4_12");
+               ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "Am2910");
 
                List<String> inputPinNames = new ArrayList<>();
                List<String> outputPinNames = new ArrayList<>();
Mirror of https://github.com/Mograsim-Team/Mograsim