From aa5e4901442a1003415dab96a486bb8bfbfc934b Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Fri, 6 Sep 2019 00:44:28 +0200 Subject: [PATCH] Reserialized components with default names --- .../Am2904Testbench.json | 54 +- .../logic/model/am2900/components/Am2900.json | 436 +++++------ .../am2900/components/am2901/Am2901.json | 16 +- .../am2900/components/am2904/Am2904.json | 698 +++++++++--------- .../am2900/components/am2904/Am2904MSR.json | 310 ++++---- .../components/am2904/Am2904TestLogic.json | 22 +- .../am2900/components/am2904/Am2904muSR.json | 106 +-- .../model/am2900/components/dff12_we.json | 422 +++++------ .../model/am2900/components/dff16_invwe.json | 478 ++++++------ .../logic/model/am2900/components/dff4.json | 42 +- .../model/am2900/components/dff4_invwe.json | 42 +- .../model/am2900/components/mux1_12.json | 544 +++++++------- .../model/am2900/components/mux1_16.json | 416 +++++------ .../logic/model/am2900/components/mux2.json | 102 +-- .../logic/model/am2900/components/mux2_4.json | 126 ++-- .../logic/model/am2900/components/mux3.json | 82 +- .../logic/model/am2900/components/sel1.json | 24 +- .../ReserializeJSONsSettingUsages.java | 162 +++- 18 files changed, 2113 insertions(+), 1969 deletions(-) diff --git a/net.mograsim.logic.model.am2900/Am2904Testbench.json b/net.mograsim.logic.model.am2900/Am2904Testbench.json index 4875d9c5..eddb94bb 100644 --- a/net.mograsim.logic.model.am2900/Am2904Testbench.json +++ b/net.mograsim.logic.model.am2900/Am2904Testbench.json @@ -7,7 +7,7 @@ "components": [ { "id": "Am2904", - "name": "Am2904", + "name": "Am2904#0", "pos": { "x": 220.0, "y": 175.0 @@ -1125,7 +1125,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_OEY" }, "name": "unnamedWire#0", @@ -1142,7 +1142,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "C" }, "name": "unnamedWire#1", @@ -1159,7 +1159,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_EOVR" }, "pin2": { @@ -1184,7 +1184,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_EN" }, "name": "unnamedWire#11", @@ -1205,7 +1205,7 @@ "pinName": "O" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "I" }, "name": "unnamedWire#12", @@ -1234,7 +1234,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "Cx" }, "name": "unnamedWire#13", @@ -1251,7 +1251,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "YOVR" }, "pin2": { @@ -1267,7 +1267,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "YN" }, "name": "unnamedWire#15", @@ -1292,7 +1292,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "YZ" }, "pin2": { @@ -1309,7 +1309,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "CT" }, "pin2": { @@ -1330,7 +1330,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "C0" }, "pin2": { @@ -1346,7 +1346,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "IZ" }, "name": "unnamedWire#2", @@ -1363,7 +1363,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "SIOn" }, "pin2": { @@ -1396,7 +1396,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "QIOn" }, "name": "unnamedWire#22", @@ -1493,7 +1493,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "IC" }, "pin2": { @@ -1709,7 +1709,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "IN" }, "name": "unnamedWire#4", @@ -1730,7 +1730,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "SIO0" }, "name": "unnamedWire#40", @@ -1743,7 +1743,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "QIO0" }, "pin2": { @@ -1856,7 +1856,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "IOVR" }, "pin2": { @@ -2001,7 +2001,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_CEM" }, "name": "unnamedWire#6", @@ -2129,7 +2129,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "YC" }, "pin2": { @@ -2163,7 +2163,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_CEmu" }, "pin2": { @@ -2247,7 +2247,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_SE" }, "pin2": { @@ -2272,7 +2272,7 @@ "pinName": "" }, "pin2": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_OECT" }, "name": "unnamedWire#75", @@ -2297,7 +2297,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_EZ" }, "pin2": { @@ -2309,7 +2309,7 @@ }, { "pin1": { - "compName": "Am2904", + "compName": "Am2904#0", "pinName": "_EC" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index 8b6e7fbe..61e5e22c 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -5,21 +5,9 @@ "innerScale": 0.4, "submodel": { "components": [ - { - "id": "Clock", - "name": "Clock#0", - "pos": { - "x": 155.0, - "y": 246.0 - }, - "params": { - "delta": 1000, - "orientation": "DOWN" - } - }, { "id": "Am2901", - "name": "DeserializedSubmodelComponent#0", + "name": "Am2901#0", "pos": { "x": 420.0, "y": 240.0 @@ -27,47 +15,15 @@ }, { "id": "Am2901", - "name": "DeserializedSubmodelComponent#1", + "name": "Am2901#1", "pos": { "x": 485.0, "y": 240.0 } }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#10", - "pos": { - "x": 320.0, - "y": 15.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#11", - "pos": { - "x": 320.0, - "y": 120.0 - } - }, - { - "id": "dff12_we", - "name": "DeserializedSubmodelComponent#12", - "pos": { - "x": 290.0, - "y": 485.0 - } - }, - { - "id": "mux1_12", - "name": "DeserializedSubmodelComponent#13", - "pos": { - "x": 170.0, - "y": 495.0 - } - }, { "id": "Am2901", - "name": "DeserializedSubmodelComponent#2", + "name": "Am2901#2", "pos": { "x": 550.0, "y": 240.0 @@ -75,7 +31,7 @@ }, { "id": "Am2901", - "name": "DeserializedSubmodelComponent#3", + "name": "Am2901#3", "pos": { "x": 615.0, "y": 240.0 @@ -83,7 +39,7 @@ }, { "id": "Am2904", - "name": "DeserializedSubmodelComponent#4", + "name": "Am2904#0", "pos": { "x": 240.0, "y": 241.0 @@ -91,42 +47,22 @@ }, { "id": "Am2910", - "name": "DeserializedSubmodelComponent#5", + "name": "Am2910#0", "pos": { "x": 100.0, "y": 351.0 } }, { - "id": "and", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 665.0, - "y": 501.0 - } - }, - { - "id": "and", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 550.0, - "y": 541.0 - } - }, - { - "id": "and", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 730.0, - "y": 526.0 - } - }, - { - "id": "dff16_invwe", - "name": "DeserializedSubmodelComponent#9", + "id": "Clock", + "name": "Clock#0", "pos": { - "x": 135.0, - "y": 106.0 + "x": 155.0, + "y": 246.0 + }, + "params": { + "delta": 1000, + "orientation": "DOWN" } }, { @@ -157,14 +93,14 @@ }, { "id": "FixedOutput", - "name": "FixedOutput#11", + "name": "FixedOutput#2", "pos": { - "x": 210.0, - "y": 281.0 + "x": 70.0, + "y": 346.0 }, "params": { "bits": [ - "ZERO" + "ONE" ] } }, @@ -172,8 +108,8 @@ "id": "FixedOutput", "name": "FixedOutput#3", "pos": { - "x": 70.0, - "y": 346.0 + "x": 175.0, + "y": 396.0 }, "params": { "bits": [ @@ -183,23 +119,23 @@ }, { "id": "FixedOutput", - "name": "FixedOutput#5", + "name": "FixedOutput#4", "pos": { - "x": 175.0, - "y": 396.0 + "x": 140.0, + "y": 431.0 }, "params": { "bits": [ - "ONE" + "ZERO" ] } }, { "id": "FixedOutput", - "name": "FixedOutput#7", + "name": "FixedOutput#5", "pos": { - "x": 140.0, - "y": 431.0 + "x": 210.0, + "y": 316.0 }, "params": { "bits": [ @@ -209,10 +145,10 @@ }, { "id": "FixedOutput", - "name": "FixedOutput#9", + "name": "FixedOutput#6", "pos": { "x": 210.0, - "y": 316.0 + "y": 281.0 }, "params": { "bits": [ @@ -517,6 +453,46 @@ }, "params": 4 }, + { + "id": "and", + "name": "and#0", + "pos": { + "x": 665.0, + "y": 501.0 + } + }, + { + "id": "and", + "name": "and#1", + "pos": { + "x": 550.0, + "y": 541.0 + } + }, + { + "id": "and", + "name": "and#2", + "pos": { + "x": 730.0, + "y": 526.0 + } + }, + { + "id": "dff12_we", + "name": "dff12_we#0", + "pos": { + "x": 290.0, + "y": 485.0 + } + }, + { + "id": "dff16_invwe", + "name": "dff16_invwe#0", + "pos": { + "x": 135.0, + "y": 106.0 + } + }, { "id": "inc12", "name": "inc12#0", @@ -524,16 +500,40 @@ "x": 245.0, "y": 525.0 } + }, + { + "id": "mux1_12", + "name": "mux1_12#0", + "pos": { + "x": 170.0, + "y": 495.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 320.0, + "y": 15.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#1", + "pos": { + "x": 320.0, + "y": 120.0 + } } ], "wires": [ { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "CT" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "Am2910#0", "pinName": "_CC" }, "name": "unnamedWire#0", @@ -541,11 +541,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "Qn+3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "Qn" }, "name": "unnamedWire#1", @@ -553,11 +553,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "QIOn" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "Qn+3" }, "name": "unnamedWire#10", @@ -565,7 +565,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "B0" }, "pin2": { @@ -581,7 +581,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "A3" }, "name": "unnamedWire#101", @@ -589,7 +589,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "A2" }, "pin2": { @@ -605,7 +605,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "A1" }, "name": "unnamedWire#103", @@ -613,7 +613,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "A0" }, "pin2": { @@ -629,7 +629,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "A0" }, "name": "unnamedWire#105", @@ -637,7 +637,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "A1" }, "pin2": { @@ -653,7 +653,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "A2" }, "name": "unnamedWire#107", @@ -661,7 +661,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "A3" }, "pin2": { @@ -677,7 +677,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "B0" }, "name": "unnamedWire#109", @@ -685,11 +685,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "IN" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "F3" }, "name": "unnamedWire#11", @@ -697,7 +697,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "B1" }, "pin2": { @@ -713,7 +713,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "B2" }, "name": "unnamedWire#111", @@ -721,7 +721,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "B3" }, "pin2": { @@ -817,11 +817,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "F\u003d0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "and#1", "pinName": "B" }, "name": "unnamedWire#12", @@ -917,7 +917,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff12_we#0", "pinName": "WE" }, "name": "unnamedWire#127", @@ -929,7 +929,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff12_we#0", "pinName": "D" }, "name": "unnamedWire#128", @@ -941,7 +941,7 @@ "pinName": "A" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1_12#0", "pinName": "Y" }, "name": "unnamedWire#129", @@ -949,11 +949,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "F\u003d0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "and#1", "pinName": "A" }, "name": "unnamedWire#13", @@ -1009,7 +1009,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1_12#0", "pinName": "I1" }, "pin2": { @@ -1021,7 +1021,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1_12#0", "pinName": "S" }, "pin2": { @@ -1057,7 +1057,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff12_we#0", "pinName": "Q" }, "pin2": { @@ -1069,11 +1069,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "and#1", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "and#2", "pinName": "B" }, "name": "unnamedWire#14", @@ -1081,11 +1081,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "and#2", "pinName": "A" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "and#0", "pinName": "Y" }, "name": "unnamedWire#15", @@ -1093,11 +1093,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "and#0", "pinName": "B" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "F\u003d0" }, "name": "unnamedWire#16", @@ -1105,11 +1105,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "F\u003d0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#17", @@ -1117,11 +1117,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "and#2", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "IZ" }, "name": "unnamedWire#18", @@ -1129,11 +1129,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "OVR" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "IOVR" }, "name": "unnamedWire#19", @@ -1141,11 +1141,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "RAMn+3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "RAMn" }, "name": "unnamedWire#2", @@ -1153,11 +1153,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "Cn+4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "IC" }, "name": "unnamedWire#20", @@ -1165,11 +1165,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "Cn+4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "Cn" }, "name": "unnamedWire#21", @@ -1177,11 +1177,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "Cn+4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "Cn" }, "name": "unnamedWire#22", @@ -1189,11 +1189,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "Cn+4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "Cn" }, "name": "unnamedWire#23", @@ -1201,7 +1201,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "C" }, "pin2": { @@ -1229,7 +1229,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "C" }, "name": "unnamedWire#26", @@ -1237,7 +1237,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "C" }, "pin2": { @@ -1261,7 +1261,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "C" }, "pin2": { @@ -1273,11 +1273,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "Qn+3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "Qn" }, "name": "unnamedWire#3", @@ -1301,7 +1301,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "C" }, "name": "unnamedWire#31", @@ -1321,11 +1321,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "Cn" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "C0" }, "name": "unnamedWire#33", @@ -1333,7 +1333,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "Am2910#0", "pinName": "C" }, "pin2": { @@ -1349,7 +1349,7 @@ "pinName": "out" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "_OECT" }, "name": "unnamedWire#35", @@ -1357,11 +1357,11 @@ }, { "pin1": { - "compName": "FixedOutput#3", + "compName": "FixedOutput#2", "pinName": "out" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "Am2910#0", "pinName": "_RLD" }, "name": "unnamedWire#36", @@ -1369,11 +1369,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "Am2910#0", "pinName": "CI" }, "pin2": { - "compName": "FixedOutput#5", + "compName": "FixedOutput#3", "pinName": "out" }, "name": "unnamedWire#37", @@ -1381,11 +1381,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "Am2910#0", "pinName": "_OE" }, "pin2": { - "compName": "FixedOutput#7", + "compName": "FixedOutput#4", "pinName": "out" }, "name": "unnamedWire#38", @@ -1393,11 +1393,11 @@ }, { "pin1": { - "compName": "FixedOutput#9", + "compName": "FixedOutput#5", "pinName": "out" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "_SE" }, "name": "unnamedWire#39", @@ -1405,11 +1405,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "RAMn" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "RAMn+3" }, "name": "unnamedWire#4", @@ -1417,7 +1417,7 @@ }, { "pin1": { - "compName": "FixedOutput#11", + "compName": "FixedOutput#6", "pinName": "out" }, "pin2": { @@ -1429,7 +1429,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "_EZ" }, "pin2": { @@ -1445,7 +1445,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "_EOVR" }, "name": "unnamedWire#42", @@ -1453,7 +1453,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "_EC" }, "pin2": { @@ -1469,7 +1469,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "_EN" }, "name": "unnamedWire#44", @@ -1477,7 +1477,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff16_invwe#0", "pinName": "Q" }, "pin2": { @@ -1537,11 +1537,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "RAMn" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "RAMn+3" }, "name": "unnamedWire#5", @@ -1679,11 +1679,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "Qn+3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "Qn" }, "name": "unnamedWire#6", @@ -1731,7 +1731,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "I0_1" }, "name": "unnamedWire#63", @@ -1739,7 +1739,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "I0_2" }, "pin2": { @@ -1755,7 +1755,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#65", @@ -1767,7 +1767,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#66", @@ -1779,7 +1779,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "I0_1" }, "name": "unnamedWire#67", @@ -1787,7 +1787,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "I0_2" }, "pin2": { @@ -1803,7 +1803,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "I0_3" }, "name": "unnamedWire#69", @@ -1811,11 +1811,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "Qn" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "QIO0" }, "name": "unnamedWire#7", @@ -1827,7 +1827,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "I0_4" }, "name": "unnamedWire#70", @@ -1859,7 +1859,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { @@ -1875,7 +1875,7 @@ "pinName": "I2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "Y2" }, "name": "unnamedWire#74", @@ -1883,7 +1883,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { @@ -1899,7 +1899,7 @@ "pinName": "I0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "mux1_4#0", "pinName": "Y4" }, "name": "unnamedWire#76", @@ -1907,7 +1907,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "Y1" }, "pin2": { @@ -1923,7 +1923,7 @@ "pinName": "I2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "Y2" }, "name": "unnamedWire#78", @@ -1931,7 +1931,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "Y3" }, "pin2": { @@ -1943,11 +1943,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "SIO0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "RAMn" }, "name": "unnamedWire#8", @@ -1959,7 +1959,7 @@ "pinName": "I0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1_4#1", "pinName": "Y4" }, "name": "unnamedWire#80", @@ -1967,7 +1967,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "B3" }, "pin2": { @@ -1983,7 +1983,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "B2" }, "name": "unnamedWire#82", @@ -1991,7 +1991,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "B1" }, "pin2": { @@ -2007,7 +2007,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "B0" }, "name": "unnamedWire#84", @@ -2015,7 +2015,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "A3" }, "pin2": { @@ -2031,7 +2031,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "A2" }, "name": "unnamedWire#86", @@ -2039,7 +2039,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "A1" }, "pin2": { @@ -2051,7 +2051,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2901#0", "pinName": "A0" }, "pin2": { @@ -2067,7 +2067,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "A0" }, "name": "unnamedWire#89", @@ -2075,11 +2075,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "Am2904#0", "pinName": "SIOn" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "Am2901#3", "pinName": "RAMn+3" }, "name": "unnamedWire#9", @@ -2087,7 +2087,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "A1" }, "pin2": { @@ -2103,7 +2103,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "A2" }, "name": "unnamedWire#91", @@ -2111,7 +2111,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "A3" }, "pin2": { @@ -2123,7 +2123,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "B0" }, "pin2": { @@ -2139,7 +2139,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "B1" }, "name": "unnamedWire#94", @@ -2147,7 +2147,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "B2" }, "pin2": { @@ -2163,7 +2163,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2901#1", "pinName": "B3" }, "name": "unnamedWire#96", @@ -2175,7 +2175,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "B3" }, "name": "unnamedWire#97", @@ -2183,7 +2183,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "B2" }, "pin2": { @@ -2199,7 +2199,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "Am2901#2", "pinName": "B1" }, "name": "unnamedWire#99", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index e3e7243b..2dd6a59d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -381,7 +381,7 @@ }, { "id": "TriStateBuffer", - "name": "TriStateBuffer#3", + "name": "TriStateBuffer#2", "pos": { "x": 300.0, "y": 2515.0 @@ -393,7 +393,7 @@ }, { "id": "TriStateBuffer", - "name": "TriStateBuffer#4", + "name": "TriStateBuffer#3", "pos": { "x": 300.0, "y": 2310.0 @@ -1480,7 +1480,7 @@ "pinName": "" }, "pin2": { - "compName": "TriStateBuffer#3", + "compName": "TriStateBuffer#2", "pinName": "IN" }, "name": "unnamedWire#135", @@ -1855,7 +1855,7 @@ }, { "pin1": { - "compName": "TriStateBuffer#3", + "compName": "TriStateBuffer#2", "pinName": "OUT" }, "pin2": { @@ -2098,7 +2098,7 @@ }, { "pin1": { - "compName": "TriStateBuffer#3", + "compName": "TriStateBuffer#2", "pinName": "EN" }, "pin2": { @@ -2114,7 +2114,7 @@ "pinName": "" }, "pin2": { - "compName": "TriStateBuffer#4", + "compName": "TriStateBuffer#3", "pinName": "IN" }, "name": "unnamedWire#171", @@ -3585,7 +3585,7 @@ }, { "pin1": { - "compName": "TriStateBuffer#4", + "compName": "TriStateBuffer#3", "pinName": "OUT" }, "pin2": { @@ -3601,7 +3601,7 @@ "pinName": "" }, "pin2": { - "compName": "TriStateBuffer#4", + "compName": "TriStateBuffer#3", "pinName": "EN" }, "name": "unnamedWire#95", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json index 64a84788..50cdcfb3 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json @@ -240,6 +240,14 @@ "innerScale": 0.2, "submodel": { "components": [ + { + "id": "Am2904MSR", + "name": "Am2904MSR#0", + "pos": { + "x": 225.0, + "y": 95.0 + } + }, { "id": "Am2904RegCTInstrDecode", "name": "Am2904RegCTInstrDecode#0", @@ -256,6 +264,22 @@ "y": 360.0 } }, + { + "id": "Am2904TestLogic", + "name": "Am2904TestLogic#0", + "pos": { + "x": 225.0, + "y": 340.0 + } + }, + { + "id": "Am2904muSR", + "name": "Am2904muSR#0", + "pos": { + "x": 270.0, + "y": 250.0 + } + }, { "id": "BitDisplay", "name": "BitDisplay#0", @@ -292,182 +316,6 @@ }, "params": 1 }, - { - "id": "Am2904MSR", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 225.0, - "y": 95.0 - } - }, - { - "id": "Am2904muSR", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 270.0, - "y": 250.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#10", - "pos": { - "x": 455.0, - "y": 355.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#11", - "pos": { - "x": 265.0, - "y": 515.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#12", - "pos": { - "x": 315.0, - "y": 505.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#13", - "pos": { - "x": 365.0, - "y": 485.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#14", - "pos": { - "x": 415.0, - "y": 465.0 - } - }, - { - "id": "mux2", - "name": "DeserializedSubmodelComponent#15", - "pos": { - "x": 435.0, - "y": 575.0 - } - }, - { - "id": "mux2", - "name": "DeserializedSubmodelComponent#16", - "pos": { - "x": 435.0, - "y": 655.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#17", - "pos": { - "x": 190.0, - "y": 460.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#18", - "pos": { - "x": 135.0, - "y": 470.0 - } - }, - { - "id": "and", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 380.0, - "y": 125.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#21", - "pos": { - "x": 250.0, - "y": 820.0 - } - }, - { - "id": "mux2", - "name": "DeserializedSubmodelComponent#22", - "pos": { - "x": 120.0, - "y": 720.0 - } - }, - { - "id": "mux3", - "name": "DeserializedSubmodelComponent#23", - "pos": { - "x": 300.0, - "y": 715.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#3", - "pos": { - "x": 470.0, - "y": 160.0 - } - }, - { - "id": "not4", - "name": "DeserializedSubmodelComponent#4", - "pos": { - "x": 135.0, - "y": 40.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#5", - "pos": { - "x": 415.0, - "y": 210.0 - } - }, - { - "id": "Am2904TestLogic", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 225.0, - "y": 340.0 - } - }, - { - "id": "mux3", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 300.0, - "y": 310.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 495.0, - "y": 295.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#9", - "pos": { - "x": 450.0, - "y": 310.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -542,7 +390,7 @@ }, { "id": "NandGate", - "name": "NandGate#12", + "name": "NandGate#11", "pos": { "x": 540.0, "y": 265.0 @@ -1037,25 +885,25 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#29", "pos": { - "x": 335.0, - "y": 270.0 + "x": 550.0, + "y": 570.0 }, - "params": 4 + "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#30", + "name": "WireCrossPoint#3", "pos": { - "x": 550.0, - "y": 570.0 + "x": 335.0, + "y": 270.0 }, - "params": 1 + "params": 4 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#32", + "name": "WireCrossPoint#30", "pos": { "x": 85.0, "y": 590.0 @@ -1064,7 +912,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#33", + "name": "WireCrossPoint#31", "pos": { "x": 530.0, "y": 270.0 @@ -1124,6 +972,158 @@ "y": 200.0 }, "params": 1 + }, + { + "id": "and", + "name": "and#0", + "pos": { + "x": 380.0, + "y": 125.0 + } + }, + { + "id": "mux1", + "name": "mux1#0", + "pos": { + "x": 450.0, + "y": 310.0 + } + }, + { + "id": "mux1", + "name": "mux1#1", + "pos": { + "x": 265.0, + "y": 515.0 + } + }, + { + "id": "mux1", + "name": "mux1#2", + "pos": { + "x": 365.0, + "y": 485.0 + } + }, + { + "id": "mux1", + "name": "mux1#3", + "pos": { + "x": 415.0, + "y": 465.0 + } + }, + { + "id": "mux1", + "name": "mux1#4", + "pos": { + "x": 190.0, + "y": 460.0 + } + }, + { + "id": "mux1", + "name": "mux1#5", + "pos": { + "x": 135.0, + "y": 470.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 470.0, + "y": 160.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#1", + "pos": { + "x": 415.0, + "y": 210.0 + } + }, + { + "id": "mux2", + "name": "mux2#0", + "pos": { + "x": 435.0, + "y": 575.0 + } + }, + { + "id": "mux2", + "name": "mux2#1", + "pos": { + "x": 435.0, + "y": 655.0 + } + }, + { + "id": "mux2", + "name": "mux2#2", + "pos": { + "x": 120.0, + "y": 720.0 + } + }, + { + "id": "mux3", + "name": "mux3#0", + "pos": { + "x": 300.0, + "y": 310.0 + } + }, + { + "id": "mux3", + "name": "mux3#1", + "pos": { + "x": 300.0, + "y": 715.0 + } + }, + { + "id": "not4", + "name": "not4#0", + "pos": { + "x": 135.0, + "y": 40.0 + } + }, + { + "id": "xor", + "name": "xor#0", + "pos": { + "x": 495.0, + "y": 295.0 + } + }, + { + "id": "xor", + "name": "xor#1", + "pos": { + "x": 455.0, + "y": 355.0 + } + }, + { + "id": "xor", + "name": "xor#2", + "pos": { + "x": 315.0, + "y": 505.0 + } + }, + { + "id": "xor", + "name": "xor#3", + "pos": { + "x": 250.0, + "y": 820.0 + } } ], "wires": [ @@ -1154,7 +1154,7 @@ "pinName": "muSR_MUX" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "MUX" }, "name": "unnamedWire#1", @@ -1178,7 +1178,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#100", @@ -1202,7 +1202,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I0_1" }, "name": "unnamedWire#102", @@ -1210,7 +1210,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I0_2" }, "pin2": { @@ -1226,7 +1226,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I0_3" }, "name": "unnamedWire#104", @@ -1234,7 +1234,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I0_4" }, "pin2": { @@ -1262,7 +1262,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I1_4" }, "name": "unnamedWire#107", @@ -1270,7 +1270,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I1_3" }, "pin2": { @@ -1286,7 +1286,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I1_2" }, "name": "unnamedWire#109", @@ -1306,7 +1306,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "I1_1" }, "pin2": { @@ -1346,7 +1346,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "I" }, "name": "unnamedWire#113", @@ -1354,11 +1354,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y111" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I111" }, "name": "unnamedWire#114", @@ -1366,11 +1366,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I110" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y110" }, "name": "unnamedWire#115", @@ -1378,11 +1378,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y101" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I101" }, "name": "unnamedWire#116", @@ -1390,11 +1390,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I100" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y100" }, "name": "unnamedWire#117", @@ -1402,11 +1402,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y011" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I011" }, "name": "unnamedWire#118", @@ -1414,11 +1414,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y010" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I010" }, "name": "unnamedWire#119", @@ -1438,11 +1438,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I001" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y001" }, "name": "unnamedWire#120", @@ -1450,11 +1450,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "Am2904TestLogic#0", "pinName": "Y000" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "I000" }, "name": "unnamedWire#121", @@ -1462,7 +1462,7 @@ }, { "pin1": { - "compName": "NandGate#12", + "compName": "NandGate#11", "pinName": "Y" }, "pin2": { @@ -1474,11 +1474,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "mux1#0", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "xor#0", "pinName": "B" }, "name": "unnamedWire#123", @@ -1502,7 +1502,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "S0" }, "name": "unnamedWire#125", @@ -1510,7 +1510,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "S1" }, "pin2": { @@ -1526,7 +1526,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "S2" }, "name": "unnamedWire#127", @@ -1538,7 +1538,7 @@ "pinName": "CT_EXP" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "mux1#0", "pinName": "S0" }, "name": "unnamedWire#128", @@ -1546,11 +1546,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux3#0", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "mux1#0", "pinName": "I0" }, "name": "unnamedWire#129", @@ -1570,7 +1570,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "xor#0", "pinName": "A" }, "pin2": { @@ -1582,11 +1582,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "xor#1", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "mux1#0", "pinName": "I1" }, "name": "unnamedWire#131", @@ -1598,7 +1598,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "I" }, "name": "unnamedWire#132", @@ -1646,7 +1646,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "M" }, "name": "unnamedWire#136", @@ -1670,7 +1670,7 @@ "pinName": "OEN" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#138", @@ -1738,7 +1738,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1#1", "pinName": "I1" }, "pin2": { @@ -1762,7 +1762,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1#1", "pinName": "I0" }, "pin2": { @@ -1778,7 +1778,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1#1", "pinName": "S0" }, "name": "unnamedWire#146", @@ -1786,11 +1786,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "mux1#1", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "xor#2", "pinName": "B" }, "name": "unnamedWire#147", @@ -1798,7 +1798,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "xor#2", "pinName": "A" }, "pin2": { @@ -1838,7 +1838,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1#2", "pinName": "S0" }, "name": "unnamedWire#150", @@ -1846,11 +1846,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "xor#2", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1#2", "pinName": "I1" }, "name": "unnamedWire#151", @@ -1858,7 +1858,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1#2", "pinName": "I0" }, "pin2": { @@ -1870,11 +1870,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "mux1#2", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "mux1#3", "pinName": "I1" }, "name": "unnamedWire#153", @@ -1882,7 +1882,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "mux1#3", "pinName": "I0" }, "pin2": { @@ -1894,7 +1894,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "mux1#3", "pinName": "S0" }, "pin2": { @@ -1906,7 +1906,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "mux1#3", "pinName": "Y" }, "pin2": { @@ -2039,7 +2039,7 @@ "pinName": "IN" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "Y" }, "name": "unnamedWire#165", @@ -2063,7 +2063,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "I00" }, "name": "unnamedWire#167", @@ -2075,7 +2075,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "S1" }, "name": "unnamedWire#168", @@ -2083,7 +2083,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "S0" }, "pin2": { @@ -2111,7 +2111,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "I01" }, "name": "unnamedWire#170", @@ -2123,7 +2123,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "I10" }, "name": "unnamedWire#171", @@ -2159,7 +2159,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "S0" }, "name": "unnamedWire#174", @@ -2167,7 +2167,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "S1" }, "pin2": { @@ -2183,7 +2183,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "I00" }, "name": "unnamedWire#176", @@ -2191,7 +2191,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "Y" }, "pin2": { @@ -2219,7 +2219,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "I01" }, "name": "unnamedWire#179", @@ -2243,7 +2243,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "I10" }, "name": "unnamedWire#180", @@ -2255,7 +2255,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux2#1", "pinName": "I11" }, "name": "unnamedWire#181", @@ -2263,7 +2263,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "mux2#0", "pinName": "I11" }, "pin2": { @@ -2291,7 +2291,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "S0" }, "name": "unnamedWire#184", @@ -2315,7 +2315,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I000" }, "name": "unnamedWire#186", @@ -2323,7 +2323,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I001" }, "pin2": { @@ -2351,7 +2351,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "S2" }, "name": "unnamedWire#189", @@ -2375,7 +2375,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "S1" }, "name": "unnamedWire#190", @@ -2383,7 +2383,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I010" }, "pin2": { @@ -2399,7 +2399,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I011" }, "name": "unnamedWire#192", @@ -2407,7 +2407,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I100" }, "pin2": { @@ -2419,11 +2419,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#21", + "compName": "xor#3", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I111" }, "name": "unnamedWire#194", @@ -2443,7 +2443,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I110" }, "pin2": { @@ -2455,7 +2455,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "I01" }, "pin2": { @@ -2467,7 +2467,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "I10" }, "pin2": { @@ -2483,7 +2483,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "I101" }, "name": "unnamedWire#199", @@ -2495,7 +2495,7 @@ "pinName": "muSR_OVRRET" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "OVRRET" }, "name": "unnamedWire#2", @@ -2519,7 +2519,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "xor#1", "pinName": "B" }, "name": "unnamedWire#200", @@ -2531,7 +2531,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "I11" }, "name": "unnamedWire#201", @@ -2539,7 +2539,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#32", + "compName": "WireCrossPoint#30", "pinName": "" }, "pin2": { @@ -2555,7 +2555,7 @@ "pinName": "OE0" }, "pin2": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#29", "pinName": "" }, "name": "unnamedWire#203", @@ -2567,7 +2567,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "xor#1", "pinName": "A" }, "name": "unnamedWire#204", @@ -2579,7 +2579,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#21", + "compName": "xor#3", "pinName": "A" }, "name": "unnamedWire#205", @@ -2587,7 +2587,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#21", + "compName": "xor#3", "pinName": "B" }, "pin2": { @@ -2599,7 +2599,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "Y" }, "pin2": { @@ -2615,7 +2615,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "S1" }, "name": "unnamedWire#208", @@ -2627,7 +2627,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "S0" }, "name": "unnamedWire#209", @@ -2639,7 +2639,7 @@ "pinName": "muSR_CINV" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "CINV" }, "name": "unnamedWire#21", @@ -2663,7 +2663,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#22", + "compName": "mux2#2", "pinName": "I00" }, "name": "unnamedWire#211", @@ -2675,7 +2675,7 @@ "pinName": "IN" }, "pin2": { - "compName": "DeserializedSubmodelComponent#23", + "compName": "mux3#1", "pinName": "Y" }, "name": "unnamedWire#212", @@ -2699,7 +2699,7 @@ "pinName": "EN" }, "pin2": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#29", "pinName": "" }, "name": "unnamedWire#214", @@ -2707,7 +2707,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#29", "pinName": "" }, "pin2": { @@ -2723,7 +2723,7 @@ "pinName": "EN" }, "pin2": { - "compName": "WireCrossPoint#32", + "compName": "WireCrossPoint#30", "pinName": "" }, "name": "unnamedWire#218", @@ -2731,7 +2731,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#32", + "compName": "WireCrossPoint#30", "pinName": "" }, "pin2": { @@ -2755,11 +2755,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#18", + "compName": "mux1#5", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1#4", "pinName": "I0" }, "name": "unnamedWire#221", @@ -2767,11 +2767,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1#4", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "COVD_V" }, "name": "unnamedWire#222", @@ -2779,7 +2779,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1#4", "pinName": "I1" }, "pin2": { @@ -2791,7 +2791,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#18", + "compName": "mux1#5", "pinName": "I0" }, "pin2": { @@ -2807,7 +2807,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#18", + "compName": "mux1#5", "pinName": "I1" }, "name": "unnamedWire#225", @@ -2831,7 +2831,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#18", + "compName": "mux1#5", "pinName": "S0" }, "name": "unnamedWire#227", @@ -2843,7 +2843,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1#4", "pinName": "S0" }, "name": "unnamedWire#228", @@ -2867,7 +2867,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "I" }, "name": "unnamedWire#23", @@ -2911,11 +2911,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#33", + "compName": "WireCrossPoint#31", "pinName": "" }, "pin2": { - "compName": "NandGate#12", + "compName": "NandGate#11", "pinName": "A" }, "name": "unnamedWire#233", @@ -2923,11 +2923,11 @@ }, { "pin1": { - "compName": "NandGate#12", + "compName": "NandGate#11", "pinName": "B" }, "pin2": { - "compName": "WireCrossPoint#33", + "compName": "WireCrossPoint#31", "pinName": "" }, "name": "unnamedWire#234", @@ -2935,7 +2935,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#33", + "compName": "WireCrossPoint#31", "pinName": "" }, "pin2": { @@ -2963,7 +2963,7 @@ "pinName": "IN" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "xor#0", "pinName": "Y" }, "name": "unnamedWire#237", @@ -2983,7 +2983,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "Q" }, "pin2": { @@ -3007,7 +3007,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "Q" }, "pin2": { @@ -3023,7 +3023,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "mu" }, "name": "unnamedWire#28", @@ -3035,7 +3035,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "C" }, "name": "unnamedWire#29", @@ -3059,7 +3059,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "C" }, "name": "unnamedWire#30", @@ -3071,7 +3071,7 @@ "pinName": "MSR_MUX" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "MUX" }, "name": "unnamedWire#31", @@ -3083,7 +3083,7 @@ "pinName": "MC_EN" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "COVD_EN" }, "name": "unnamedWire#32", @@ -3227,7 +3227,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "_EOVR" }, "name": "unnamedWire#43", @@ -3239,7 +3239,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "_EN" }, "name": "unnamedWire#44", @@ -3247,7 +3247,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "_EC" }, "pin2": { @@ -3263,7 +3263,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "Am2904muSR#0", "pinName": "_EZ" }, "name": "unnamedWire#46", @@ -3371,7 +3371,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "Y" }, "name": "unnamedWire#54", @@ -3527,7 +3527,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "_EOVR" }, "name": "unnamedWire#66", @@ -3535,7 +3535,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "_EN" }, "pin2": { @@ -3551,7 +3551,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "_EC" }, "name": "unnamedWire#68", @@ -3563,7 +3563,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "Am2904MSR#0", "pinName": "_EZ" }, "name": "unnamedWire#69", @@ -3595,7 +3595,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "Y1" }, "pin2": { @@ -3611,7 +3611,7 @@ "pinName": "B" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "Y2" }, "name": "unnamedWire#72", @@ -3619,7 +3619,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "Y3" }, "pin2": { @@ -3631,7 +3631,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "Y4" }, "pin2": { @@ -3643,7 +3643,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "A1" }, "pin2": { @@ -3659,7 +3659,7 @@ "pinName": "_EC" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "A2" }, "name": "unnamedWire#76", @@ -3667,7 +3667,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "A3" }, "pin2": { @@ -3683,7 +3683,7 @@ "pinName": "_EOVR" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "not4#0", "pinName": "A4" }, "name": "unnamedWire#78", @@ -3755,7 +3755,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#83", @@ -3763,7 +3763,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "and#0", "pinName": "Y" }, "pin2": { @@ -3775,11 +3775,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#85", @@ -3787,11 +3787,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I1_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "Y2" }, "name": "unnamedWire#86", @@ -3799,11 +3799,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#87", @@ -3811,11 +3811,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I1_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "Y4" }, "name": "unnamedWire#88", @@ -3827,7 +3827,7 @@ "pinName": "I0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "Y4" }, "name": "unnamedWire#89", @@ -3847,7 +3847,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { @@ -3863,7 +3863,7 @@ "pinName": "I2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "Y2" }, "name": "unnamedWire#91", @@ -3871,7 +3871,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { @@ -3911,7 +3911,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#1", "pinName": "S0" }, "name": "unnamedWire#95", @@ -3923,7 +3923,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#96", @@ -3935,7 +3935,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I0_1" }, "name": "unnamedWire#97", @@ -3947,7 +3947,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#98", @@ -3955,7 +3955,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux1_4#0", "pinName": "I0_3" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index eff06115..7d890990 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -114,78 +114,6 @@ "innerScale": 0.1, "submodel": { "components": [ - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 55.0, - "y": 110.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 35.0, - "y": 250.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 150.0, - "y": 280.0 - } - }, - { - "id": "not4", - "name": "DeserializedSubmodelComponent#3", - "pos": { - "x": 100.0, - "y": 330.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#4", - "pos": { - "x": 110.0, - "y": 60.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#5", - "pos": { - "x": 200.0, - "y": 230.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 250.0, - "y": 180.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 325.0, - "y": 290.0 - } - }, - { - "id": "and", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 380.0, - "y": 85.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -393,6 +321,14 @@ }, "params": 1 }, + { + "id": "and", + "name": "and#0", + "pos": { + "x": 380.0, + "y": 85.0 + } + }, { "id": "dff4_finewe", "name": "dff4_finewe#0", @@ -400,6 +336,70 @@ "x": 375.0, "y": 170.0 } + }, + { + "id": "mux1", + "name": "mux1#0", + "pos": { + "x": 325.0, + "y": 290.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 55.0, + "y": 110.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#1", + "pos": { + "x": 150.0, + "y": 280.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#2", + "pos": { + "x": 110.0, + "y": 60.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#3", + "pos": { + "x": 200.0, + "y": 230.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#4", + "pos": { + "x": 250.0, + "y": 180.0 + } + }, + { + "id": "not4", + "name": "not4#0", + "pos": { + "x": 100.0, + "y": 330.0 + } + }, + { + "id": "xor", + "name": "xor#0", + "pos": { + "x": 35.0, + "y": 250.0 + } } ], "wires": [ @@ -483,7 +483,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, "pin2": { @@ -508,7 +508,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#13", @@ -529,7 +529,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#14", @@ -550,7 +550,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#15", @@ -571,7 +571,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#16", @@ -579,7 +579,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "pin2": { @@ -595,7 +595,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#18", @@ -603,7 +603,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "pin2": { @@ -685,7 +685,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "xor#0", "pinName": "B" }, "name": "unnamedWire#23", @@ -727,7 +727,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "xor#0", "pinName": "A" }, "pin2": { @@ -791,7 +791,7 @@ "pinName": "_EC" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#3", @@ -812,11 +812,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I1_1" }, "name": "unnamedWire#30", @@ -824,11 +824,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I1_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "Y2" }, "name": "unnamedWire#31", @@ -836,11 +836,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I1_3" }, "name": "unnamedWire#32", @@ -848,11 +848,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I1_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "Y4" }, "name": "unnamedWire#33", @@ -864,7 +864,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "A1" }, "name": "unnamedWire#34", @@ -910,7 +910,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "A3" }, "name": "unnamedWire#36", @@ -964,7 +964,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I0_4" }, "pin2": { @@ -1010,7 +1010,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I0_2" }, "name": "unnamedWire#40", @@ -1023,7 +1023,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I0_3" }, "pin2": { @@ -1060,7 +1060,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "S0" }, "name": "unnamedWire#43", @@ -1068,11 +1068,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I1_1" }, "name": "unnamedWire#44", @@ -1097,11 +1097,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I1_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "name": "unnamedWire#46", @@ -1109,11 +1109,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I1_3" }, "name": "unnamedWire#47", @@ -1121,11 +1121,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I1_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "name": "unnamedWire#48", @@ -1137,7 +1137,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I0_4" }, "name": "unnamedWire#49", @@ -1181,7 +1181,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I0_3" }, "pin2": { @@ -1197,7 +1197,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I0_2" }, "name": "unnamedWire#53", @@ -1205,7 +1205,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "I0_1" }, "pin2": { @@ -1222,7 +1222,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "A4" }, "pin2": { @@ -1234,7 +1234,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "not4#0", "pinName": "A2" }, "pin2": { @@ -1250,7 +1250,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "I0_1" }, "name": "unnamedWire#57", @@ -1274,7 +1274,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I0_1" }, "name": "unnamedWire#59", @@ -1299,11 +1299,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I0_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "xor#0", "pinName": "Y" }, "name": "unnamedWire#60", @@ -1311,7 +1311,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I0_3" }, "pin2": { @@ -1332,7 +1332,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I0_4" }, "name": "unnamedWire#62", @@ -1349,11 +1349,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I1_1" }, "name": "unnamedWire#63", @@ -1361,11 +1361,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I1_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "Y2" }, "name": "unnamedWire#64", @@ -1373,11 +1373,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I1_3" }, "name": "unnamedWire#65", @@ -1385,11 +1385,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "I1_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#1", "pinName": "Y4" }, "name": "unnamedWire#66", @@ -1418,7 +1418,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "S0" }, "name": "unnamedWire#68", @@ -1430,7 +1430,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "S0" }, "name": "unnamedWire#69", @@ -1459,7 +1459,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "Y4" }, "pin2": { @@ -1484,7 +1484,7 @@ "pinName": "D3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "Y3" }, "name": "unnamedWire#71", @@ -1501,7 +1501,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "and#0", "pinName": "Y" }, "pin2": { @@ -1534,7 +1534,7 @@ "pinName": "D1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "Y1" }, "name": "unnamedWire#73", @@ -1551,11 +1551,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I1_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "Y4" }, "name": "unnamedWire#74", @@ -1563,11 +1563,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I1_3" }, "name": "unnamedWire#75", @@ -1575,11 +1575,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I1_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "Y2" }, "name": "unnamedWire#76", @@ -1587,11 +1587,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "mux1_4#3", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I1_1" }, "name": "unnamedWire#77", @@ -1599,11 +1599,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I0_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "Y4" }, "name": "unnamedWire#78", @@ -1620,11 +1620,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I0_3" }, "name": "unnamedWire#79", @@ -1653,11 +1653,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I0_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "Y2" }, "name": "unnamedWire#80", @@ -1674,11 +1674,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "mux1_4#2", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "I0_1" }, "name": "unnamedWire#81", @@ -1699,7 +1699,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "S0" }, "name": "unnamedWire#82", @@ -1749,7 +1749,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux1#0", "pinName": "S0" }, "name": "unnamedWire#85", @@ -1761,7 +1761,7 @@ "pinName": "COVD_V" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux1#0", "pinName": "I1" }, "name": "unnamedWire#86", @@ -1782,11 +1782,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "mux1_4#4", "pinName": "Y2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux1#0", "pinName": "I0" }, "name": "unnamedWire#87", @@ -1803,7 +1803,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "mux1#0", "pinName": "Y" }, "pin2": { @@ -1828,7 +1828,7 @@ "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#89", @@ -1893,7 +1893,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#93", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json index 3ec88ac4..97b0277d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json @@ -87,14 +87,6 @@ "innerScale": 0.4, "submodel": { "components": [ - { - "id": "xor", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 40.0, - "y": 20.0 - } - }, { "id": "NandGate", "name": "NandGate#0", @@ -256,6 +248,14 @@ "y": 149.0 }, "params": 1 + }, + { + "id": "xor", + "name": "xor#0", + "pos": { + "x": 40.0, + "y": 20.0 + } } ], "wires": [ @@ -581,7 +581,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "xor#0", "pinName": "A" }, "name": "unnamedWire#3", @@ -683,7 +683,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "xor#0", "pinName": "B" }, "name": "unnamedWire#4", @@ -696,7 +696,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "xor#0", "pinName": "Y" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index a1991009..d2177afe 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -105,30 +105,6 @@ "innerScale": 0.1, "submodel": { "components": [ - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 45.0, - "y": 240.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 100.0, - "y": 190.0 - } - }, - { - "id": "xor", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 215.0, - "y": 200.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -244,6 +220,30 @@ "x": 375.0, "y": 170.0 } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 45.0, + "y": 240.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#1", + "pos": { + "x": 100.0, + "y": 190.0 + } + }, + { + "id": "xor", + "name": "xor#0", + "pos": { + "x": 215.0, + "y": 200.0 + } } ], "wires": [ @@ -273,7 +273,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "pin2": { @@ -301,7 +301,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#12", @@ -322,7 +322,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#13", @@ -343,7 +343,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#14", @@ -394,11 +394,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_4" }, "name": "unnamedWire#17", @@ -406,11 +406,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "name": "unnamedWire#18", @@ -418,11 +418,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_2" }, "name": "unnamedWire#19", @@ -442,11 +442,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_1" }, "name": "unnamedWire#20", @@ -454,7 +454,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_1" }, "pin2": { @@ -475,7 +475,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_2" }, "name": "unnamedWire#22", @@ -483,7 +483,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_3" }, "pin2": { @@ -523,7 +523,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_4" }, "name": "unnamedWire#26", @@ -535,7 +535,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#27", @@ -556,7 +556,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "S0" }, "name": "unnamedWire#28", @@ -689,11 +689,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "xor#0", "pinName": "A" }, "name": "unnamedWire#35", @@ -705,7 +705,7 @@ "pinName": "CINV" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "xor#0", "pinName": "B" }, "name": "unnamedWire#36", @@ -859,7 +859,7 @@ "pinName": "D1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y1" }, "name": "unnamedWire#42", @@ -876,7 +876,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "xor#0", "pinName": "Y" }, "pin2": { @@ -901,7 +901,7 @@ "pinName": "D3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y3" }, "name": "unnamedWire#44", @@ -930,7 +930,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y4" }, "name": "unnamedWire#45", @@ -997,7 +997,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, "name": "unnamedWire#49", @@ -1042,7 +1042,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#7", @@ -1050,7 +1050,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "pin2": { @@ -1066,7 +1066,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json index f5283a09..20f06642 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json @@ -42,110 +42,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "dff", - "name": "DeserializedSubmodelComponent#10", - "pos": { - "x": 175.0, - "y": 170.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#11", - "pos": { - "x": 130.0, - "y": 160.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#12", - "pos": { - "x": 130.0, - "y": 130.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#13", - "pos": { - "x": 175.0, - "y": 80.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#14", - "pos": { - "x": 175.0, - "y": 110.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#15", - "pos": { - "x": 130.0, - "y": 100.0 - } - }, - { - "id": "mux1_12", - "name": "DeserializedSubmodelComponent#17", - "pos": { - "x": 15.0, - "y": 90.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#4", - "pos": { - "x": 175.0, - "y": 20.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#5", - "pos": { - "x": 175.0, - "y": 50.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 130.0, - "y": 10.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 130.0, - "y": 40.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 130.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#9", - "pos": { - "x": 175.0, - "y": 140.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -175,112 +71,216 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#11", + "name": "WireCrossPoint#0", "pos": { - "x": 169.0, - "y": 54.0 + "x": 124.0, + "y": 14.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#12", + "name": "WireCrossPoint#1", "pos": { - "x": 169.0, - "y": 144.0 + "x": 124.0, + "y": 44.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#13", + "name": "WireCrossPoint#10", "pos": { "x": 169.0, - "y": 24.0 + "y": 114.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#14", + "name": "WireCrossPoint#2", "pos": { - "x": 169.0, - "y": 84.0 + "x": 124.0, + "y": 104.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#15", + "name": "WireCrossPoint#3", "pos": { - "x": 169.0, - "y": 114.0 + "x": 124.0, + "y": 134.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#2", + "name": "WireCrossPoint#4", "pos": { "x": 124.0, - "y": 14.0 + "y": 74.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#5", "pos": { - "x": 124.0, - "y": 44.0 + "x": 264.0, + "y": 99.0 }, - "params": 1 + "params": 12 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "name": "WireCrossPoint#6", "pos": { - "x": 124.0, - "y": 104.0 + "x": 169.0, + "y": 54.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#6", + "name": "WireCrossPoint#7", "pos": { - "x": 124.0, - "y": 134.0 + "x": 169.0, + "y": 144.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#7", + "name": "WireCrossPoint#8", "pos": { - "x": 124.0, - "y": 74.0 + "x": 169.0, + "y": 24.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#8", + "name": "WireCrossPoint#9", "pos": { - "x": 264.0, - "y": 99.0 + "x": 169.0, + "y": 84.0 }, - "params": 12 + "params": 1 + }, + { + "id": "dff", + "name": "dff#0", + "pos": { + "x": 175.0, + "y": 20.0 + } + }, + { + "id": "dff", + "name": "dff#1", + "pos": { + "x": 175.0, + "y": 50.0 + } + }, + { + "id": "dff", + "name": "dff#10", + "pos": { + "x": 175.0, + "y": 110.0 + } + }, + { + "id": "dff", + "name": "dff#11", + "pos": { + "x": 130.0, + "y": 100.0 + } + }, + { + "id": "dff", + "name": "dff#2", + "pos": { + "x": 130.0, + "y": 10.0 + } + }, + { + "id": "dff", + "name": "dff#3", + "pos": { + "x": 130.0, + "y": 40.0 + } + }, + { + "id": "dff", + "name": "dff#4", + "pos": { + "x": 130.0, + "y": 70.0 + } + }, + { + "id": "dff", + "name": "dff#5", + "pos": { + "x": 175.0, + "y": 140.0 + } + }, + { + "id": "dff", + "name": "dff#6", + "pos": { + "x": 175.0, + "y": 170.0 + } + }, + { + "id": "dff", + "name": "dff#7", + "pos": { + "x": 130.0, + "y": 160.0 + } + }, + { + "id": "dff", + "name": "dff#8", + "pos": { + "x": 130.0, + "y": 130.0 + } + }, + { + "id": "dff", + "name": "dff#9", + "pos": { + "x": 175.0, + "y": 80.0 + } + }, + { + "id": "mux1_12", + "name": "mux1_12#0", + "pos": { + "x": 15.0, + "y": 90.0 + } } ], "wires": [ { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#0", @@ -297,7 +297,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { @@ -318,7 +318,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "dff#11", "pinName": "D" }, "pin2": { @@ -343,7 +343,7 @@ "pinName": "O4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "dff#10", "pinName": "D" }, "name": "unnamedWire#11", @@ -360,7 +360,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff#8", "pinName": "D" }, "pin2": { @@ -376,7 +376,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff#5", "pinName": "D" }, "name": "unnamedWire#13", @@ -384,7 +384,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "dff#7", "pinName": "D" }, "pin2": { @@ -409,7 +409,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "dff#6", "pinName": "D" }, "name": "unnamedWire#15", @@ -430,7 +430,7 @@ "pinName": "WE" }, "pin2": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1_12#0", "pinName": "S" }, "name": "unnamedWire#16", @@ -451,7 +451,7 @@ "pinName": "D" }, "pin2": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1_12#0", "pinName": "I1" }, "name": "unnamedWire#17", @@ -468,7 +468,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1_12#0", "pinName": "Y" }, "pin2": { @@ -480,11 +480,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "dff#2", "pinName": "C" }, "name": "unnamedWire#21", @@ -492,11 +492,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#22", @@ -504,11 +504,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "dff#3", "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#23", @@ -516,11 +516,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#4", "pinName": "" }, "name": "unnamedWire#24", @@ -528,11 +528,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "dff#4", "pinName": "C" }, "name": "unnamedWire#25", @@ -540,11 +540,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#26", @@ -552,11 +552,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "dff#11", "pinName": "C" }, "name": "unnamedWire#27", @@ -564,11 +564,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#28", @@ -576,11 +576,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff#8", "pinName": "C" }, "name": "unnamedWire#29", @@ -588,11 +588,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#17", + "compName": "mux1_12#0", "pinName": "I0" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#3", @@ -613,11 +613,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "dff#7", "pinName": "C" }, "name": "unnamedWire#30", @@ -630,11 +630,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "dff#6", "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#31", @@ -647,11 +647,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff#5", "pinName": "C" }, "name": "unnamedWire#32", @@ -659,11 +659,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#33", @@ -671,11 +671,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "dff#10", "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#34", @@ -683,11 +683,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#35", @@ -695,11 +695,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "dff#9", "pinName": "C" }, "name": "unnamedWire#36", @@ -707,11 +707,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#37", @@ -719,11 +719,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "dff#1", "pinName": "C" }, "name": "unnamedWire#38", @@ -731,11 +731,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#39", @@ -747,7 +747,7 @@ "pinName": "O11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "dff#2", "pinName": "D" }, "name": "unnamedWire#4", @@ -764,11 +764,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "dff#0", "pinName": "C" }, "name": "unnamedWire#40", @@ -776,7 +776,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "dff#0", "pinName": "D" }, "pin2": { @@ -801,7 +801,7 @@ "pinName": "I11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "dff#2", "pinName": "Q" }, "name": "unnamedWire#53", @@ -818,7 +818,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "dff#0", "pinName": "Q" }, "pin2": { @@ -843,7 +843,7 @@ "pinName": "I9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "dff#3", "pinName": "Q" }, "name": "unnamedWire#55", @@ -860,7 +860,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "dff#1", "pinName": "Q" }, "pin2": { @@ -885,7 +885,7 @@ "pinName": "I7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "dff#4", "pinName": "Q" }, "name": "unnamedWire#57", @@ -902,7 +902,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "dff#9", "pinName": "Q" }, "pin2": { @@ -927,7 +927,7 @@ "pinName": "I5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "dff#11", "pinName": "Q" }, "name": "unnamedWire#59", @@ -935,7 +935,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "dff#3", "pinName": "D" }, "pin2": { @@ -960,7 +960,7 @@ "pinName": "I4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "dff#10", "pinName": "Q" }, "name": "unnamedWire#60", @@ -972,7 +972,7 @@ "pinName": "I3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff#8", "pinName": "Q" }, "name": "unnamedWire#61", @@ -989,7 +989,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff#5", "pinName": "Q" }, "pin2": { @@ -1014,7 +1014,7 @@ "pinName": "I1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "dff#7", "pinName": "Q" }, "name": "unnamedWire#63", @@ -1031,7 +1031,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "dff#6", "pinName": "Q" }, "pin2": { @@ -1056,7 +1056,7 @@ "pinName": "O" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#65", @@ -1064,7 +1064,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { @@ -1080,7 +1080,7 @@ "pinName": "O8" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "dff#1", "pinName": "D" }, "name": "unnamedWire#7", @@ -1097,7 +1097,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "dff#4", "pinName": "D" }, "pin2": { @@ -1122,7 +1122,7 @@ "pinName": "O6" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "dff#9", "pinName": "D" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json index af3897d6..11bc97cc 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json @@ -42,142 +42,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "dff", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 140.0, - "y": 15.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 190.0, - "y": 25.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#10", - "pos": { - "x": 190.0, - "y": 235.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#11", - "pos": { - "x": 140.0, - "y": 225.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#12", - "pos": { - "x": 140.0, - "y": 195.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#13", - "pos": { - "x": 190.0, - "y": 145.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#14", - "pos": { - "x": 190.0, - "y": 175.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#15", - "pos": { - "x": 140.0, - "y": 165.0 - } - }, - { - "id": "mux1_16", - "name": "DeserializedSubmodelComponent#16", - "pos": { - "x": 15.0, - "y": 95.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 190.0, - "y": 55.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#3", - "pos": { - "x": 140.0, - "y": 45.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#4", - "pos": { - "x": 190.0, - "y": 85.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#5", - "pos": { - "x": 190.0, - "y": 115.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 140.0, - "y": 75.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 140.0, - "y": 105.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 140.0, - "y": 135.0 - } - }, - { - "id": "dff", - "name": "DeserializedSubmodelComponent#9", - "pos": { - "x": 190.0, - "y": 205.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -217,15 +81,6 @@ { "id": "WireCrossPoint", "name": "WireCrossPoint#10", - "pos": { - "x": 184.0, - "y": 29.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", "pos": { "x": 184.0, "y": 119.0 @@ -234,7 +89,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#12", + "name": "WireCrossPoint#11", "pos": { "x": 184.0, "y": 209.0 @@ -243,7 +98,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#13", + "name": "WireCrossPoint#12", "pos": { "x": 184.0, "y": 89.0 @@ -252,7 +107,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#14", + "name": "WireCrossPoint#13", "pos": { "x": 184.0, "y": 149.0 @@ -261,7 +116,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#15", + "name": "WireCrossPoint#14", "pos": { "x": 184.0, "y": 179.0 @@ -288,7 +143,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "name": "WireCrossPoint#4", "pos": { "x": 134.0, "y": 169.0 @@ -297,7 +152,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#6", + "name": "WireCrossPoint#5", "pos": { "x": 134.0, "y": 199.0 @@ -306,7 +161,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#7", + "name": "WireCrossPoint#6", "pos": { "x": 134.0, "y": 139.0 @@ -315,7 +170,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#8", + "name": "WireCrossPoint#7", "pos": { "x": 289.0, "y": 124.0 @@ -324,12 +179,157 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#9", + "name": "WireCrossPoint#8", "pos": { "x": 184.0, "y": 59.0 }, "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#9", + "pos": { + "x": 184.0, + "y": 29.0 + }, + "params": 1 + }, + { + "id": "dff", + "name": "dff#0", + "pos": { + "x": 140.0, + "y": 15.0 + } + }, + { + "id": "dff", + "name": "dff#1", + "pos": { + "x": 190.0, + "y": 25.0 + } + }, + { + "id": "dff", + "name": "dff#10", + "pos": { + "x": 190.0, + "y": 235.0 + } + }, + { + "id": "dff", + "name": "dff#11", + "pos": { + "x": 140.0, + "y": 225.0 + } + }, + { + "id": "dff", + "name": "dff#12", + "pos": { + "x": 140.0, + "y": 195.0 + } + }, + { + "id": "dff", + "name": "dff#13", + "pos": { + "x": 190.0, + "y": 145.0 + } + }, + { + "id": "dff", + "name": "dff#14", + "pos": { + "x": 190.0, + "y": 175.0 + } + }, + { + "id": "dff", + "name": "dff#15", + "pos": { + "x": 140.0, + "y": 165.0 + } + }, + { + "id": "dff", + "name": "dff#2", + "pos": { + "x": 190.0, + "y": 55.0 + } + }, + { + "id": "dff", + "name": "dff#3", + "pos": { + "x": 140.0, + "y": 45.0 + } + }, + { + "id": "dff", + "name": "dff#4", + "pos": { + "x": 190.0, + "y": 85.0 + } + }, + { + "id": "dff", + "name": "dff#5", + "pos": { + "x": 190.0, + "y": 115.0 + } + }, + { + "id": "dff", + "name": "dff#6", + "pos": { + "x": 140.0, + "y": 75.0 + } + }, + { + "id": "dff", + "name": "dff#7", + "pos": { + "x": 140.0, + "y": 105.0 + } + }, + { + "id": "dff", + "name": "dff#8", + "pos": { + "x": 140.0, + "y": 135.0 + } + }, + { + "id": "dff", + "name": "dff#9", + "pos": { + "x": 190.0, + "y": 205.0 + } + }, + { + "id": "mux1_16", + "name": "mux1_16#0", + "pos": { + "x": 15.0, + "y": 95.0 + } } ], "wires": [ @@ -339,7 +339,7 @@ "pinName": "O15" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "dff#0", "pinName": "D" }, "name": "unnamedWire#0", @@ -356,7 +356,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "dff#1", "pinName": "D" }, "pin2": { @@ -377,7 +377,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "dff#15", "pinName": "D" }, "pin2": { @@ -402,7 +402,7 @@ "pinName": "O4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "dff#14", "pinName": "D" }, "name": "unnamedWire#11", @@ -419,7 +419,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff#12", "pinName": "D" }, "pin2": { @@ -444,7 +444,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff#9", "pinName": "D" }, "name": "unnamedWire#13", @@ -461,7 +461,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "dff#11", "pinName": "D" }, "pin2": { @@ -486,7 +486,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "dff#10", "pinName": "D" }, "name": "unnamedWire#15", @@ -503,7 +503,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux1_16#0", "pinName": "Y" }, "pin2": { @@ -519,7 +519,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "dff#0", "pinName": "C" }, "name": "unnamedWire#17", @@ -543,7 +543,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "dff#3", "pinName": "C" }, "name": "unnamedWire#19", @@ -555,7 +555,7 @@ "pinName": "O13" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "dff#3", "pinName": "D" }, "name": "unnamedWire#2", @@ -588,7 +588,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "dff#6", "pinName": "C" }, "name": "unnamedWire#21", @@ -608,7 +608,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "dff#7", "pinName": "C" }, "pin2": { @@ -624,7 +624,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#24", @@ -632,11 +632,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "dff#8", "pinName": "C" }, "name": "unnamedWire#25", @@ -644,11 +644,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "name": "unnamedWire#26", @@ -656,11 +656,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "dff#15", "pinName": "C" }, "name": "unnamedWire#27", @@ -668,11 +668,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#28", @@ -680,11 +680,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff#12", "pinName": "C" }, "name": "unnamedWire#29", @@ -692,7 +692,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "dff#2", "pinName": "D" }, "pin2": { @@ -713,11 +713,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "dff#11", "pinName": "C" }, "name": "unnamedWire#30", @@ -730,11 +730,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "dff#10", "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "name": "unnamedWire#31", @@ -747,11 +747,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff#9", "pinName": "C" }, "name": "unnamedWire#32", @@ -759,11 +759,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#14", "pinName": "" }, "name": "unnamedWire#33", @@ -771,11 +771,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "dff#14", "pinName": "C" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#14", "pinName": "" }, "name": "unnamedWire#34", @@ -783,11 +783,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#14", "pinName": "" }, "name": "unnamedWire#35", @@ -795,11 +795,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "dff#13", "pinName": "C" }, "name": "unnamedWire#36", @@ -807,11 +807,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#37", @@ -819,11 +819,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "dff#5", "pinName": "C" }, "name": "unnamedWire#38", @@ -831,11 +831,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#39", @@ -847,7 +847,7 @@ "pinName": "O11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "dff#6", "pinName": "D" }, "name": "unnamedWire#4", @@ -864,11 +864,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "dff#4", "pinName": "C" }, "name": "unnamedWire#40", @@ -876,11 +876,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#41", @@ -888,11 +888,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "dff#2", "pinName": "C" }, "name": "unnamedWire#42", @@ -900,11 +900,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#43", @@ -912,11 +912,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "dff#1", "pinName": "C" }, "name": "unnamedWire#44", @@ -928,7 +928,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#45", @@ -949,7 +949,7 @@ "pinName": "_WE" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux1_16#0", "pinName": "S" }, "name": "unnamedWire#47", @@ -982,7 +982,7 @@ "pinName": "I15" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "dff#0", "pinName": "Q" }, "name": "unnamedWire#49", @@ -999,7 +999,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "dff#4", "pinName": "D" }, "pin2": { @@ -1020,7 +1020,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "dff#1", "pinName": "Q" }, "pin2": { @@ -1045,7 +1045,7 @@ "pinName": "I13" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "dff#3", "pinName": "Q" }, "name": "unnamedWire#51", @@ -1066,7 +1066,7 @@ "pinName": "I12" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "dff#2", "pinName": "Q" }, "name": "unnamedWire#52", @@ -1087,7 +1087,7 @@ "pinName": "I11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "dff#6", "pinName": "Q" }, "name": "unnamedWire#53", @@ -1104,7 +1104,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "dff#4", "pinName": "Q" }, "pin2": { @@ -1129,7 +1129,7 @@ "pinName": "I9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "dff#7", "pinName": "Q" }, "name": "unnamedWire#55", @@ -1137,7 +1137,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "dff#5", "pinName": "Q" }, "pin2": { @@ -1153,7 +1153,7 @@ "pinName": "I7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "dff#8", "pinName": "Q" }, "name": "unnamedWire#57", @@ -1170,7 +1170,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "dff#13", "pinName": "Q" }, "pin2": { @@ -1195,7 +1195,7 @@ "pinName": "I5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "dff#15", "pinName": "Q" }, "name": "unnamedWire#59", @@ -1212,7 +1212,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "dff#7", "pinName": "D" }, "pin2": { @@ -1237,7 +1237,7 @@ "pinName": "I4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "dff#14", "pinName": "Q" }, "name": "unnamedWire#60", @@ -1258,7 +1258,7 @@ "pinName": "I3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "dff#12", "pinName": "Q" }, "name": "unnamedWire#61", @@ -1275,7 +1275,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "dff#9", "pinName": "Q" }, "pin2": { @@ -1300,7 +1300,7 @@ "pinName": "I1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "dff#11", "pinName": "Q" }, "name": "unnamedWire#63", @@ -1317,7 +1317,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "dff#10", "pinName": "Q" }, "pin2": { @@ -1342,7 +1342,7 @@ "pinName": "O" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#65", @@ -1350,7 +1350,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { @@ -1362,11 +1362,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux1_16#0", "pinName": "I1" }, "name": "unnamedWire#67", @@ -1391,7 +1391,7 @@ "pinName": "D" }, "pin2": { - "compName": "DeserializedSubmodelComponent#16", + "compName": "mux1_16#0", "pinName": "I0" }, "name": "unnamedWire#68", @@ -1412,7 +1412,7 @@ "pinName": "O8" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "dff#5", "pinName": "D" }, "name": "unnamedWire#7", @@ -1429,7 +1429,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "dff#8", "pinName": "D" }, "pin2": { @@ -1445,7 +1445,7 @@ "pinName": "O6" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "dff#13", "pinName": "D" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json index d54a34e8..ac0a4511 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json @@ -96,14 +96,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 55.0, - "y": 70.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -198,6 +190,14 @@ "x": 115.0, "y": 170.0 } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 55.0, + "y": 70.0 + } } ], "wires": [ @@ -215,7 +215,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { @@ -240,7 +240,7 @@ "pinName": "D1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#10", @@ -252,7 +252,7 @@ "pinName": "D2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "name": "unnamedWire#11", @@ -273,7 +273,7 @@ "pinName": "D3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#12", @@ -342,7 +342,7 @@ "pinName": "D4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "name": "unnamedWire#17", @@ -383,7 +383,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "pin2": { @@ -419,7 +419,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { @@ -440,7 +440,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "pin2": { @@ -465,7 +465,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, "name": "unnamedWire#24", @@ -490,7 +490,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#25", @@ -515,7 +515,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#26", @@ -552,7 +552,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#28", @@ -654,7 +654,7 @@ "pinName": "WE" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json index 2902594d..0320f12d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json @@ -96,14 +96,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 55.0, - "y": 70.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -198,6 +190,14 @@ "x": 115.0, "y": 170.0 } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 55.0, + "y": 70.0 + } } ], "wires": [ @@ -215,7 +215,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { @@ -240,7 +240,7 @@ "pinName": "D1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, "name": "unnamedWire#10", @@ -261,7 +261,7 @@ "pinName": "D2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#11", @@ -282,7 +282,7 @@ "pinName": "D3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#12", @@ -351,7 +351,7 @@ "pinName": "D4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#17", @@ -392,7 +392,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "pin2": { @@ -428,7 +428,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { @@ -449,7 +449,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "pin2": { @@ -474,7 +474,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#24", @@ -499,7 +499,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "name": "unnamedWire#25", @@ -524,7 +524,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#26", @@ -561,7 +561,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "name": "unnamedWire#28", @@ -663,7 +663,7 @@ "pinName": "_WE" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json index 0d1cb5ac..faeaeb56 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json @@ -42,102 +42,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#10", - "pos": { - "x": 95.0, - "y": 145.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#11", - "pos": { - "x": 95.0, - "y": 205.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#12", - "pos": { - "x": 150.0, - "y": 285.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#13", - "pos": { - "x": 150.0, - "y": 225.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#14", - "pos": { - "x": 95.0, - "y": 265.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#15", - "pos": { - "x": 150.0, - "y": 345.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#4", - "pos": { - "x": 150.0, - "y": 45.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#5", - "pos": { - "x": 95.0, - "y": 85.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 150.0, - "y": 105.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 95.0, - "y": 25.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 95.0, - "y": 325.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#9", - "pos": { - "x": 150.0, - "y": 165.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -176,43 +80,25 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#10", - "pos": { - "x": 144.0, - "y": 239.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", + "name": "WireCrossPoint#0", "pos": { "x": 139.0, - "y": 229.0 + "y": 49.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#12", + "name": "WireCrossPoint#1", "pos": { "x": 144.0, - "y": 299.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#13", - "pos": { - "x": 139.0, - "y": 289.0 + "y": 59.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#14", + "name": "WireCrossPoint#10", "pos": { "x": 89.0, "y": 4.0 @@ -221,7 +107,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#15", + "name": "WireCrossPoint#11", "pos": { "x": 84.0, "y": 19.0 @@ -230,7 +116,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#16", + "name": "WireCrossPoint#12", "pos": { "x": 49.0, "y": 24.0 @@ -239,7 +125,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#17", + "name": "WireCrossPoint#13", "pos": { "x": 49.0, "y": 14.0 @@ -248,7 +134,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#18", + "name": "WireCrossPoint#14", "pos": { "x": 84.0, "y": 269.0 @@ -257,7 +143,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#19", + "name": "WireCrossPoint#15", "pos": { "x": 89.0, "y": 279.0 @@ -266,7 +152,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#20", + "name": "WireCrossPoint#16", "pos": { "x": 84.0, "y": 209.0 @@ -275,7 +161,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#21", + "name": "WireCrossPoint#17", "pos": { "x": 89.0, "y": 219.0 @@ -284,7 +170,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#22", + "name": "WireCrossPoint#18", "pos": { "x": 89.0, "y": 159.0 @@ -293,7 +179,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#23", + "name": "WireCrossPoint#19", "pos": { "x": 84.0, "y": 149.0 @@ -302,7 +188,16 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#24", + "name": "WireCrossPoint#2", + "pos": { + "x": 144.0, + "y": 119.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#20", "pos": { "x": 84.0, "y": 89.0 @@ -311,7 +206,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#25", + "name": "WireCrossPoint#21", "pos": { "x": 89.0, "y": 99.0 @@ -320,7 +215,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#26", + "name": "WireCrossPoint#22", "pos": { "x": 84.0, "y": 29.0 @@ -329,19 +224,28 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#27", + "name": "WireCrossPoint#23", "pos": { "x": 89.0, "y": 39.0 }, "params": 1 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#3", + "pos": { + "x": 139.0, + "y": 109.0 + }, + "params": 1 + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 139.0, - "y": 49.0 + "y": 169.0 }, "params": 1 }, @@ -350,7 +254,7 @@ "name": "WireCrossPoint#5", "pos": { "x": 144.0, - "y": 59.0 + "y": 179.0 }, "params": 1 }, @@ -359,7 +263,7 @@ "name": "WireCrossPoint#6", "pos": { "x": 144.0, - "y": 119.0 + "y": 239.0 }, "params": 1 }, @@ -368,7 +272,7 @@ "name": "WireCrossPoint#7", "pos": { "x": 139.0, - "y": 109.0 + "y": 229.0 }, "params": 1 }, @@ -376,8 +280,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 139.0, - "y": 169.0 + "x": 144.0, + "y": 299.0 }, "params": 1 }, @@ -385,20 +289,116 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 144.0, - "y": 179.0 + "x": 139.0, + "y": 289.0 }, "params": 1 + }, + { + "id": "sel1", + "name": "sel1#0", + "pos": { + "x": 150.0, + "y": 45.0 + } + }, + { + "id": "sel1", + "name": "sel1#1", + "pos": { + "x": 95.0, + "y": 85.0 + } + }, + { + "id": "sel1", + "name": "sel1#10", + "pos": { + "x": 95.0, + "y": 265.0 + } + }, + { + "id": "sel1", + "name": "sel1#11", + "pos": { + "x": 150.0, + "y": 345.0 + } + }, + { + "id": "sel1", + "name": "sel1#2", + "pos": { + "x": 150.0, + "y": 105.0 + } + }, + { + "id": "sel1", + "name": "sel1#3", + "pos": { + "x": 95.0, + "y": 25.0 + } + }, + { + "id": "sel1", + "name": "sel1#4", + "pos": { + "x": 95.0, + "y": 325.0 + } + }, + { + "id": "sel1", + "name": "sel1#5", + "pos": { + "x": 150.0, + "y": 165.0 + } + }, + { + "id": "sel1", + "name": "sel1#6", + "pos": { + "x": 95.0, + "y": 145.0 + } + }, + { + "id": "sel1", + "name": "sel1#7", + "pos": { + "x": 95.0, + "y": 205.0 + } + }, + { + "id": "sel1", + "name": "sel1#8", + "pos": { + "x": 150.0, + "y": 285.0 + } + }, + { + "id": "sel1", + "name": "sel1#9", + "pos": { + "x": 150.0, + "y": 225.0 + } } ], "wires": [ { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#22", "pinName": "" }, "name": "unnamedWire#0", @@ -406,11 +406,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#23", "pinName": "" }, "name": "unnamedWire#1", @@ -418,11 +418,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#7", "pinName": "S1" }, "name": "unnamedWire#10", @@ -430,7 +430,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#3", "pinName": "Y" }, "pin2": { @@ -451,7 +451,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#0", "pinName": "Y" }, "pin2": { @@ -476,7 +476,7 @@ "pinName": "I9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#1", "pinName": "Y" }, "name": "unnamedWire#105", @@ -493,7 +493,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#2", "pinName": "Y" }, "pin2": { @@ -518,7 +518,7 @@ "pinName": "I7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#6", "pinName": "Y" }, "name": "unnamedWire#107", @@ -535,7 +535,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#5", "pinName": "Y" }, "pin2": { @@ -560,7 +560,7 @@ "pinName": "I5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#7", "pinName": "Y" }, "name": "unnamedWire#109", @@ -577,11 +577,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#17", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#7", "pinName": "S2" }, "name": "unnamedWire#11", @@ -589,7 +589,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#9", "pinName": "Y" }, "pin2": { @@ -614,7 +614,7 @@ "pinName": "I3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#10", "pinName": "Y" }, "name": "unnamedWire#111", @@ -631,7 +631,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#8", "pinName": "Y" }, "pin2": { @@ -656,7 +656,7 @@ "pinName": "I1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#4", "pinName": "Y" }, "name": "unnamedWire#113", @@ -673,7 +673,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#11", "pinName": "Y" }, "pin2": { @@ -706,11 +706,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#13", "pinName": "" }, "name": "unnamedWire#116", @@ -723,11 +723,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#10", "pinName": "S1" }, "pin2": { - "compName": "WireCrossPoint#18", + "compName": "WireCrossPoint#14", "pinName": "" }, "name": "unnamedWire#12", @@ -735,11 +735,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#19", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#10", "pinName": "S2" }, "name": "unnamedWire#13", @@ -747,11 +747,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#11", "pinName": "S1" }, "name": "unnamedWire#16", @@ -764,11 +764,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#8", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#18", @@ -776,11 +776,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#8", "pinName": "S1" }, "name": "unnamedWire#19", @@ -788,11 +788,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#0", "pinName": "" }, "name": "unnamedWire#2", @@ -805,11 +805,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#9", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#20", @@ -817,11 +817,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#9", "pinName": "S1" }, "name": "unnamedWire#21", @@ -829,11 +829,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#5", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#22", @@ -841,11 +841,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#5", "pinName": "S1" }, "name": "unnamedWire#23", @@ -853,11 +853,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#2", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#24", @@ -865,11 +865,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#2", "pinName": "S1" }, "pin2": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#25", @@ -877,11 +877,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#0", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#26", @@ -889,11 +889,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#0", "pinName": "S1" }, "name": "unnamedWire#27", @@ -901,11 +901,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#3", @@ -918,11 +918,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#35", @@ -930,11 +930,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#4", "pinName": "" }, "name": "unnamedWire#36", @@ -942,11 +942,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#37", @@ -954,11 +954,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#38", @@ -966,11 +966,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#39", @@ -978,11 +978,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#22", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#3", "pinName": "S1" }, "name": "unnamedWire#4", @@ -990,11 +990,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#40", @@ -1002,11 +1002,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#41", @@ -1014,11 +1014,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#42", @@ -1026,11 +1026,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#11", "pinName": "S2" }, "name": "unnamedWire#43", @@ -1043,11 +1043,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#22", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#20", "pinName": "" }, "name": "unnamedWire#44", @@ -1055,11 +1055,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#20", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#19", "pinName": "" }, "name": "unnamedWire#45", @@ -1067,11 +1067,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#16", "pinName": "" }, "name": "unnamedWire#46", @@ -1079,11 +1079,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#18", + "compName": "WireCrossPoint#14", "pinName": "" }, "name": "unnamedWire#47", @@ -1091,11 +1091,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#18", + "compName": "WireCrossPoint#14", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#4", "pinName": "S1" }, "name": "unnamedWire#48", @@ -1108,11 +1108,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#19", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#4", "pinName": "S2" }, "name": "unnamedWire#49", @@ -1125,11 +1125,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#23", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#3", "pinName": "S2" }, "name": "unnamedWire#5", @@ -1137,11 +1137,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#19", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#17", "pinName": "" }, "name": "unnamedWire#50", @@ -1149,11 +1149,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#17", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#18", "pinName": "" }, "name": "unnamedWire#51", @@ -1161,11 +1161,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#21", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#18", "pinName": "" }, "name": "unnamedWire#52", @@ -1173,11 +1173,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#21", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#23", "pinName": "" }, "name": "unnamedWire#53", @@ -1185,11 +1185,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#20", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#1", "pinName": "S1" }, "name": "unnamedWire#6", @@ -1201,7 +1201,7 @@ "pinName": "O11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#3", "pinName": "I1" }, "name": "unnamedWire#64", @@ -1222,7 +1222,7 @@ "pinName": "O10" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#0", "pinName": "I1" }, "name": "unnamedWire#65", @@ -1243,7 +1243,7 @@ "pinName": "O9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#1", "pinName": "I1" }, "name": "unnamedWire#66", @@ -1264,7 +1264,7 @@ "pinName": "O8" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#2", "pinName": "I1" }, "name": "unnamedWire#67", @@ -1285,7 +1285,7 @@ "pinName": "O7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#6", "pinName": "I1" }, "name": "unnamedWire#68", @@ -1306,7 +1306,7 @@ "pinName": "O6" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#5", "pinName": "I1" }, "name": "unnamedWire#69", @@ -1323,11 +1323,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#1", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#21", "pinName": "" }, "name": "unnamedWire#7", @@ -1339,7 +1339,7 @@ "pinName": "O5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#7", "pinName": "I1" }, "name": "unnamedWire#70", @@ -1360,7 +1360,7 @@ "pinName": "O4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#9", "pinName": "I1" }, "name": "unnamedWire#71", @@ -1381,7 +1381,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#10", "pinName": "I1" }, "name": "unnamedWire#72", @@ -1402,7 +1402,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#8", "pinName": "I1" }, "name": "unnamedWire#73", @@ -1423,7 +1423,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#4", "pinName": "I1" }, "name": "unnamedWire#74", @@ -1444,7 +1444,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#11", "pinName": "I1" }, "name": "unnamedWire#75", @@ -1485,11 +1485,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#6", "pinName": "S1" }, "name": "unnamedWire#8", @@ -1501,7 +1501,7 @@ "pinName": "O11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#3", "pinName": "I2" }, "name": "unnamedWire#82", @@ -1522,7 +1522,7 @@ "pinName": "O10" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#0", "pinName": "I2" }, "name": "unnamedWire#83", @@ -1543,7 +1543,7 @@ "pinName": "O9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#1", "pinName": "I2" }, "name": "unnamedWire#84", @@ -1564,7 +1564,7 @@ "pinName": "O8" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#2", "pinName": "I2" }, "name": "unnamedWire#85", @@ -1585,7 +1585,7 @@ "pinName": "O7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#6", "pinName": "I2" }, "name": "unnamedWire#86", @@ -1606,7 +1606,7 @@ "pinName": "O6" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#5", "pinName": "I2" }, "name": "unnamedWire#87", @@ -1627,7 +1627,7 @@ "pinName": "O5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#7", "pinName": "I2" }, "name": "unnamedWire#88", @@ -1648,7 +1648,7 @@ "pinName": "O4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#9", "pinName": "I2" }, "name": "unnamedWire#89", @@ -1665,11 +1665,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#6", "pinName": "S2" }, "pin2": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#18", "pinName": "" }, "name": "unnamedWire#9", @@ -1681,7 +1681,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#10", "pinName": "I2" }, "name": "unnamedWire#90", @@ -1702,7 +1702,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#8", "pinName": "I2" }, "name": "unnamedWire#91", @@ -1723,7 +1723,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#4", "pinName": "I2" }, "name": "unnamedWire#92", @@ -1744,7 +1744,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#11", "pinName": "I2" }, "name": "unnamedWire#93", @@ -1765,7 +1765,7 @@ "pinName": "Y" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#11", "pinName": "" }, "name": "unnamedWire#94", @@ -1773,11 +1773,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#13", "pinName": "" }, "name": "unnamedWire#95", @@ -1785,7 +1785,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { @@ -1797,7 +1797,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#13", "pinName": "" }, "pin2": { @@ -1813,7 +1813,7 @@ "pinName": "S" }, "pin2": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#12", "pinName": "" }, "name": "unnamedWire#98", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json index 65ce55c8..c282fa50 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json @@ -42,134 +42,6 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 115.0, - "y": 25.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 175.0, - "y": 45.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#10", - "pos": { - "x": 115.0, - "y": 265.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#11", - "pos": { - "x": 115.0, - "y": 325.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#12", - "pos": { - "x": 175.0, - "y": 405.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#13", - "pos": { - "x": 175.0, - "y": 345.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#14", - "pos": { - "x": 115.0, - "y": 385.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#15", - "pos": { - "x": 175.0, - "y": 465.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 115.0, - "y": 85.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#3", - "pos": { - "x": 175.0, - "y": 105.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#4", - "pos": { - "x": 175.0, - "y": 165.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#5", - "pos": { - "x": 115.0, - "y": 205.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#6", - "pos": { - "x": 175.0, - "y": 225.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#7", - "pos": { - "x": 115.0, - "y": 145.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#8", - "pos": { - "x": 115.0, - "y": 445.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#9", - "pos": { - "x": 175.0, - "y": 285.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -493,6 +365,134 @@ "y": 299.0 }, "params": 1 + }, + { + "id": "sel1", + "name": "sel1#0", + "pos": { + "x": 115.0, + "y": 25.0 + } + }, + { + "id": "sel1", + "name": "sel1#1", + "pos": { + "x": 175.0, + "y": 45.0 + } + }, + { + "id": "sel1", + "name": "sel1#10", + "pos": { + "x": 115.0, + "y": 265.0 + } + }, + { + "id": "sel1", + "name": "sel1#11", + "pos": { + "x": 115.0, + "y": 325.0 + } + }, + { + "id": "sel1", + "name": "sel1#12", + "pos": { + "x": 175.0, + "y": 405.0 + } + }, + { + "id": "sel1", + "name": "sel1#13", + "pos": { + "x": 175.0, + "y": 345.0 + } + }, + { + "id": "sel1", + "name": "sel1#14", + "pos": { + "x": 115.0, + "y": 385.0 + } + }, + { + "id": "sel1", + "name": "sel1#15", + "pos": { + "x": 175.0, + "y": 465.0 + } + }, + { + "id": "sel1", + "name": "sel1#2", + "pos": { + "x": 115.0, + "y": 85.0 + } + }, + { + "id": "sel1", + "name": "sel1#3", + "pos": { + "x": 175.0, + "y": 105.0 + } + }, + { + "id": "sel1", + "name": "sel1#4", + "pos": { + "x": 175.0, + "y": 165.0 + } + }, + { + "id": "sel1", + "name": "sel1#5", + "pos": { + "x": 115.0, + "y": 205.0 + } + }, + { + "id": "sel1", + "name": "sel1#6", + "pos": { + "x": 175.0, + "y": 225.0 + } + }, + { + "id": "sel1", + "name": "sel1#7", + "pos": { + "x": 115.0, + "y": 145.0 + } + }, + { + "id": "sel1", + "name": "sel1#8", + "pos": { + "x": 115.0, + "y": 445.0 + } + }, + { + "id": "sel1", + "name": "sel1#9", + "pos": { + "x": 175.0, + "y": 285.0 + } } ], "wires": [ @@ -502,7 +502,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "S1" }, "name": "unnamedWire#0", @@ -514,7 +514,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "S2" }, "name": "unnamedWire#1", @@ -526,7 +526,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#11", "pinName": "S1" }, "name": "unnamedWire#10", @@ -538,7 +538,7 @@ "pinName": "I14" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "Y" }, "name": "unnamedWire#100", @@ -555,7 +555,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "sel1#2", "pinName": "Y" }, "pin2": { @@ -580,7 +580,7 @@ "pinName": "I12" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "sel1#3", "pinName": "Y" }, "name": "unnamedWire#102", @@ -597,7 +597,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#7", "pinName": "Y" }, "pin2": { @@ -618,7 +618,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#4", "pinName": "Y" }, "pin2": { @@ -643,7 +643,7 @@ "pinName": "I9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#5", "pinName": "Y" }, "name": "unnamedWire#105", @@ -660,7 +660,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#6", "pinName": "Y" }, "pin2": { @@ -685,7 +685,7 @@ "pinName": "I7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#10", "pinName": "Y" }, "name": "unnamedWire#107", @@ -702,7 +702,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#9", "pinName": "Y" }, "pin2": { @@ -727,7 +727,7 @@ "pinName": "I5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#11", "pinName": "Y" }, "name": "unnamedWire#109", @@ -748,7 +748,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#11", "pinName": "S2" }, "name": "unnamedWire#11", @@ -756,7 +756,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#13", "pinName": "Y" }, "pin2": { @@ -781,7 +781,7 @@ "pinName": "I3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#14", "pinName": "Y" }, "name": "unnamedWire#111", @@ -798,7 +798,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#12", "pinName": "Y" }, "pin2": { @@ -823,7 +823,7 @@ "pinName": "I1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#8", "pinName": "Y" }, "name": "unnamedWire#113", @@ -840,7 +840,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#15", "pinName": "Y" }, "pin2": { @@ -890,7 +890,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#14", "pinName": "S1" }, "pin2": { @@ -906,7 +906,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#14", "pinName": "S2" }, "name": "unnamedWire#13", @@ -942,7 +942,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#15", "pinName": "S1" }, "name": "unnamedWire#16", @@ -967,7 +967,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#12", "pinName": "S2" }, "pin2": { @@ -983,7 +983,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#12", "pinName": "S1" }, "name": "unnamedWire#19", @@ -995,7 +995,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "sel1#2", "pinName": "S1" }, "name": "unnamedWire#2", @@ -1003,7 +1003,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#13", "pinName": "S2" }, "pin2": { @@ -1019,7 +1019,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#13", "pinName": "S1" }, "name": "unnamedWire#21", @@ -1027,7 +1027,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#9", "pinName": "S2" }, "pin2": { @@ -1043,7 +1043,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#9", "pinName": "S1" }, "name": "unnamedWire#23", @@ -1051,7 +1051,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#6", "pinName": "S2" }, "pin2": { @@ -1063,7 +1063,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#6", "pinName": "S1" }, "pin2": { @@ -1075,7 +1075,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#4", "pinName": "S2" }, "pin2": { @@ -1091,7 +1091,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#4", "pinName": "S1" }, "name": "unnamedWire#27", @@ -1099,7 +1099,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "sel1#3", "pinName": "S2" }, "pin2": { @@ -1115,7 +1115,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "sel1#3", "pinName": "S1" }, "name": "unnamedWire#29", @@ -1127,7 +1127,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "sel1#2", "pinName": "S2" }, "name": "unnamedWire#3", @@ -1135,7 +1135,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "S2" }, "pin2": { @@ -1151,7 +1151,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "S1" }, "name": "unnamedWire#31", @@ -1259,7 +1259,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#7", "pinName": "S1" }, "name": "unnamedWire#4", @@ -1307,7 +1307,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#15", "pinName": "S2" }, "name": "unnamedWire#43", @@ -1372,7 +1372,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#8", "pinName": "S1" }, "name": "unnamedWire#48", @@ -1389,7 +1389,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#8", "pinName": "S2" }, "name": "unnamedWire#49", @@ -1406,7 +1406,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#7", "pinName": "S2" }, "name": "unnamedWire#5", @@ -1548,7 +1548,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#5", "pinName": "S1" }, "name": "unnamedWire#6", @@ -1560,7 +1560,7 @@ "pinName": "O15" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "I1" }, "name": "unnamedWire#60", @@ -1572,7 +1572,7 @@ "pinName": "O14" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "I1" }, "name": "unnamedWire#61", @@ -1593,7 +1593,7 @@ "pinName": "O13" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "sel1#2", "pinName": "I1" }, "name": "unnamedWire#62", @@ -1614,7 +1614,7 @@ "pinName": "O12" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "sel1#3", "pinName": "I1" }, "name": "unnamedWire#63", @@ -1635,7 +1635,7 @@ "pinName": "O11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#7", "pinName": "I1" }, "name": "unnamedWire#64", @@ -1656,7 +1656,7 @@ "pinName": "O10" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#4", "pinName": "I1" }, "name": "unnamedWire#65", @@ -1677,7 +1677,7 @@ "pinName": "O9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#5", "pinName": "I1" }, "name": "unnamedWire#66", @@ -1698,7 +1698,7 @@ "pinName": "O8" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#6", "pinName": "I1" }, "name": "unnamedWire#67", @@ -1719,7 +1719,7 @@ "pinName": "O7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#10", "pinName": "I1" }, "name": "unnamedWire#68", @@ -1740,7 +1740,7 @@ "pinName": "O6" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#9", "pinName": "I1" }, "name": "unnamedWire#69", @@ -1757,7 +1757,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#5", "pinName": "S2" }, "pin2": { @@ -1773,7 +1773,7 @@ "pinName": "O5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#11", "pinName": "I1" }, "name": "unnamedWire#70", @@ -1794,7 +1794,7 @@ "pinName": "O4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#13", "pinName": "I1" }, "name": "unnamedWire#71", @@ -1815,7 +1815,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#14", "pinName": "I1" }, "name": "unnamedWire#72", @@ -1836,7 +1836,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#12", "pinName": "I1" }, "name": "unnamedWire#73", @@ -1857,7 +1857,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#8", "pinName": "I1" }, "name": "unnamedWire#74", @@ -1878,7 +1878,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#15", "pinName": "I1" }, "name": "unnamedWire#75", @@ -1923,7 +1923,7 @@ "pinName": "O15" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "I2" }, "name": "unnamedWire#78", @@ -1944,7 +1944,7 @@ "pinName": "O14" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "I2" }, "name": "unnamedWire#79", @@ -1965,7 +1965,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#10", "pinName": "S1" }, "name": "unnamedWire#8", @@ -1977,7 +1977,7 @@ "pinName": "O13" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "sel1#2", "pinName": "I2" }, "name": "unnamedWire#80", @@ -1998,7 +1998,7 @@ "pinName": "O12" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "sel1#3", "pinName": "I2" }, "name": "unnamedWire#81", @@ -2019,7 +2019,7 @@ "pinName": "O11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#7", + "compName": "sel1#7", "pinName": "I2" }, "name": "unnamedWire#82", @@ -2040,7 +2040,7 @@ "pinName": "O10" }, "pin2": { - "compName": "DeserializedSubmodelComponent#4", + "compName": "sel1#4", "pinName": "I2" }, "name": "unnamedWire#83", @@ -2061,7 +2061,7 @@ "pinName": "O9" }, "pin2": { - "compName": "DeserializedSubmodelComponent#5", + "compName": "sel1#5", "pinName": "I2" }, "name": "unnamedWire#84", @@ -2082,7 +2082,7 @@ "pinName": "O8" }, "pin2": { - "compName": "DeserializedSubmodelComponent#6", + "compName": "sel1#6", "pinName": "I2" }, "name": "unnamedWire#85", @@ -2103,7 +2103,7 @@ "pinName": "O7" }, "pin2": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#10", "pinName": "I2" }, "name": "unnamedWire#86", @@ -2124,7 +2124,7 @@ "pinName": "O6" }, "pin2": { - "compName": "DeserializedSubmodelComponent#9", + "compName": "sel1#9", "pinName": "I2" }, "name": "unnamedWire#87", @@ -2145,7 +2145,7 @@ "pinName": "O5" }, "pin2": { - "compName": "DeserializedSubmodelComponent#11", + "compName": "sel1#11", "pinName": "I2" }, "name": "unnamedWire#88", @@ -2166,7 +2166,7 @@ "pinName": "O4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#13", + "compName": "sel1#13", "pinName": "I2" }, "name": "unnamedWire#89", @@ -2183,7 +2183,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#10", + "compName": "sel1#10", "pinName": "S2" }, "pin2": { @@ -2199,7 +2199,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#14", + "compName": "sel1#14", "pinName": "I2" }, "name": "unnamedWire#90", @@ -2220,7 +2220,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#12", + "compName": "sel1#12", "pinName": "I2" }, "name": "unnamedWire#91", @@ -2241,7 +2241,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#8", + "compName": "sel1#8", "pinName": "I2" }, "name": "unnamedWire#92", @@ -2262,7 +2262,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#15", + "compName": "sel1#15", "pinName": "I2" }, "name": "unnamedWire#93", @@ -2339,7 +2339,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "Y" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json index 3a1507a1..91d1220e 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json @@ -69,30 +69,6 @@ "innerScale": 0.4, "submodel": { "components": [ - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 60.0, - "y": 35.0 - } - }, - { - "id": "sel1", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 60.0, - "y": 100.0 - } - }, - { - "id": "mux1", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, { "id": "NandGate", "name": "NandGate#0", @@ -104,7 +80,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#1", + "name": "WireCrossPoint#0", "pos": { "x": 24.0, "y": 29.0 @@ -113,7 +89,7 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#2", + "name": "WireCrossPoint#1", "pos": { "x": 24.0, "y": 49.0 @@ -122,22 +98,46 @@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#2", "pos": { "x": 54.0, "y": 39.0 }, "params": 1 + }, + { + "id": "mux1", + "name": "mux1#0", + "pos": { + "x": 115.0, + "y": 20.0 + } + }, + { + "id": "sel1", + "name": "sel1#0", + "pos": { + "x": 60.0, + "y": 35.0 + } + }, + { + "id": "sel1", + "name": "sel1#1", + "pos": { + "x": 60.0, + "y": 100.0 + } } ], "wires": [ { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "name": "unnamedWire#0", @@ -145,7 +145,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { @@ -157,7 +157,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { @@ -169,11 +169,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "S2" }, "name": "unnamedWire#11", @@ -181,11 +181,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "S1" }, "pin2": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#14", @@ -193,7 +193,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@ -210,11 +210,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "S2" }, "name": "unnamedWire#16", @@ -227,11 +227,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "S1" }, "name": "unnamedWire#17", @@ -244,7 +244,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { @@ -265,7 +265,7 @@ "pinName": "I00" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "I1" }, "name": "unnamedWire#2", @@ -286,7 +286,7 @@ "pinName": "I01" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "I2" }, "name": "unnamedWire#3", @@ -307,7 +307,7 @@ "pinName": "I10" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "I1" }, "name": "unnamedWire#4", @@ -319,7 +319,7 @@ "pinName": "I11" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "I2" }, "name": "unnamedWire#5", @@ -336,7 +336,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "Y" }, "pin2": { @@ -348,11 +348,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "sel1#0", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "I0" }, "name": "unnamedWire#7", @@ -369,11 +369,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "sel1#1", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "I1" }, "name": "unnamedWire#8", @@ -394,7 +394,7 @@ "pinName": "S1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "S0" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json index 5f8c0c8f..6726b46c 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json @@ -69,30 +69,6 @@ "innerScale": 0.4, "submodel": { "components": [ - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 40.0, - "y": 30.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#1", - "pos": { - "x": 40.0, - "y": 125.0 - } - }, - { - "id": "mux1_4", - "name": "DeserializedSubmodelComponent#2", - "pos": { - "x": 100.0, - "y": 20.0 - } - }, { "id": "Merger", "name": "Merger#0", @@ -146,6 +122,30 @@ "y": 34.0 }, "params": 1 + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 40.0, + "y": 30.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#1", + "pos": { + "x": 40.0, + "y": 125.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#2", + "pos": { + "x": 100.0, + "y": 20.0 + } } ], "wires": [ @@ -155,7 +155,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_1" }, "name": "unnamedWire#0", @@ -163,7 +163,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_2" }, "pin2": { @@ -175,7 +175,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "pin2": { @@ -191,7 +191,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "name": "unnamedWire#11", @@ -199,7 +199,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "pin2": { @@ -211,7 +211,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "pin2": { @@ -223,7 +223,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "pin2": { @@ -235,7 +235,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, "pin2": { @@ -268,7 +268,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#17", @@ -280,7 +280,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "S0" }, "name": "unnamedWire#18", @@ -318,7 +318,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_3" }, "name": "unnamedWire#2", @@ -380,11 +380,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I0_1" }, "name": "unnamedWire#23", @@ -392,11 +392,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I0_2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "name": "unnamedWire#24", @@ -404,11 +404,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I0_3" }, "name": "unnamedWire#25", @@ -416,11 +416,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I0_4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "name": "unnamedWire#26", @@ -428,11 +428,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I1_1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y1" }, "name": "unnamedWire#27", @@ -449,11 +449,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I1_2" }, "name": "unnamedWire#28", @@ -470,11 +470,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I1_3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y3" }, "name": "unnamedWire#29", @@ -495,7 +495,7 @@ "pinName": "O0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_1" }, "name": "unnamedWire#3", @@ -503,11 +503,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "Y4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "I1_4" }, "name": "unnamedWire#30", @@ -540,7 +540,7 @@ "pinName": "I0" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "Y1" }, "name": "unnamedWire#32", @@ -548,7 +548,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "Y2" }, "pin2": { @@ -564,7 +564,7 @@ "pinName": "I2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "Y3" }, "name": "unnamedWire#34", @@ -572,7 +572,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "Y4" }, "pin2": { @@ -588,7 +588,7 @@ "pinName": "S1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1_4#2", "pinName": "S0" }, "name": "unnamedWire#36", @@ -613,7 +613,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I0_4" }, "pin2": { @@ -629,7 +629,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_2" }, "name": "unnamedWire#5", @@ -637,7 +637,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_3" }, "pin2": { @@ -653,7 +653,7 @@ "pinName": "O3" }, "pin2": { - "compName": "DeserializedSubmodelComponent#1", + "compName": "mux1_4#1", "pinName": "I1_4" }, "name": "unnamedWire#7", @@ -665,7 +665,7 @@ "pinName": "O2" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#8", @@ -677,7 +677,7 @@ "pinName": "O1" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json index 7b54b5d5..ac5aa8ae 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json @@ -115,16 +115,26 @@ "submodel": { "components": [ { - "id": "mux2", - "name": "DeserializedSubmodelComponent#0", + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", "pos": { - "x": 35.0, - "y": 185.0 - } + "x": 19.0, + "y": 104.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 24.0, + "y": 94.0 + }, + "params": 1 }, { "id": "mux1", - "name": "DeserializedSubmodelComponent#2", + "name": "mux1#0", "pos": { "x": 125.0, "y": 20.0 @@ -132,29 +142,19 @@ }, { "id": "mux2", - "name": "DeserializedSubmodelComponent#3", + "name": "mux2#0", "pos": { "x": 35.0, - "y": 85.0 + "y": 185.0 } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 19.0, - "y": 104.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", + "id": "mux2", + "name": "mux2#1", "pos": { - "x": 24.0, - "y": 94.0 - }, - "params": 1 + "x": 35.0, + "y": 85.0 + } } ], "wires": [ @@ -194,7 +194,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "I11" }, "pin2": { @@ -215,7 +215,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "I00" }, "pin2": { @@ -240,7 +240,7 @@ "pinName": "I101" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "I01" }, "name": "unnamedWire#12", @@ -248,7 +248,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "I10" }, "pin2": { @@ -273,7 +273,7 @@ "pinName": "I111" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "I11" }, "name": "unnamedWire#14", @@ -290,11 +290,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "I1" }, "name": "unnamedWire#15", @@ -311,11 +311,11 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "Y" }, "pin2": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "I0" }, "name": "unnamedWire#16", @@ -332,7 +332,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "S0" }, "pin2": { @@ -348,7 +348,7 @@ "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "S1" }, "name": "unnamedWire#2", @@ -356,7 +356,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "S0" }, "pin2": { @@ -368,7 +368,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "S1" }, "pin2": { @@ -385,7 +385,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", + "compName": "mux2#0", "pinName": "S0" }, "pin2": { @@ -402,7 +402,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#2", + "compName": "mux1#0", "pinName": "Y" }, "pin2": { @@ -418,7 +418,7 @@ "pinName": "I000" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "I00" }, "name": "unnamedWire#7", @@ -435,7 +435,7 @@ }, { "pin1": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "I01" }, "pin2": { @@ -451,7 +451,7 @@ "pinName": "I010" }, "pin2": { - "compName": "DeserializedSubmodelComponent#3", + "compName": "mux2#1", "pinName": "I10" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json index d53f4c8e..afd89f18 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json @@ -53,7 +53,7 @@ "components": [ { "id": "NandGate", - "name": "NandGate#1", + "name": "NandGate#0", "pos": { "x": 35.0, "y": 30.0 @@ -62,7 +62,7 @@ }, { "id": "NandGate", - "name": "NandGate#2", + "name": "NandGate#1", "pos": { "x": 35.0, "y": 55.0 @@ -71,7 +71,7 @@ }, { "id": "NandGate", - "name": "NandGate#3", + "name": "NandGate#2", "pos": { "x": 60.0, "y": 40.0 @@ -86,7 +86,7 @@ "pinName": "S1" }, "pin2": { - "compName": "NandGate#1", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#0", @@ -107,7 +107,7 @@ "pinName": "S2" }, "pin2": { - "compName": "NandGate#2", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#1", @@ -124,7 +124,7 @@ }, { "pin1": { - "compName": "NandGate#3", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -139,7 +139,7 @@ "pinName": "I1" }, "pin2": { - "compName": "NandGate#1", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#5", @@ -160,7 +160,7 @@ "pinName": "I2" }, "pin2": { - "compName": "NandGate#2", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#7", @@ -177,22 +177,22 @@ }, { "pin1": { - "compName": "NandGate#1", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "NandGate#3", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#8" }, { "pin1": { - "compName": "NandGate#2", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "NandGate#3", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#9" diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java index bd4d4588..f1e90aa0 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java @@ -5,24 +5,35 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Scanner; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; import net.mograsim.logic.model.am2900.Am2900Loader; import net.mograsim.logic.model.model.LogicModelModifiable; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; +import net.mograsim.logic.model.model.components.submodels.SubmodelInterface; import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; +import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; public class ReserializeJSONsSettingUsages { + public static boolean changePinUsages = false; + public static boolean changeComponentNames = true; + public static void main(String[] args) throws IOException { Am2900Loader.setup(); @@ -54,16 +65,77 @@ public class ReserializeJSONsSettingUsages DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator .createComponent(new LogicModelModifiable(), "jsonfile:" + json.toString()); System.out.println("Reserializing " + json); - comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin -> + if (changePinUsages) + comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin -> + { + PinUsage usage = null; + while (usage == null) + try + { + System.out.print(" Usage for interface pin " + pin.name + " (empty: " + pin.usage + ") >"); + String usageStr = sysin.nextLine().toUpperCase(); + usage = usageStr.equals("") ? pin.usage + : usageStr.equals("I") ? PinUsage.INPUT + : usageStr.equals("O") ? PinUsage.OUTPUT + : usageStr.equals("T") ? PinUsage.TRISTATE : PinUsage.valueOf(usageStr); + } + catch (@SuppressWarnings("unused") IllegalArgumentException e) + { + System.err.println(" Illegal usage"); + } + setInterfacePinUsage(comp, pin, usage); + }); + LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable(); + if (changeComponentNames) { - System.out.print(" Usage for interface pin " + pin.name + " (empty: " + pin.usage + ") >"); - String usageStr = sysin.nextLine().toUpperCase(); - PinUsage usage = usageStr.equals("") ? pin.usage - : usageStr.equals("I") ? PinUsage.INPUT - : usageStr.equals("O") ? PinUsage.OUTPUT - : usageStr.equals("T") ? PinUsage.TRISTATE : PinUsage.valueOf(usageStr); - setInterfacePinUsage(comp, pin, usage); - }); + Map componentNameRemapping = new HashMap<>(); + componentNameRemapping.put(SubmodelComponent.SUBMODEL_INTERFACE_NAME, SubmodelComponent.SUBMODEL_INTERFACE_NAME); + LogicModelModifiable tempModel = new LogicModelModifiable(); + IdentifyParams iP = new IdentifyParams(); + submodelModifiable.getComponentsByName().entrySet().stream() + .filter(e -> !e.getKey().equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)) + .sorted(Comparator.comparing(Entry::getKey, ReserializeJSONsSettingUsages::compareStringsWithIntegers)).forEach(e -> + { + String oldName = e.getKey(); + ModelComponent subcomp = e.getValue(); + String defaultName = tempModel.getDefaultComponentName(subcomp); + String newName = null; + while (newName == null) + { + System.out.print(" New name for component " + oldName + " of type " + subcomp.getIDForSerializing(iP) + + " (empty: " + defaultName + ") >"); + newName = sysin.nextLine(); + if (newName.equals("")) + newName = defaultName; + if (tempModel.getComponentsByName().containsKey(newName)) + { + System.err.println(" There already is a component with that name"); + newName = null; + } + } + componentNameRemapping.put(oldName, newName); + IndirectModelComponentCreator.createComponent(tempModel, subcomp.getIDForSerializing(iP), + subcomp.getParamsForSerializingJSON(iP), newName).moveTo(subcomp.getPosX(), subcomp.getPosY()); + }); + SubmodelInterface tempSubmodelInterface = new SubmodelInterface(tempModel); + for (Pin p : submodelModifiable.getComponentsByName().get(SubmodelComponent.SUBMODEL_INTERFACE_NAME).getPins().values()) + tempSubmodelInterface + .addPin(new Pin(tempModel, tempSubmodelInterface, p.name, p.logicWidth, p.usage, p.getRelX(), p.getRelY())); + for (ModelWire w : submodelModifiable.getWiresByName().values()) + createWire(componentNameRemapping::get, tempModel, w); + + Optional o; + while ((o = submodelModifiable.getComponentsByName().values().stream() + .filter(c -> !c.name.equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)).findAny()).isPresent()) + submodelModifiable.destroyComponent(o.get()); + + tempModel.getComponentsByName().values().stream().filter(c -> !c.name.equals(SubmodelComponent.SUBMODEL_INTERFACE_NAME)) + .forEach(c -> IndirectModelComponentCreator + .createComponent(submodelModifiable, c.getIDForSerializing(iP), c.getParamsForSerializingJSON(iP), c.name) + .moveTo(c.getPosX(), c.getPosY())); + for (ModelWire w : tempModel.getWiresByName().values()) + createWire(Function.identity(), submodelModifiable, w); + } SubmodelComponentSerializer.serialize(comp, json.toString()); } catch (Exception e) @@ -73,6 +145,78 @@ public class ReserializeJSONsSettingUsages } } + private static ModelWire createWire(Function componentNameRemapping, LogicModelModifiable tempModelForDefaultNames, + ModelWire w) + { + return new ModelWire(tempModelForDefaultNames, w.name, + getRemappedPin(componentNameRemapping, tempModelForDefaultNames, w.getPin1()), + getRemappedPin(componentNameRemapping, tempModelForDefaultNames, w.getPin2()), w.getPath()); + } + + private static Pin getRemappedPin(Function componentNameRemapping, LogicModelModifiable tempModelForDefaultNames, + Pin pin) + { + return tempModelForDefaultNames.getComponentsByName().get(componentNameRemapping.apply(pin.component.name)).getPin(pin.name); + } + + private static int compareStringsWithIntegers(String a, String b) + { + int aLoc = 0; + int bLoc = 0; + for (;;) + { + if (aLoc == a.length()) + { + if (bLoc == b.length()) + return 0; + return -1; + } + if (bLoc == b.length()) + return 1; + int aInt = 0; + int aIntLen = 0; + char nextCharA; + for (;;) + { + nextCharA = a.charAt(aLoc++); + if (nextCharA < '0' || nextCharA > '9') + break; + aIntLen++; + aInt = aInt * 10 + nextCharA - '0'; + if (aLoc == a.length()) + break; + } + int bInt = 0; + int bIntLen = 0; + char nextCharB; + for (;;) + { + nextCharB = b.charAt(bLoc++); + if (nextCharB < '0' || nextCharB > '9') + break; + bIntLen++; + bInt = bInt * 10 + nextCharB - '0'; + if (bLoc == b.length()) + break; + } + if (aIntLen != 0) + { + if (bIntLen == 0) + return -1; + int comp = Integer.compare(aInt, bInt); + if (comp != 0) + return comp; + } else + { + if (bIntLen != 0) + return 1; + int comp = Character.compare(nextCharA, nextCharB); + if (comp != 0) + return comp; + } + } + } + private static void setInterfacePinUsage(DeserializedSubmodelComponent comp, Pin interfacePin, PinUsage usage) { Set wiresConnectedToPin = comp.submodel.getWiresByName().values().stream() -- 2.17.1