From: Fabian Stemmler Date: Wed, 11 Sep 2019 15:11:45 +0000 (+0200) Subject: Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim... X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=662fb8ae0007c317aa210b1de50499b47f38477a;hp=-c;p=Mograsim.git Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development --- 662fb8ae0007c317aa210b1de50499b47f38477a diff --combined net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index 6f0ac00f,86f578bc..de38b1a0 --- 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 @@@ -1,6 -1,6 +1,6 @@@ { "width": 87.0, - "height": 113.5, + "height": 125.0, "interfacePins": [ { "location": { @@@ -94,8 -94,8 +94,8 @@@ }, { "location": { - "x": 0.0, - "y": 45.0 + "x": 87.0, + "y": 120.0 }, "name": "Cn+4", "logicWidth": 1, @@@ -149,7 -149,7 +149,7 @@@ { "location": { "x": 0.0, - "y": 40.0 + "y": 45.0 }, "name": "F\u003d0", "logicWidth": 1, @@@ -248,7 -248,7 +248,7 @@@ { "location": { "x": 0.0, - "y": 25.0 + "y": 20.0 }, "name": "Qn", "logicWidth": 1, @@@ -256,8 -256,8 +256,8 @@@ }, { "location": { - "x": 0.0, - "y": 30.0 + "x": 87.0, + "y": 115.0 }, "name": "Qn+3", "logicWidth": 1, @@@ -274,8 -274,8 +274,8 @@@ }, { "location": { - "x": 0.0, - "y": 15.0 + "x": 87.0, + "y": 110.0 }, "name": "RAMn+3", "logicWidth": 1, @@@ -283,8 -283,8 +283,8 @@@ }, { "location": { - "x": 64.5, - "y": 113.5 + "x": 64.0, + "y": 125.0 }, "name": "Y1", "logicWidth": 1, @@@ -292,8 -292,8 +292,8 @@@ }, { "location": { - "x": 69.5, - "y": 113.5 + "x": 69.0, + "y": 125.0 }, "name": "Y2", "logicWidth": 1, @@@ -301,8 -301,8 +301,8 @@@ }, { "location": { - "x": 74.5, - "y": 113.5 + "x": 74.0, + "y": 125.0 }, "name": "Y3", "logicWidth": 1, @@@ -310,8 -310,8 +310,8 @@@ }, { "location": { - "x": 79.5, - "y": 113.5 + "x": 79.0, + "y": 125.0 }, "name": "Y4", "logicWidth": 1, @@@ -424,15 -424,6 +424,6 @@@ { "id": "WireCrossPoint", "name": "WireCrossPoint#10", - "pos": { - "x": 334.0, - "y": 394.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#11", "pos": { "x": 229.0, "y": 909.0 @@@ -441,7 -432,7 +432,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#12", + "name": "WireCrossPoint#11", "pos": { "x": 234.0, "y": 919.0 @@@ -450,7 -441,7 +441,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#13", + "name": "WireCrossPoint#12", "pos": { "x": 239.0, "y": 929.0 @@@ -459,7 -450,7 +450,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#14", + "name": "WireCrossPoint#13", "pos": { "x": 244.0, "y": 939.0 @@@ -468,7 -459,7 +459,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#15", + "name": "WireCrossPoint#14", "pos": { "x": 319.0, "y": 909.0 @@@ -477,7 -468,7 +468,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#16", + "name": "WireCrossPoint#15", "pos": { "x": 334.0, "y": 939.0 @@@ -486,7 -477,7 +477,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#17", + "name": "WireCrossPoint#16", "pos": { "x": 134.0, "y": 1039.0 @@@ -495,7 -486,7 +486,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#18", + "name": "WireCrossPoint#17", "pos": { "x": 139.0, "y": 1049.0 @@@ -504,7 -495,7 +495,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#19", + "name": "WireCrossPoint#18", "pos": { "x": 379.0, "y": 529.0 @@@ -513,7 -504,7 +504,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#20", + "name": "WireCrossPoint#19", "pos": { "x": 394.0, "y": 544.0 @@@ -522,7 -513,16 +513,16 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#21", + "name": "WireCrossPoint#2", + "pos": { + "x": 254.0, + "y": 749.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#20", "pos": { "x": 434.0, "y": 734.0 @@@ -531,7 -531,7 +531,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#22", + "name": "WireCrossPoint#21", "pos": { "x": 354.0, "y": 504.0 @@@ -540,7 -540,7 +540,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#23", + "name": "WireCrossPoint#22", "pos": { "x": 359.0, "y": 509.0 @@@ -549,7 -549,7 +549,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#24", + "name": "WireCrossPoint#23", "pos": { "x": 364.0, "y": 514.0 @@@ -558,7 -558,7 +558,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#25", + "name": "WireCrossPoint#24", "pos": { "x": 369.0, "y": 519.0 @@@ -567,7 -567,7 +567,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#26", + "name": "WireCrossPoint#25", "pos": { "x": 354.0, "y": 449.0 @@@ -576,7 -576,7 +576,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#27", + "name": "WireCrossPoint#26", "pos": { "x": 359.0, "y": 459.0 @@@ -585,7 -585,7 +585,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#28", + "name": "WireCrossPoint#27", "pos": { "x": 364.0, "y": 469.0 @@@ -594,7 -594,7 +594,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#29", + "name": "WireCrossPoint#28", "pos": { "x": 369.0, "y": 479.0 @@@ -603,25 -603,25 +603,25 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#29", "pos": { - "x": 254.0, - "y": 749.0 + "x": 104.0, + "y": 769.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#30", + "name": "WireCrossPoint#3", "pos": { - "x": 104.0, - "y": 769.0 + "x": 134.0, + "y": 729.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#31", + "name": "WireCrossPoint#30", "pos": { "x": 109.0, "y": 779.0 @@@ -630,7 -630,7 +630,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#32", + "name": "WireCrossPoint#31", "pos": { "x": 114.0, "y": 789.0 @@@ -639,7 -639,7 +639,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#33", + "name": "WireCrossPoint#32", "pos": { "x": 109.0, "y": 809.0 @@@ -648,7 -648,7 +648,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#34", + "name": "WireCrossPoint#33", "pos": { "x": 114.0, "y": 819.0 @@@ -657,7 -657,7 +657,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#35", + "name": "WireCrossPoint#34", "pos": { "x": 119.0, "y": 829.0 @@@ -666,7 -666,7 +666,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#36", + "name": "WireCrossPoint#35", "pos": { "x": 104.0, "y": 799.0 @@@ -675,7 -675,7 +675,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#37", + "name": "WireCrossPoint#36", "pos": { "x": 109.0, "y": 839.0 @@@ -684,7 -684,7 +684,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#38", + "name": "WireCrossPoint#37", "pos": { "x": 114.0, "y": 849.0 @@@ -693,7 -693,7 +693,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#39", + "name": "WireCrossPoint#38", "pos": { "x": 119.0, "y": 859.0 @@@ -702,25 -702,25 +702,25 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#4", + "name": "WireCrossPoint#39", "pos": { - "x": 134.0, - "y": 729.0 + "x": 414.0, + "y": 449.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#40", + "name": "WireCrossPoint#4", "pos": { - "x": 414.0, - "y": 449.0 + "x": 129.0, + "y": 739.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#41", + "name": "WireCrossPoint#40", "pos": { "x": 99.0, "y": 964.0 @@@ -729,7 -729,7 +729,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#42", + "name": "WireCrossPoint#41", "pos": { "x": 99.0, "y": 764.0 @@@ -738,7 -738,7 +738,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#44", + "name": "WireCrossPoint#42", "pos": { "x": 124.0, "y": 889.0 @@@ -747,7 -747,7 +747,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#45", + "name": "WireCrossPoint#43", "pos": { "x": 364.0, "y": 889.0 @@@ -756,7 -756,7 +756,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#46", + "name": "WireCrossPoint#44", "pos": { "x": 134.0, "y": 894.0 @@@ -765,7 -765,7 +765,7 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#47", + "name": "WireCrossPoint#45", "pos": { "x": 409.0, "y": 894.0 @@@ -774,9 -774,9 +774,9 @@@ }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#48", + "name": "WireCrossPoint#46", "pos": { - "x": 144.0, + "x": 424.0, "y": 1079.0 }, "params": 1 @@@ -785,8 -785,8 +785,8 @@@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 129.0, - "y": 739.0 + "x": 124.0, + "y": 749.0 }, "params": 1 }, @@@ -794,8 -794,8 +794,8 @@@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 124.0, - "y": 749.0 + "x": 349.0, + "y": 364.0 }, "params": 1 }, @@@ -803,8 -803,8 +803,8 @@@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 349.0, - "y": 364.0 + "x": 344.0, + "y": 374.0 }, "params": 1 }, @@@ -812,8 -812,8 +812,8 @@@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 344.0, - "y": 374.0 + "x": 339.0, + "y": 384.0 }, "params": 1 }, @@@ -821,8 -821,8 +821,8 @@@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 339.0, - "y": 384.0 + "x": 334.0, + "y": 394.0 }, "params": 1 }, @@@ -985,7 -985,7 +985,7 @@@ "pinName": "F3" }, "pin2": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#23", "pinName": "" }, "name": "unnamedWire#100", @@@ -1010,11 -1010,11 +1010,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#24", "pinName": "" }, "name": "unnamedWire#101", @@@ -1027,11 -1027,11 +1027,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#21", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#25", "pinName": "" }, "name": "unnamedWire#102", @@@ -1039,11 -1039,11 +1039,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#22", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#26", "pinName": "" }, "name": "unnamedWire#103", @@@ -1051,11 -1051,11 +1051,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#23", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#28", + "compName": "WireCrossPoint#27", "pinName": "" }, "name": "unnamedWire#104", @@@ -1063,11 -1063,11 +1063,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#24", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#29", + "compName": "WireCrossPoint#28", "pinName": "" }, "name": "unnamedWire#105", @@@ -1075,7 -1075,7 +1075,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#25", "pinName": "" }, "pin2": { @@@ -1087,7 -1087,7 +1087,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#26", "pinName": "" }, "pin2": { @@@ -1099,7 -1099,7 +1099,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#28", + "compName": "WireCrossPoint#27", "pinName": "" }, "pin2": { @@@ -1111,7 -1111,7 +1111,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#29", + "compName": "WireCrossPoint#28", "pinName": "" }, "pin2": { @@@ -1135,7 -1135,7 +1135,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#26", + "compName": "WireCrossPoint#25", "pinName": "" }, "pin2": { @@@ -1152,7 -1152,7 +1152,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#27", + "compName": "WireCrossPoint#26", "pinName": "" }, "pin2": { @@@ -1169,7 -1169,7 +1169,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#28", + "compName": "WireCrossPoint#27", "pinName": "" }, "pin2": { @@@ -1186,7 -1186,7 +1186,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#29", + "compName": "WireCrossPoint#28", "pinName": "" }, "pin2": { @@@ -1203,11 -1203,11 +1203,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#21", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#29", "pinName": "" }, "name": "unnamedWire#114", @@@ -1220,11 -1220,11 +1220,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#22", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#31", + "compName": "WireCrossPoint#30", "pinName": "" }, "name": "unnamedWire#115", @@@ -1237,11 -1237,11 +1237,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#24", + "compName": "WireCrossPoint#23", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#32", + "compName": "WireCrossPoint#31", "pinName": "" }, "name": "unnamedWire#116", @@@ -1258,7 -1258,7 +1258,7 @@@ "pinName": "A1" }, "pin2": { - "compName": "WireCrossPoint#41", + "compName": "WireCrossPoint#40", "pinName": "" }, "name": "unnamedWire#117", @@@ -1271,7 -1271,7 +1271,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#29", "pinName": "" }, "pin2": { @@@ -1283,7 -1283,7 +1283,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#31", + "compName": "WireCrossPoint#30", "pinName": "" }, "pin2": { @@@ -1312,7 -1312,7 +1312,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#32", + "compName": "WireCrossPoint#31", "pinName": "" }, "pin2": { @@@ -1324,11 -1324,11 +1324,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#31", + "compName": "WireCrossPoint#30", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#33", + "compName": "WireCrossPoint#32", "pinName": "" }, "name": "unnamedWire#121", @@@ -1336,11 -1336,11 +1336,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#32", + "compName": "WireCrossPoint#31", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#34", + "compName": "WireCrossPoint#33", "pinName": "" }, "name": "unnamedWire#122", @@@ -1348,11 -1348,11 +1348,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#25", + "compName": "WireCrossPoint#24", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#35", + "compName": "WireCrossPoint#34", "pinName": "" }, "name": "unnamedWire#123", @@@ -1365,11 -1365,11 +1365,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#30", + "compName": "WireCrossPoint#29", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#36", + "compName": "WireCrossPoint#35", "pinName": "" }, "name": "unnamedWire#124", @@@ -1377,7 -1377,7 +1377,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#36", + "compName": "WireCrossPoint#35", "pinName": "" }, "pin2": { @@@ -1389,7 -1389,7 +1389,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#33", + "compName": "WireCrossPoint#32", "pinName": "" }, "pin2": { @@@ -1401,7 -1401,7 +1401,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#34", + "compName": "WireCrossPoint#33", "pinName": "" }, "pin2": { @@@ -1413,7 -1413,7 +1413,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#35", + "compName": "WireCrossPoint#34", "pinName": "" }, "pin2": { @@@ -1425,11 -1425,11 +1425,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#33", + "compName": "WireCrossPoint#32", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#37", + "compName": "WireCrossPoint#36", "pinName": "" }, "name": "unnamedWire#129", @@@ -1441,7 -1441,7 +1441,7 @@@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "name": "unnamedWire#13", @@@ -1458,11 -1458,11 +1458,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#34", + "compName": "WireCrossPoint#33", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#38", + "compName": "WireCrossPoint#37", "pinName": "" }, "name": "unnamedWire#130", @@@ -1470,11 -1470,11 +1470,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#35", + "compName": "WireCrossPoint#34", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#39", + "compName": "WireCrossPoint#38", "pinName": "" }, "name": "unnamedWire#131", @@@ -1482,7 -1482,7 +1482,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#37", + "compName": "WireCrossPoint#36", "pinName": "" }, "pin2": { @@@ -1494,7 -1494,7 +1494,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#38", + "compName": "WireCrossPoint#37", "pinName": "" }, "pin2": { @@@ -1506,7 -1506,7 +1506,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#39", + "compName": "WireCrossPoint#38", "pinName": "" }, "pin2": { @@@ -1518,7 -1518,7 +1518,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { @@@ -1530,7 -1530,7 +1530,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#36", + "compName": "WireCrossPoint#35", "pinName": "" }, "pin2": { @@@ -1547,7 -1547,7 +1547,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#37", + "compName": "WireCrossPoint#36", "pinName": "" }, "pin2": { @@@ -1564,7 -1564,7 +1564,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#38", + "compName": "WireCrossPoint#37", "pinName": "" }, "pin2": { @@@ -1581,7 -1581,7 +1581,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#39", + "compName": "WireCrossPoint#38", "pinName": "" }, "pin2": { @@@ -1598,7 -1598,7 +1598,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@@ -1820,11 -1820,11 +1820,11 @@@ }, { "x": 725.0, - "y": 1125.0 + "y": 1240.0 }, { - "x": 645.0, - "y": 1125.0 + "x": 640.0, + "y": 1240.0 } ] }, @@@ -1853,11 -1853,11 +1853,11 @@@ }, { "x": 730.0, - "y": 1130.0 + "y": 1245.0 }, { - "x": 695.0, - "y": 1130.0 + "x": 690.0, + "y": 1245.0 } ] }, @@@ -1886,11 -1886,11 +1886,11 @@@ }, { "x": 735.0, - "y": 1130.0 + "y": 1245.0 }, { - "x": 745.0, - "y": 1130.0 + "x": 740.0, + "y": 1245.0 } ] }, @@@ -1919,11 -1919,11 +1919,11 @@@ }, { "x": 740.0, - "y": 1125.0 + "y": 1240.0 }, { - "x": 795.0, - "y": 1125.0 + "x": 790.0, + "y": 1240.0 } ] }, @@@ -1933,7 -1933,7 +1933,7 @@@ "pinName": "Y" }, "pin2": { - "compName": "WireCrossPoint#40", + "compName": "WireCrossPoint#39", "pinName": "" }, "name": "unnamedWire#153", @@@ -1941,7 -1941,7 +1941,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#40", + "compName": "WireCrossPoint#39", "pinName": "" }, "pin2": { @@@ -1958,7 -1958,7 +1958,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#40", + "compName": "WireCrossPoint#39", "pinName": "" }, "pin2": { @@@ -1998,13 -1998,13 +1998,13 @@@ }, { "x": 310.0, - "y": 400.0 + "y": 450.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#41", + "compName": "WireCrossPoint#40", "pinName": "" }, "pin2": { @@@ -2029,7 -2029,7 +2029,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#19", + "compName": "WireCrossPoint#18", "pinName": "" }, "pin2": { @@@ -2041,7 -2041,7 +2041,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@@ -2058,7 -2058,7 +2058,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#41", "pinName": "" }, "pin2": { @@@ -2075,7 -2075,7 +2075,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#41", "pinName": "" }, "pin2": { @@@ -2096,7 -2096,7 +2096,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { @@@ -2117,11 -2117,11 +2117,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#44", + "compName": "WireCrossPoint#42", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#164", @@@ -2129,7 -2129,7 +2129,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#45", + "compName": "WireCrossPoint#43", "pinName": "" }, "pin2": { @@@ -2150,7 -2150,7 +2150,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#45", + "compName": "WireCrossPoint#43", "pinName": "" }, "pin2": { @@@ -2162,11 -2162,11 +2162,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#45", + "compName": "WireCrossPoint#43", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#44", + "compName": "WireCrossPoint#42", "pinName": "" }, "name": "unnamedWire#167", @@@ -2174,11 -2174,11 +2174,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#46", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#168", @@@ -2186,11 -2186,11 +2186,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#46", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#47", + "compName": "WireCrossPoint#45", "pinName": "" }, "name": "unnamedWire#169", @@@ -2198,7 -2198,7 +2198,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { @@@ -2227,7 -2227,7 +2227,7 @@@ "pinName": "EN" }, "pin2": { - "compName": "WireCrossPoint#47", + "compName": "WireCrossPoint#45", "pinName": "" }, "name": "unnamedWire#170", @@@ -2235,7 -2235,7 +2235,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#19", "pinName": "" }, "pin2": { @@@ -2256,7 -2256,7 +2256,7 @@@ "pinName": "C4" }, "pin2": { - "compName": "WireCrossPoint#48", + "compName": "WireCrossPoint#46", "pinName": "" }, "name": "unnamedWire#172", @@@ -2264,16 -2264,12 +2264,16 @@@ { "x": 145.0, "y": 1070.0 + }, + { + "x": 145.0, + "y": 1080.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#48", + "compName": "WireCrossPoint#46", "pinName": "" }, "pin2": { @@@ -2282,6 -2278,10 +2282,6 @@@ }, "name": "unnamedWire#173", "path": [ - { - "x": 425.0, - "y": 1080.0 - }, { "x": 425.0, "y": 940.0 @@@ -2290,7 -2290,7 +2290,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#48", + "compName": "WireCrossPoint#46", "pinName": "" }, "pin2": { @@@ -2300,8 -2300,12 +2300,8 @@@ "name": "unnamedWire#174", "path": [ { - "x": 20.0, - "y": 1080.0 - }, - { - "x": 20.0, - "y": 300.0 + "x": 425.0, + "y": 1150.0 } ] }, @@@ -2311,7 -2315,7 +2311,7 @@@ "pinName": "LSH" }, "pin2": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#18", @@@ -2336,7 -2340,7 +2336,7 @@@ "pinName": "NSH" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "name": "unnamedWire#19", @@@ -2390,7 -2394,7 +2390,7 @@@ "pinName": "RSH" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#20", @@@ -2411,7 -2415,7 +2411,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { @@@ -2423,7 -2427,7 +2423,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@@ -2435,7 -2439,7 +2435,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { @@@ -2447,7 -2451,7 +2447,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#46", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { @@@ -2464,7 -2468,7 +2464,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@@ -2485,7 -2489,7 +2485,7 @@@ "pinName": "SC" }, "pin2": { - "compName": "WireCrossPoint#44", + "compName": "WireCrossPoint#42", "pinName": "" }, "name": "unnamedWire#26", @@@ -3057,7 -3061,7 +3057,7 @@@ "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "name": "unnamedWire#48", @@@ -3082,7 -3086,7 +3082,7 @@@ "pinName": "Q2" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#49", @@@ -3132,7 -3136,7 +3132,7 @@@ "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "name": "unnamedWire#50", @@@ -3157,7 -3161,7 +3157,7 @@@ "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "name": "unnamedWire#51", @@@ -3178,7 -3182,7 +3178,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { @@@ -3190,7 -3194,7 +3190,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { @@@ -3202,7 -3206,7 +3202,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { @@@ -3214,7 -3218,7 +3214,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { @@@ -3226,7 -3230,7 +3226,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { @@@ -3243,7 -3247,7 +3243,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "pin2": { @@@ -3260,7 -3264,7 +3260,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { @@@ -3277,7 -3281,7 +3277,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { @@@ -3407,7 -3411,7 +3407,7 @@@ "pinName": "Q1" }, "pin2": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "name": "unnamedWire#64", @@@ -3419,7 -3423,7 +3419,7 @@@ "pinName": "Q2" }, "pin2": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "name": "unnamedWire#65", @@@ -3431,7 -3435,7 +3431,7 @@@ "pinName": "Q3" }, "pin2": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "name": "unnamedWire#66", @@@ -3443,7 -3447,7 +3443,7 @@@ "pinName": "Q4" }, "pin2": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "name": "unnamedWire#67", @@@ -3451,11 -3455,11 +3451,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#14", "pinName": "" }, "name": "unnamedWire#68", @@@ -3463,7 -3467,7 +3463,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#14", "pinName": "" }, "pin2": { @@@ -3500,11 -3504,11 +3500,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#15", "pinName": "" }, "name": "unnamedWire#70", @@@ -3516,14 -3520,14 +3516,14 @@@ "pinName": "Qn" }, "pin2": { - "compName": "WireCrossPoint#41", + "compName": "WireCrossPoint#40", "pinName": "" }, "name": "unnamedWire#71", "path": [ { "x": 80.0, - "y": 250.0 + "y": 200.0 }, { "x": 80.0, @@@ -3533,11 -3537,11 +3533,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#16", "pinName": "" }, "name": "unnamedWire#72", @@@ -3562,11 -3566,11 +3562,11 @@@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#18", + "compName": "WireCrossPoint#17", "pinName": "" }, "name": "unnamedWire#73", @@@ -3591,7 -3595,7 +3591,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { @@@ -3603,7 -3607,7 +3603,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#18", + "compName": "WireCrossPoint#17", "pinName": "" }, "pin2": { @@@ -3615,7 -3619,7 +3615,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#14", + "compName": "WireCrossPoint#13", "pinName": "" }, "pin2": { @@@ -3644,7 -3648,7 +3644,7 @@@ "pinName": "RAMn" }, "pin2": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#41", "pinName": "" }, "name": "unnamedWire#78", @@@ -3661,7 -3665,7 +3661,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#11", + "compName": "WireCrossPoint#10", "pinName": "" }, "pin2": { @@@ -3719,7 -3723,7 +3719,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#15", + "compName": "WireCrossPoint#14", "pinName": "" }, "pin2": { @@@ -3736,7 -3740,7 +3736,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#12", + "compName": "WireCrossPoint#11", "pinName": "" }, "pin2": { @@@ -3757,7 -3761,7 +3757,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#13", + "compName": "WireCrossPoint#12", "pinName": "" }, "pin2": { @@@ -3778,7 -3782,7 +3778,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#16", + "compName": "WireCrossPoint#15", "pinName": "" }, "pin2": { @@@ -3795,7 -3799,7 +3795,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#17", + "compName": "WireCrossPoint#16", "pinName": "" }, "pin2": { @@@ -3812,7 -3816,7 +3812,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#18", + "compName": "WireCrossPoint#17", "pinName": "" }, "pin2": { @@@ -3909,7 -3913,15 +3909,7 @@@ }, { "x": 615.0, - "y": 1130.0 - }, - { - "x": 90.0, - "y": 1130.0 - }, - { - "x": 90.0, - "y": 450.0 + "y": 1200.0 } ] }, @@@ -3948,7 -3960,7 +3948,7 @@@ "pinName": "F1" }, "pin2": { - "compName": "WireCrossPoint#19", + "compName": "WireCrossPoint#18", "pinName": "" }, "name": "unnamedWire#92", @@@ -3969,7 -3981,7 +3969,7 @@@ "pinName": "F4" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#19", "pinName": "" }, "name": "unnamedWire#93", @@@ -3990,7 -4002,7 +3990,7 @@@ "pinName": "OUT" }, "pin2": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#20", "pinName": "" }, "name": "unnamedWire#94", @@@ -3998,7 -4010,7 +3998,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#47", + "compName": "WireCrossPoint#45", "pinName": "" }, "pin2": { @@@ -4010,7 -4022,7 +4010,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#20", "pinName": "" }, "pin2": { @@@ -4043,7 -4055,7 +4043,7 @@@ }, { "pin1": { - "compName": "WireCrossPoint#21", + "compName": "WireCrossPoint#20", "pinName": "" }, "pin2": { @@@ -4058,17 -4070,17 +4058,17 @@@ }, { "x": 455.0, - "y": 150.0 + "y": 1100.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#19", + "compName": "WireCrossPoint#18", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#22", + "compName": "WireCrossPoint#21", "pinName": "" }, "name": "unnamedWire#98", @@@ -4085,7 -4097,7 +4085,7 @@@ "pinName": "F2" }, "pin2": { - "compName": "WireCrossPoint#23", + "compName": "WireCrossPoint#22", "pinName": "" }, "name": "unnamedWire#99",