From 5391f03e2f694b841c0684d3455d1b7cdc222b68 Mon Sep 17 00:00:00 2001 From: Fabian Stemmler Date: Tue, 10 Sep 2019 16:40:57 +0200 Subject: [PATCH] Restructured Am2901 and Am901ALUInclSourceDecodeInclFunctionDecode --- .../am2900/components/am2901/Am2901.json | 1664 +++++++++++------ ...ALUInclSourceDecodeInclFunctionDecode.json | 653 +++---- 2 files changed, 1357 insertions(+), 960 deletions(-) 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 2dd6a59d..8932e97b 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 @@ -1,11 +1,11 @@ { - "width": 35.0, - "height": 270.0, + "width": 87.0, + "height": 113.5, "interfacePins": [ { "location": { - "x": 0.0, - "y": 155.0 + "x": 87.0, + "y": 10.0 }, "name": "A0", "logicWidth": 1, @@ -13,8 +13,8 @@ }, { "location": { - "x": 0.0, - "y": 165.0 + "x": 87.0, + "y": 15.0 }, "name": "A1", "logicWidth": 1, @@ -22,8 +22,8 @@ }, { "location": { - "x": 0.0, - "y": 175.0 + "x": 87.0, + "y": 20.0 }, "name": "A2", "logicWidth": 1, @@ -31,8 +31,8 @@ }, { "location": { - "x": 0.0, - "y": 185.0 + "x": 87.0, + "y": 25.0 }, "name": "A3", "logicWidth": 1, @@ -40,8 +40,8 @@ }, { "location": { - "x": 0.0, - "y": 195.0 + "x": 87.0, + "y": 35.0 }, "name": "B0", "logicWidth": 1, @@ -49,8 +49,8 @@ }, { "location": { - "x": 0.0, - "y": 205.0 + "x": 87.0, + "y": 40.0 }, "name": "B1", "logicWidth": 1, @@ -58,8 +58,8 @@ }, { "location": { - "x": 0.0, - "y": 215.0 + "x": 87.0, + "y": 45.0 }, "name": "B2", "logicWidth": 1, @@ -67,8 +67,8 @@ }, { "location": { - "x": 0.0, - "y": 225.0 + "x": 87.0, + "y": 50.0 }, "name": "B3", "logicWidth": 1, @@ -94,8 +94,8 @@ }, { "location": { - "x": 35.0, - "y": 55.0 + "x": 0.0, + "y": 45.0 }, "name": "Cn+4", "logicWidth": 1, @@ -103,8 +103,8 @@ }, { "location": { - "x": 0.0, - "y": 115.0 + "x": 55.0, + "y": 0.0 }, "name": "D1", "logicWidth": 1, @@ -112,8 +112,8 @@ }, { "location": { - "x": 0.0, - "y": 125.0 + "x": 60.0, + "y": 0.0 }, "name": "D2", "logicWidth": 1, @@ -121,8 +121,8 @@ }, { "location": { - "x": 0.0, - "y": 135.0 + "x": 65.0, + "y": 0.0 }, "name": "D3", "logicWidth": 1, @@ -130,8 +130,8 @@ }, { "location": { - "x": 0.0, - "y": 145.0 + "x": 70.0, + "y": 0.0 }, "name": "D4", "logicWidth": 1, @@ -139,8 +139,8 @@ }, { "location": { - "x": 35.0, - "y": 75.0 + "x": 0.0, + "y": 55.0 }, "name": "F3", "logicWidth": 1, @@ -148,8 +148,8 @@ }, { "location": { - "x": 35.0, - "y": 45.0 + "x": 0.0, + "y": 40.0 }, "name": "F\u003d0", "logicWidth": 1, @@ -157,8 +157,8 @@ }, { "location": { - "x": 0.0, - "y": 85.0 + "x": 87.0, + "y": 100.0 }, "name": "I0", "logicWidth": 1, @@ -166,8 +166,8 @@ }, { "location": { - "x": 0.0, - "y": 75.0 + "x": 87.0, + "y": 95.0 }, "name": "I1", "logicWidth": 1, @@ -175,8 +175,8 @@ }, { "location": { - "x": 0.0, - "y": 65.0 + "x": 87.0, + "y": 90.0 }, "name": "I2", "logicWidth": 1, @@ -184,8 +184,8 @@ }, { "location": { - "x": 0.0, - "y": 55.0 + "x": 87.0, + "y": 85.0 }, "name": "I3", "logicWidth": 1, @@ -193,8 +193,8 @@ }, { "location": { - "x": 0.0, - "y": 45.0 + "x": 87.0, + "y": 80.0 }, "name": "I4", "logicWidth": 1, @@ -202,8 +202,8 @@ }, { "location": { - "x": 0.0, - "y": 35.0 + "x": 87.0, + "y": 75.0 }, "name": "I5", "logicWidth": 1, @@ -211,8 +211,8 @@ }, { "location": { - "x": 0.0, - "y": 25.0 + "x": 87.0, + "y": 70.0 }, "name": "I6", "logicWidth": 1, @@ -220,8 +220,8 @@ }, { "location": { - "x": 0.0, - "y": 15.0 + "x": 87.0, + "y": 65.0 }, "name": "I7", "logicWidth": 1, @@ -229,8 +229,8 @@ }, { "location": { - "x": 0.0, - "y": 5.0 + "x": 87.0, + "y": 60.0 }, "name": "I8", "logicWidth": 1, @@ -238,8 +238,8 @@ }, { "location": { - "x": 35.0, - "y": 65.0 + "x": 0.0, + "y": 50.0 }, "name": "OVR", "logicWidth": 1, @@ -248,7 +248,7 @@ { "location": { "x": 0.0, - "y": 255.0 + "y": 25.0 }, "name": "Qn", "logicWidth": 1, @@ -256,8 +256,8 @@ }, { "location": { - "x": 35.0, - "y": 115.0 + "x": 0.0, + "y": 30.0 }, "name": "Qn+3", "logicWidth": 1, @@ -266,7 +266,7 @@ { "location": { "x": 0.0, - "y": 235.0 + "y": 10.0 }, "name": "RAMn", "logicWidth": 1, @@ -274,8 +274,8 @@ }, { "location": { - "x": 35.0, - "y": 95.0 + "x": 0.0, + "y": 15.0 }, "name": "RAMn+3", "logicWidth": 1, @@ -283,8 +283,8 @@ }, { "location": { - "x": 35.0, - "y": 5.0 + "x": 64.5, + "y": 113.5 }, "name": "Y1", "logicWidth": 1, @@ -292,8 +292,8 @@ }, { "location": { - "x": 35.0, - "y": 15.0 + "x": 69.5, + "y": 113.5 }, "name": "Y2", "logicWidth": 1, @@ -301,8 +301,8 @@ }, { "location": { - "x": 35.0, - "y": 25.0 + "x": 74.5, + "y": 113.5 }, "name": "Y3", "logicWidth": 1, @@ -310,8 +310,8 @@ }, { "location": { - "x": 35.0, - "y": 35.0 + "x": 79.5, + "y": 113.5 }, "name": "Y4", "logicWidth": 1, @@ -325,24 +325,24 @@ "id": "Am2901ALUInclSourceDecodeInclFunctionDecode", "name": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pos": { - "x": 240.0, - "y": 2110.0 + "x": 510.0, + "y": 620.0 } }, { "id": "Am2901DestDecode", "name": "Am2901DestDecode#0", "pos": { - "x": 15.0, - "y": 45.0 + "x": 380.0, + "y": 160.0 } }, { "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 160.0, - "y": 75.0 + "x": 466.0, + "y": 190.0 }, "params": 1 }, @@ -350,7 +350,7 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 320.0, + "x": 421.0, "y": 440.0 }, "params": 1 @@ -359,8 +359,8 @@ "id": "TriStateBuffer", "name": "TriStateBuffer#0", "pos": { - "x": 255.0, - "y": 2485.0 + "x": 356.0, + "y": 901.0 }, "params": { "logicWidth": 1, @@ -371,8 +371,8 @@ "id": "TriStateBuffer", "name": "TriStateBuffer#1", "pos": { - "x": 270.0, - "y": 2435.0 + "x": 370.0, + "y": 850.0 }, "params": { "logicWidth": 1, @@ -383,8 +383,8 @@ "id": "TriStateBuffer", "name": "TriStateBuffer#2", "pos": { - "x": 300.0, - "y": 2515.0 + "x": 400.0, + "y": 930.0 }, "params": { "logicWidth": 1, @@ -395,8 +395,8 @@ "id": "TriStateBuffer", "name": "TriStateBuffer#3", "pos": { - "x": 300.0, - "y": 2310.0 + "x": 401.0, + "y": 726.0 }, "params": { "logicWidth": 1, @@ -407,8 +407,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 154.0, - "y": 949.0 + "x": 15.0, + "y": 715.0 }, "params": 1 }, @@ -416,8 +416,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 154.0, - "y": 89.0 + "x": 460.0, + "y": 195.0 }, "params": 1 }, @@ -425,8 +425,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 234.0, - "y": 2254.0 + "x": 335.0, + "y": 395.0 }, "params": 1 }, @@ -434,8 +434,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { - "x": 129.0, - "y": 2494.0 + "x": 230.0, + "y": 910.0 }, "params": 1 }, @@ -443,8 +443,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { - "x": 134.0, - "y": 2504.0 + "x": 235.0, + "y": 920.0 }, "params": 1 }, @@ -452,8 +452,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { - "x": 139.0, - "y": 2514.0 + "x": 240.0, + "y": 930.0 }, "params": 1 }, @@ -461,8 +461,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { - "x": 144.0, - "y": 2524.0 + "x": 245.0, + "y": 940.0 }, "params": 1 }, @@ -470,8 +470,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { - "x": 219.0, - "y": 2494.0 + "x": 320.0, + "y": 910.0 }, "params": 1 }, @@ -479,8 +479,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { - "x": 234.0, - "y": 2524.0 + "x": 335.0, + "y": 940.0 }, "params": 1 }, @@ -488,8 +488,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#17", "pos": { - "x": 34.0, - "y": 2624.0 + "x": 135.0, + "y": 1040.0 }, "params": 1 }, @@ -497,8 +497,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#18", "pos": { - "x": 39.0, - "y": 2634.0 + "x": 140.0, + "y": 1050.0 }, "params": 1 }, @@ -506,17 +506,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#19", "pos": { - "x": 279.0, - "y": 2114.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 154.0, - "y": 2264.0 + "x": 380.0, + "y": 530.0 }, "params": 1 }, @@ -524,8 +515,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#20", "pos": { - "x": 294.0, - "y": 2144.0 + "x": 395.0, + "y": 545.0 }, "params": 1 }, @@ -533,8 +524,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#21", "pos": { - "x": 334.0, - "y": 2319.0 + "x": 435.0, + "y": 735.0 }, "params": 1 }, @@ -542,8 +533,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#22", "pos": { - "x": 254.0, - "y": 2089.0 + "x": 355.0, + "y": 505.0 }, "params": 1 }, @@ -551,8 +542,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#23", "pos": { - "x": 259.0, - "y": 2094.0 + "x": 360.0, + "y": 510.0 }, "params": 1 }, @@ -560,8 +551,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#24", "pos": { - "x": 264.0, - "y": 2099.0 + "x": 365.0, + "y": 515.0 }, "params": 1 }, @@ -569,8 +560,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#25", "pos": { - "x": 269.0, - "y": 2104.0 + "x": 370.0, + "y": 520.0 }, "params": 1 }, @@ -578,7 +569,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#26", "pos": { - "x": 254.0, + "x": 355.0, "y": 449.0 }, "params": 1 @@ -587,7 +578,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#27", "pos": { - "x": 259.0, + "x": 360.0, "y": 459.0 }, "params": 1 @@ -596,7 +587,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#28", "pos": { - "x": 264.0, + "x": 365.0, "y": 469.0 }, "params": 1 @@ -605,7 +596,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#29", "pos": { - "x": 269.0, + "x": 370.0, "y": 479.0 }, "params": 1 @@ -614,8 +605,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 154.0, - "y": 2319.0 + "x": 255.0, + "y": 750.0 }, "params": 1 }, @@ -623,8 +614,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#30", "pos": { - "x": 9.0, - "y": 2354.0 + "x": 110.0, + "y": 770.0 }, "params": 1 }, @@ -632,8 +623,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#31", "pos": { - "x": 14.0, - "y": 2364.0 + "x": 115.0, + "y": 780.0 }, "params": 1 }, @@ -641,8 +632,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#32", "pos": { - "x": 19.0, - "y": 2374.0 + "x": 120.0, + "y": 790.0 }, "params": 1 }, @@ -650,8 +641,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#33", "pos": { - "x": 14.0, - "y": 2394.0 + "x": 115.0, + "y": 810.0 }, "params": 1 }, @@ -659,8 +650,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#34", "pos": { - "x": 19.0, - "y": 2404.0 + "x": 120.0, + "y": 820.0 }, "params": 1 }, @@ -668,8 +659,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#35", "pos": { - "x": 24.0, - "y": 2414.0 + "x": 125.0, + "y": 830.0 }, "params": 1 }, @@ -677,8 +668,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#36", "pos": { - "x": 9.0, - "y": 2384.0 + "x": 110.0, + "y": 800.0 }, "params": 1 }, @@ -686,8 +677,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#37", "pos": { - "x": 14.0, - "y": 2424.0 + "x": 115.0, + "y": 840.0 }, "params": 1 }, @@ -695,8 +686,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#38", "pos": { - "x": 19.0, - "y": 2434.0 + "x": 120.0, + "y": 850.0 }, "params": 1 }, @@ -704,8 +695,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#39", "pos": { - "x": 24.0, - "y": 2444.0 + "x": 125.0, + "y": 860.0 }, "params": 1 }, @@ -713,8 +704,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 39.0, - "y": 2314.0 + "x": 140.0, + "y": 730.0 }, "params": 1 }, @@ -722,7 +713,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#40", "pos": { - "x": 314.0, + "x": 415.0, "y": 449.0 }, "params": 1 @@ -731,8 +722,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#41", "pos": { - "x": 4.0, - "y": 2549.0 + "x": 105.0, + "y": 965.0 }, "params": 1 }, @@ -740,53 +731,53 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#42", "pos": { - "x": 4.0, - "y": 2349.0 + "x": 105.0, + "y": 765.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#43", + "name": "WireCrossPoint#44", "pos": { - "x": 339.0, - "y": 2524.0 + "x": 130.0, + "y": 890.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#44", + "name": "WireCrossPoint#45", "pos": { - "x": 29.0, - "y": 2469.0 + "x": 365.0, + "y": 890.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#45", + "name": "WireCrossPoint#46", "pos": { - "x": 264.0, - "y": 2469.0 + "x": 140.0, + "y": 895.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#46", + "name": "WireCrossPoint#47", "pos": { - "x": 39.0, - "y": 2474.0 + "x": 410.0, + "y": 895.0 }, "params": 1 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#47", + "name": "WireCrossPoint#48", "pos": { - "x": 309.0, - "y": 2474.0 + "x": 145.0, + "y": 1080.0 }, "params": 1 }, @@ -794,8 +785,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 34.0, - "y": 2324.0 + "x": 135.0, + "y": 740.0 }, "params": 1 }, @@ -803,8 +794,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 29.0, - "y": 2334.0 + "x": 130.0, + "y": 750.0 }, "params": 1 }, @@ -812,8 +803,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 219.0, - "y": 2224.0 + "x": 350.0, + "y": 365.0 }, "params": 1 }, @@ -821,8 +812,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 224.0, - "y": 2234.0 + "x": 345.0, + "y": 375.0 }, "params": 1 }, @@ -830,8 +821,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 229.0, - "y": 2244.0 + "x": 340.0, + "y": 385.0 }, "params": 1 }, @@ -839,47 +830,47 @@ "id": "and", "name": "and#0", "pos": { - "x": 190.0, - "y": 65.0 + "x": 496.0, + "y": 180.0 } }, { "id": "dff4", "name": "dff4#0", "pos": { - "x": 90.0, - "y": 2490.0 + "x": 190.0, + "y": 905.0 } }, { "id": "dlatch4", "name": "dlatch4#0", "pos": { - "x": 160.0, - "y": 2220.0 + "x": 720.0, + "y": 170.0 } }, { "id": "dlatch4", "name": "dlatch4#1", "pos": { - "x": 160.0, - "y": 2275.0 + "x": 260.0, + "y": 690.0 } }, { "id": "mux1_4", "name": "mux1_4#0", "pos": { - "x": 275.0, - "y": 135.0 + "x": 500.0, + "y": 350.0 } }, { "id": "or4", "name": "or4#0", "pos": { - "x": 275.0, + "x": 376.0, "y": 445.0 } }, @@ -887,24 +878,24 @@ "id": "ram4", "name": "ram4#0", "pos": { - "x": 95.0, - "y": 2220.0 + "x": 655.0, + "y": 170.0 } }, { "id": "sel3_4", "name": "sel3_4#0", "pos": { - "x": 45.0, - "y": 2310.0 + "x": 150.0, + "y": 725.0 } }, { "id": "sel3_4", "name": "sel3_4#1", "pos": { - "x": 45.0, - "y": 2510.0 + "x": 150.0, + "y": 925.0 } } ], @@ -919,7 +910,24 @@ "pinName": "I8" }, "name": "unnamedWire#0", - "path": [] + "path": [ + { + "x": 835.0, + "y": 600.0 + }, + { + "x": 835.0, + "y": 315.0 + }, + { + "x": 365.0, + "y": 315.0 + }, + { + "x": 365.0, + "y": 165.0 + } + ] }, { "pin1": { @@ -933,12 +941,20 @@ "name": "unnamedWire#1", "path": [ { - "x": 5.0, - "y": 150.0 + "x": 840.0, + "y": 650.0 }, { - "x": 5.0, - "y": 60.0 + "x": 840.0, + "y": 310.0 + }, + { + "x": 370.0, + "y": 310.0 + }, + { + "x": 370.0, + "y": 175.0 } ] }, @@ -952,7 +968,16 @@ "pinName": "" }, "name": "unnamedWire#10", - "path": [] + "path": [ + { + "x": 15.0, + "y": 90.0 + }, + { + "x": 460.0, + "y": 90.0 + } + ] }, { "pin1": { @@ -966,12 +991,20 @@ "name": "unnamedWire#100", "path": [ { - "x": 290.0, - "y": 2135.0 + "x": 625.0, + "y": 645.0 + }, + { + "x": 625.0, + "y": 540.0 + }, + { + "x": 390.0, + "y": 540.0 }, { - "x": 290.0, - "y": 2100.0 + "x": 390.0, + "y": 515.0 } ] }, @@ -987,8 +1020,8 @@ "name": "unnamedWire#101", "path": [ { - "x": 295.0, - "y": 2105.0 + "x": 395.0, + "y": 520.0 } ] }, @@ -1098,12 +1131,7 @@ "pinName": "A" }, "name": "unnamedWire#11", - "path": [ - { - "x": 155.0, - "y": 80.0 - } - ] + "path": [] }, { "pin1": { @@ -1117,8 +1145,8 @@ "name": "unnamedWire#110", "path": [ { - "x": 255.0, - "y": 190.0 + "x": 356.0, + "y": 405.0 } ] }, @@ -1134,8 +1162,8 @@ "name": "unnamedWire#111", "path": [ { - "x": 260.0, - "y": 200.0 + "x": 361.0, + "y": 415.0 } ] }, @@ -1151,8 +1179,8 @@ "name": "unnamedWire#112", "path": [ { - "x": 265.0, - "y": 210.0 + "x": 366.0, + "y": 425.0 } ] }, @@ -1168,8 +1196,8 @@ "name": "unnamedWire#113", "path": [ { - "x": 270.0, - "y": 220.0 + "x": 371.0, + "y": 435.0 } ] }, @@ -1185,8 +1213,8 @@ "name": "unnamedWire#114", "path": [ { - "x": 10.0, - "y": 2090.0 + "x": 111.0, + "y": 506.0 } ] }, @@ -1202,8 +1230,8 @@ "name": "unnamedWire#115", "path": [ { - "x": 15.0, - "y": 2095.0 + "x": 116.0, + "y": 511.0 } ] }, @@ -1219,8 +1247,8 @@ "name": "unnamedWire#116", "path": [ { - "x": 20.0, - "y": 2100.0 + "x": 121.0, + "y": 516.0 } ] }, @@ -1236,8 +1264,8 @@ "name": "unnamedWire#117", "path": [ { - "x": 5.0, - "y": 2545.0 + "x": 105.0, + "y": 960.0 } ] }, @@ -1275,7 +1303,12 @@ "pinName": "B" }, "name": "unnamedWire#12", - "path": [] + "path": [ + { + "x": 460.0, + "y": 205.0 + } + ] }, { "pin1": { @@ -1325,8 +1358,8 @@ "name": "unnamedWire#123", "path": [ { - "x": 25.0, - "y": 2105.0 + "x": 126.0, + "y": 521.0 } ] }, @@ -1408,11 +1441,20 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#3", "pinName": "" }, "name": "unnamedWire#13", - "path": [] + "path": [ + { + "x": 230.0, + "y": 715.0 + }, + { + "x": 230.0, + "y": 750.0 + } + ] }, { "pin1": { @@ -1498,8 +1540,8 @@ "name": "unnamedWire#136", "path": [ { - "x": 10.0, - "y": 2585.0 + "x": 110.0, + "y": 1000.0 } ] }, @@ -1515,8 +1557,8 @@ "name": "unnamedWire#137", "path": [ { - "x": 15.0, - "y": 2595.0 + "x": 115.0, + "y": 1010.0 } ] }, @@ -1532,8 +1574,8 @@ "name": "unnamedWire#138", "path": [ { - "x": 20.0, - "y": 2605.0 + "x": 120.0, + "y": 1020.0 } ] }, @@ -1549,14 +1591,14 @@ "name": "unnamedWire#139", "path": [ { - "x": 25.0, - "y": 2615.0 + "x": 125.0, + "y": 1030.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { @@ -1564,7 +1606,16 @@ "pinName": "C" }, "name": "unnamedWire#14", - "path": [] + "path": [ + { + "x": 715.0, + "y": 750.0 + }, + { + "x": 715.0, + "y": 215.0 + } + ] }, { "pin1": { @@ -1576,7 +1627,16 @@ "pinName": "D1" }, "name": "unnamedWire#140", - "path": [] + "path": [ + { + "x": 190.0, + "y": 730.0 + }, + { + "x": 190.0, + "y": 265.0 + } + ] }, { "pin1": { @@ -1588,7 +1648,16 @@ "pinName": "D2" }, "name": "unnamedWire#141", - "path": [] + "path": [ + { + "x": 195.0, + "y": 740.0 + }, + { + "x": 195.0, + "y": 275.0 + } + ] }, { "pin1": { @@ -1600,7 +1669,16 @@ "pinName": "D3" }, "name": "unnamedWire#142", - "path": [] + "path": [ + { + "x": 200.0, + "y": 750.0 + }, + { + "x": 200.0, + "y": 285.0 + } + ] }, { "pin1": { @@ -1612,7 +1690,16 @@ "pinName": "D4" }, "name": "unnamedWire#143", - "path": [] + "path": [ + { + "x": 205.0, + "y": 760.0 + }, + { + "x": 205.0, + "y": 295.0 + } + ] }, { "pin1": { @@ -1649,20 +1736,12 @@ "name": "unnamedWire#146", "path": [ { - "x": 230.0, - "y": 70.0 - }, - { - "x": 230.0, - "y": 105.0 - }, - { - "x": 90.0, - "y": 105.0 + "x": 630.0, + "y": 185.0 }, { - "x": 90.0, - "y": 2305.0 + "x": 630.0, + "y": 255.0 } ] }, @@ -1678,12 +1757,20 @@ "name": "unnamedWire#147", "path": [ { - "x": 85.0, - "y": 100.0 + "x": 450.0, + "y": 215.0 + }, + { + "x": 450.0, + "y": 245.0 }, { - "x": 85.0, - "y": 2505.0 + "x": 185.0, + "y": 245.0 + }, + { + "x": 185.0, + "y": 920.0 } ] }, @@ -1699,12 +1786,12 @@ "name": "unnamedWire#148", "path": [ { - "x": 70.0, - "y": 80.0 + "x": 435.0, + "y": 195.0 }, { - "x": 70.0, - "y": 140.0 + "x": 435.0, + "y": 355.0 } ] }, @@ -1720,27 +1807,27 @@ "name": "unnamedWire#149", "path": [ { - "x": 335.0, - "y": 140.0 + "x": 550.0, + "y": 355.0 }, { - "x": 335.0, - "y": 50.0 + "x": 550.0, + "y": 525.0 + }, + { + "x": 725.0, + "y": 525.0 + }, + { + "x": 725.0, + "y": 1125.0 + }, + { + "x": 645.0, + "y": 1125.0 } ] }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#15", - "path": [] - }, { "pin1": { "compName": "mux1_4#0", @@ -1751,7 +1838,28 @@ "pinName": "Y2" }, "name": "unnamedWire#150", - "path": [] + "path": [ + { + "x": 555.0, + "y": 365.0 + }, + { + "x": 555.0, + "y": 520.0 + }, + { + "x": 730.0, + "y": 520.0 + }, + { + "x": 730.0, + "y": 1130.0 + }, + { + "x": 695.0, + "y": 1130.0 + } + ] }, { "pin1": { @@ -1765,12 +1873,24 @@ "name": "unnamedWire#151", "path": [ { - "x": 335.0, - "y": 160.0 + "x": 560.0, + "y": 375.0 }, { - "x": 335.0, - "y": 250.0 + "x": 560.0, + "y": 515.0 + }, + { + "x": 735.0, + "y": 515.0 + }, + { + "x": 735.0, + "y": 1130.0 + }, + { + "x": 745.0, + "y": 1130.0 } ] }, @@ -1786,12 +1906,24 @@ "name": "unnamedWire#152", "path": [ { - "x": 325.0, - "y": 170.0 + "x": 565.0, + "y": 385.0 }, { - "x": 325.0, - "y": 350.0 + "x": 565.0, + "y": 510.0 + }, + { + "x": 740.0, + "y": 510.0 + }, + { + "x": 740.0, + "y": 1125.0 + }, + { + "x": 795.0, + "y": 1125.0 } ] }, @@ -1819,7 +1951,7 @@ "name": "unnamedWire#154", "path": [ { - "x": 315.0, + "x": 416.0, "y": 445.0 } ] @@ -1836,7 +1968,7 @@ "name": "unnamedWire#155", "path": [ { - "x": 315.0, + "x": 416.0, "y": 455.0 } ] @@ -1851,19 +1983,24 @@ "pinName": "F\u003d0" }, "name": "unnamedWire#156", - "path": [] - }, - { - "pin1": { - "compName": "TriStateBuffer#2", - "pinName": "OUT" - }, - "pin2": { - "compName": "WireCrossPoint#43", - "pinName": "" - }, - "name": "unnamedWire#157", - "path": [] + "path": [ + { + "x": 445.0, + "y": 450.0 + }, + { + "x": 445.0, + "y": 490.0 + }, + { + "x": 310.0, + "y": 490.0 + }, + { + "x": 310.0, + "y": 400.0 + } + ] }, { "pin1": { @@ -1877,16 +2014,16 @@ "name": "unnamedWire#158", "path": [ { - "x": 5.0, - "y": 2690.0 + "x": 105.0, + "y": 1115.0 }, { - "x": 280.0, - "y": 2690.0 + "x": 380.0, + "y": 1115.0 }, { - "x": 280.0, - "y": 2495.0 + "x": 381.0, + "y": 911.0 } ] }, @@ -1912,7 +2049,12 @@ "pinName": "C" }, "name": "unnamedWire#16", - "path": [] + "path": [ + { + "x": 255.0, + "y": 735.0 + } + ] }, { "pin1": { @@ -1926,8 +2068,8 @@ "name": "unnamedWire#160", "path": [ { - "x": 5.0, - "y": 2345.0 + "x": 106.0, + "y": 761.0 } ] }, @@ -1943,12 +2085,12 @@ "name": "unnamedWire#161", "path": [ { - "x": 5.0, - "y": 2465.0 + "x": 105.0, + "y": 885.0 }, { - "x": 280.0, - "y": 2465.0 + "x": 380.0, + "y": 885.0 } ] }, @@ -1964,29 +2106,12 @@ "name": "unnamedWire#162", "path": [ { - "x": 330.0, - "y": 2145.0 + "x": 5.0, + "y": 545.0 }, { - "x": 330.0, - "y": 750.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "Qn+3" - }, - "pin2": { - "compName": "WireCrossPoint#43", - "pinName": "" - }, - "name": "unnamedWire#163", - "path": [ - { - "x": 340.0, - "y": 1150.0 + "x": 5.0, + "y": 550.0 } ] }, @@ -2014,12 +2139,12 @@ "name": "unnamedWire#165", "path": [ { - "x": 290.0, - "y": 2470.0 + "x": 395.0, + "y": 890.0 }, { - "x": 290.0, - "y": 2445.0 + "x": 395.0, + "y": 860.0 } ] }, @@ -2083,16 +2208,16 @@ "name": "unnamedWire#17", "path": [ { - "x": 155.0, - "y": 2485.0 + "x": 255.0, + "y": 900.0 }, { - "x": 80.0, - "y": 2485.0 + "x": 180.0, + "y": 900.0 }, { - "x": 80.0, - "y": 2495.0 + "x": 180.0, + "y": 910.0 } ] }, @@ -2120,8 +2245,67 @@ "name": "unnamedWire#171", "path": [ { - "x": 295.0, - "y": 2320.0 + "x": 396.0, + "y": 736.0 + } + ] + }, + { + "pin1": { + "compName": "sel3_4#1", + "pinName": "C4" + }, + "pin2": { + "compName": "WireCrossPoint#48", + "pinName": "" + }, + "name": "unnamedWire#172", + "path": [ + { + "x": 145.0, + "y": 1070.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#48", + "pinName": "" + }, + "pin2": { + "compName": "TriStateBuffer#2", + "pinName": "OUT" + }, + "name": "unnamedWire#173", + "path": [ + { + "x": 425.0, + "y": 1080.0 + }, + { + "x": 425.0, + "y": 940.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#48", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Qn+3" + }, + "name": "unnamedWire#174", + "path": [ + { + "x": 20.0, + "y": 1080.0 + }, + { + "x": 20.0, + "y": 300.0 } ] }, @@ -2137,16 +2321,16 @@ "name": "unnamedWire#18", "path": [ { - "x": 55.0, - "y": 90.0 + "x": 420.0, + "y": 205.0 }, { - "x": 55.0, - "y": 125.0 + "x": 420.0, + "y": 240.0 }, { - "x": 40.0, - "y": 125.0 + "x": 140.0, + "y": 240.0 } ] }, @@ -2162,16 +2346,16 @@ "name": "unnamedWire#19", "path": [ { - "x": 60.0, - "y": 50.0 + "x": 425.0, + "y": 165.0 }, { - "x": 60.0, - "y": 120.0 + "x": 425.0, + "y": 235.0 }, { - "x": 35.0, - "y": 120.0 + "x": 135.0, + "y": 235.0 } ] }, @@ -2187,12 +2371,20 @@ "name": "unnamedWire#2", "path": [ { - "x": 10.0, - "y": 250.0 + "x": 845.0, + "y": 700.0 }, { - "x": 10.0, - "y": 70.0 + "x": 845.0, + "y": 305.0 + }, + { + "x": 375.0, + "y": 305.0 + }, + { + "x": 375.0, + "y": 185.0 } ] }, @@ -2208,16 +2400,16 @@ "name": "unnamedWire#20", "path": [ { - "x": 65.0, - "y": 60.0 + "x": 430.0, + "y": 175.0 }, { - "x": 65.0, - "y": 115.0 + "x": 430.0, + "y": 230.0 }, { - "x": 30.0, - "y": 115.0 + "x": 130.0, + "y": 230.0 } ] }, @@ -2269,8 +2461,8 @@ "name": "unnamedWire#24", "path": [ { - "x": 40.0, - "y": 2515.0 + "x": 140.0, + "y": 930.0 } ] }, @@ -2286,8 +2478,8 @@ "name": "unnamedWire#25", "path": [ { - "x": 35.0, - "y": 2525.0 + "x": 135.0, + "y": 940.0 } ] }, @@ -2303,8 +2495,8 @@ "name": "unnamedWire#26", "path": [ { - "x": 30.0, - "y": 2535.0 + "x": 130.0, + "y": 950.0 } ] }, @@ -2320,12 +2512,12 @@ "name": "unnamedWire#27", "path": [ { - "x": 80.0, - "y": 1550.0 + "x": 650.0, + "y": 100.0 }, { - "x": 80.0, - "y": 2225.0 + "x": 650.0, + "y": 175.0 } ] }, @@ -2341,12 +2533,12 @@ "name": "unnamedWire#28", "path": [ { - "x": 75.0, - "y": 1650.0 + "x": 645.0, + "y": 150.0 }, { - "x": 75.0, - "y": 2235.0 + "x": 645.0, + "y": 185.0 } ] }, @@ -2362,12 +2554,20 @@ "name": "unnamedWire#29", "path": [ { - "x": 70.0, - "y": 1750.0 + "x": 860.0, + "y": 200.0 + }, + { + "x": 860.0, + "y": 160.0 + }, + { + "x": 640.0, + "y": 160.0 }, { - "x": 70.0, - "y": 2245.0 + "x": 640.0, + "y": 195.0 } ] }, @@ -2383,12 +2583,16 @@ "name": "unnamedWire#3", "path": [ { - "x": 130.0, - "y": 350.0 + "x": 805.0, + "y": 750.0 }, { - "x": 130.0, - "y": 2115.0 + "x": 805.0, + "y": 615.0 + }, + { + "x": 585.0, + "y": 615.0 } ] }, @@ -2404,12 +2608,20 @@ "name": "unnamedWire#30", "path": [ { - "x": 65.0, - "y": 1850.0 + "x": 855.0, + "y": 250.0 + }, + { + "x": 855.0, + "y": 165.0 + }, + { + "x": 635.0, + "y": 165.0 }, { - "x": 65.0, - "y": 2255.0 + "x": 635.0, + "y": 205.0 } ] }, @@ -2425,12 +2637,12 @@ "name": "unnamedWire#31", "path": [ { - "x": 60.0, - "y": 1950.0 + "x": 635.0, + "y": 350.0 }, { - "x": 60.0, - "y": 2265.0 + "x": 635.0, + "y": 215.0 } ] }, @@ -2446,12 +2658,12 @@ "name": "unnamedWire#32", "path": [ { - "x": 55.0, - "y": 2050.0 + "x": 640.0, + "y": 400.0 }, { - "x": 55.0, - "y": 2275.0 + "x": 640.0, + "y": 225.0 } ] }, @@ -2467,12 +2679,12 @@ "name": "unnamedWire#33", "path": [ { - "x": 50.0, - "y": 2150.0 + "x": 645.0, + "y": 450.0 }, { - "x": 50.0, - "y": 2285.0 + "x": 645.0, + "y": 235.0 } ] }, @@ -2488,12 +2700,12 @@ "name": "unnamedWire#34", "path": [ { - "x": 45.0, - "y": 2250.0 + "x": 650.0, + "y": 500.0 }, { - "x": 45.0, - "y": 2295.0 + "x": 650.0, + "y": 245.0 } ] }, @@ -2557,12 +2769,20 @@ "name": "unnamedWire#39", "path": [ { - "x": 150.0, - "y": 2265.0 + "x": 695.0, + "y": 215.0 + }, + { + "x": 695.0, + "y": 575.0 }, { - "x": 150.0, - "y": 2280.0 + "x": 250.0, + "y": 575.0 + }, + { + "x": 250.0, + "y": 695.0 } ] }, @@ -2578,12 +2798,16 @@ "name": "unnamedWire#4", "path": [ { - "x": 125.0, - "y": 450.0 + "x": 800.0, + "y": 800.0 }, { - "x": 125.0, - "y": 2125.0 + "x": 800.0, + "y": 605.0 + }, + { + "x": 565.0, + "y": 605.0 } ] }, @@ -2599,12 +2823,20 @@ "name": "unnamedWire#40", "path": [ { - "x": 145.0, - "y": 2275.0 + "x": 700.0, + "y": 225.0 }, { - "x": 145.0, - "y": 2290.0 + "x": 700.0, + "y": 570.0 + }, + { + "x": 245.0, + "y": 570.0 + }, + { + "x": 245.0, + "y": 705.0 } ] }, @@ -2620,12 +2852,20 @@ "name": "unnamedWire#41", "path": [ { - "x": 140.0, - "y": 2285.0 + "x": 705.0, + "y": 235.0 }, { - "x": 140.0, - "y": 2300.0 + "x": 705.0, + "y": 565.0 + }, + { + "x": 240.0, + "y": 565.0 + }, + { + "x": 240.0, + "y": 715.0 } ] }, @@ -2641,12 +2881,20 @@ "name": "unnamedWire#42", "path": [ { - "x": 135.0, - "y": 2295.0 + "x": 710.0, + "y": 245.0 }, { - "x": 135.0, - "y": 2310.0 + "x": 710.0, + "y": 560.0 + }, + { + "x": 235.0, + "y": 560.0 + }, + { + "x": 235.0, + "y": 725.0 } ] }, @@ -2662,12 +2910,16 @@ "name": "unnamedWire#43", "path": [ { - "x": 100.0, + "x": 55.0, "y": 1050.0 }, { - "x": 100.0, - "y": 2175.0 + "x": 55.0, + "y": 600.0 + }, + { + "x": 520.0, + "y": 600.0 } ] }, @@ -2683,12 +2935,24 @@ "name": "unnamedWire#44", "path": [ { - "x": 180.0, - "y": 1150.0 + "x": 550.0, + "y": 55.0 }, { - "x": 180.0, - "y": 2185.0 + "x": 600.0, + "y": 55.0 + }, + { + "x": 600.0, + "y": 485.0 + }, + { + "x": 505.0, + "y": 485.0 + }, + { + "x": 505.0, + "y": 630.0 } ] }, @@ -2704,12 +2968,24 @@ "name": "unnamedWire#45", "path": [ { - "x": 175.0, - "y": 1250.0 + "x": 600.0, + "y": 50.0 + }, + { + "x": 595.0, + "y": 50.0 + }, + { + "x": 595.0, + "y": 480.0 + }, + { + "x": 500.0, + "y": 480.0 }, { - "x": 175.0, - "y": 2195.0 + "x": 500.0, + "y": 635.0 } ] }, @@ -2725,12 +3001,24 @@ "name": "unnamedWire#46", "path": [ { - "x": 170.0, - "y": 1350.0 + "x": 650.0, + "y": 45.0 + }, + { + "x": 590.0, + "y": 45.0 + }, + { + "x": 590.0, + "y": 475.0 + }, + { + "x": 495.0, + "y": 475.0 }, { - "x": 170.0, - "y": 2205.0 + "x": 495.0, + "y": 640.0 } ] }, @@ -2746,12 +3034,24 @@ "name": "unnamedWire#47", "path": [ { - "x": 165.0, - "y": 1450.0 + "x": 700.0, + "y": 40.0 }, { - "x": 165.0, - "y": 2215.0 + "x": 585.0, + "y": 40.0 + }, + { + "x": 585.0, + "y": 470.0 + }, + { + "x": 490.0, + "y": 470.0 + }, + { + "x": 490.0, + "y": 645.0 } ] }, @@ -2765,7 +3065,20 @@ "pinName": "" }, "name": "unnamedWire#48", - "path": [] + "path": [ + { + "x": 765.0, + "y": 175.0 + }, + { + "x": 765.0, + "y": 80.0 + }, + { + "x": 350.0, + "y": 80.0 + } + ] }, { "pin1": { @@ -2777,7 +3090,20 @@ "pinName": "" }, "name": "unnamedWire#49", - "path": [] + "path": [ + { + "x": 770.0, + "y": 185.0 + }, + { + "x": 770.0, + "y": 75.0 + }, + { + "x": 345.0, + "y": 75.0 + } + ] }, { "pin1": { @@ -2791,12 +3117,16 @@ "name": "unnamedWire#5", "path": [ { - "x": 120.0, - "y": 550.0 + "x": 795.0, + "y": 850.0 }, { - "x": 120.0, - "y": 2135.0 + "x": 795.0, + "y": 610.0 + }, + { + "x": 575.0, + "y": 610.0 } ] }, @@ -2810,7 +3140,20 @@ "pinName": "" }, "name": "unnamedWire#50", - "path": [] + "path": [ + { + "x": 775.0, + "y": 195.0 + }, + { + "x": 775.0, + "y": 70.0 + }, + { + "x": 340.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -2822,7 +3165,20 @@ "pinName": "" }, "name": "unnamedWire#51", - "path": [] + "path": [ + { + "x": 780.0, + "y": 205.0 + }, + { + "x": 780.0, + "y": 65.0 + }, + { + "x": 335.0, + "y": 65.0 + } + ] }, { "pin1": { @@ -2834,12 +3190,7 @@ "pinName": "I0_1" }, "name": "unnamedWire#52", - "path": [ - { - "x": 220.0, - "y": 150.0 - } - ] + "path": [] }, { "pin1": { @@ -2851,12 +3202,7 @@ "pinName": "I0_2" }, "name": "unnamedWire#53", - "path": [ - { - "x": 225.0, - "y": 160.0 - } - ] + "path": [] }, { "pin1": { @@ -2868,12 +3214,7 @@ "pinName": "I0_3" }, "name": "unnamedWire#54", - "path": [ - { - "x": 230.0, - "y": 170.0 - } - ] + "path": [] }, { "pin1": { @@ -2885,12 +3226,7 @@ "pinName": "I0_4" }, "name": "unnamedWire#55", - "path": [ - { - "x": 235.0, - "y": 180.0 - } - ] + "path": [] }, { "pin1": { @@ -2902,7 +3238,12 @@ "pinName": "A1" }, "name": "unnamedWire#56", - "path": [] + "path": [ + { + "x": 350.0, + "y": 655.0 + } + ] }, { "pin1": { @@ -2914,7 +3255,12 @@ "pinName": "A2" }, "name": "unnamedWire#57", - "path": [] + "path": [ + { + "x": 345.0, + "y": 660.0 + } + ] }, { "pin1": { @@ -2926,7 +3272,12 @@ "pinName": "A3" }, "name": "unnamedWire#58", - "path": [] + "path": [ + { + "x": 340.0, + "y": 665.0 + } + ] }, { "pin1": { @@ -2938,7 +3289,12 @@ "pinName": "A4" }, "name": "unnamedWire#59", - "path": [] + "path": [ + { + "x": 335.0, + "y": 670.0 + } + ] }, { "pin1": { @@ -2952,12 +3308,16 @@ "name": "unnamedWire#6", "path": [ { - "x": 115.0, - "y": 650.0 + "x": 790.0, + "y": 900.0 }, { - "x": 115.0, - "y": 2145.0 + "x": 790.0, + "y": 600.0 + }, + { + "x": 555.0, + "y": 600.0 } ] }, @@ -2973,12 +3333,12 @@ "name": "unnamedWire#60", "path": [ { - "x": 200.0, - "y": 2280.0 + "x": 300.0, + "y": 695.0 }, { - "x": 200.0, - "y": 2265.0 + "x": 300.0, + "y": 680.0 } ] }, @@ -2994,12 +3354,12 @@ "name": "unnamedWire#61", "path": [ { - "x": 205.0, - "y": 2290.0 + "x": 305.0, + "y": 705.0 }, { - "x": 205.0, - "y": 2275.0 + "x": 305.0, + "y": 685.0 } ] }, @@ -3015,12 +3375,12 @@ "name": "unnamedWire#62", "path": [ { - "x": 210.0, - "y": 2300.0 + "x": 310.0, + "y": 715.0 }, { - "x": 210.0, - "y": 2285.0 + "x": 310.0, + "y": 690.0 } ] }, @@ -3036,12 +3396,12 @@ "name": "unnamedWire#63", "path": [ { - "x": 215.0, - "y": 2310.0 + "x": 315.0, + "y": 725.0 }, { - "x": 215.0, - "y": 2295.0 + "x": 315.0, + "y": 695.0 } ] }, @@ -3129,12 +3489,16 @@ "name": "unnamedWire#7", "path": [ { - "x": 110.0, - "y": 750.0 + "x": 785.0, + "y": 950.0 }, { - "x": 110.0, - "y": 2155.0 + "x": 785.0, + "y": 595.0 + }, + { + "x": 545.0, + "y": 595.0 } ] }, @@ -3160,7 +3524,16 @@ "pinName": "" }, "name": "unnamedWire#71", - "path": [] + "path": [ + { + "x": 80.0, + "y": 250.0 + }, + { + "x": 80.0, + "y": 965.0 + } + ] }, { "pin1": { @@ -3174,20 +3547,20 @@ "name": "unnamedWire#72", "path": [ { - "x": 135.0, - "y": 2670.0 + "x": 235.0, + "y": 1095.0 }, { - "x": 30.0, - "y": 2670.0 + "x": 130.0, + "y": 1095.0 }, { - "x": 30.0, - "y": 2635.0 + "x": 130.0, + "y": 1050.0 }, { - "x": 35.0, - "y": 2635.0 + "x": 135.0, + "y": 1050.0 } ] }, @@ -3203,20 +3576,20 @@ "name": "unnamedWire#73", "path": [ { - "x": 140.0, - "y": 2675.0 + "x": 240.0, + "y": 1100.0 }, { - "x": 35.0, - "y": 2675.0 + "x": 135.0, + "y": 1100.0 }, { - "x": 35.0, - "y": 2640.0 + "x": 135.0, + "y": 1055.0 }, { - "x": 40.0, - "y": 2640.0 + "x": 140.0, + "y": 1055.0 } ] }, @@ -3256,31 +3629,19 @@ "name": "unnamedWire#76", "path": [ { - "x": 145.0, - "y": 2680.0 + "x": 245.0, + "y": 1105.0 }, { - "x": 40.0, - "y": 2680.0 + "x": 140.0, + "y": 1105.0 }, { - "x": 40.0, - "y": 2645.0 + "x": 140.0, + "y": 1060.0 } ] }, - { - "pin1": { - "compName": "WireCrossPoint#43", - "pinName": "" - }, - "pin2": { - "compName": "sel3_4#1", - "pinName": "C4" - }, - "name": "unnamedWire#77", - "path": [] - }, { "pin1": { "compName": "_submodelinterface", @@ -3291,7 +3652,16 @@ "pinName": "" }, "name": "unnamedWire#78", - "path": [] + "path": [ + { + "x": 75.0, + "y": 100.0 + }, + { + "x": 75.0, + "y": 765.0 + } + ] }, { "pin1": { @@ -3305,24 +3675,24 @@ "name": "unnamedWire#79", "path": [ { - "x": 130.0, - "y": 2665.0 + "x": 230.0, + "y": 1090.0 }, { - "x": 25.0, - "y": 2665.0 + "x": 125.0, + "y": 1090.0 }, { - "x": 25.0, - "y": 2630.0 + "x": 125.0, + "y": 1045.0 }, { - "x": 30.0, - "y": 2630.0 + "x": 130.0, + "y": 1045.0 }, { - "x": 30.0, - "y": 2555.0 + "x": 130.0, + "y": 970.0 } ] }, @@ -3338,12 +3708,16 @@ "name": "unnamedWire#8", "path": [ { - "x": 105.0, - "y": 850.0 + "x": 780.0, + "y": 1000.0 }, { - "x": 105.0, - "y": 2165.0 + "x": 780.0, + "y": 590.0 + }, + { + "x": 535.0, + "y": 590.0 } ] }, @@ -3359,8 +3733,8 @@ "name": "unnamedWire#80", "path": [ { - "x": 220.0, - "y": 2305.0 + "x": 320.0, + "y": 705.0 } ] }, @@ -3376,12 +3750,12 @@ "name": "unnamedWire#81", "path": [ { - "x": 225.0, - "y": 2505.0 + "x": 325.0, + "y": 920.0 }, { - "x": 225.0, - "y": 2315.0 + "x": 325.0, + "y": 710.0 } ] }, @@ -3397,12 +3771,12 @@ "name": "unnamedWire#82", "path": [ { - "x": 230.0, - "y": 2515.0 + "x": 330.0, + "y": 930.0 }, { - "x": 230.0, - "y": 2325.0 + "x": 330.0, + "y": 715.0 } ] }, @@ -3418,8 +3792,8 @@ "name": "unnamedWire#83", "path": [ { - "x": 235.0, - "y": 2335.0 + "x": 335.0, + "y": 720.0 } ] }, @@ -3435,8 +3809,8 @@ "name": "unnamedWire#84", "path": [ { - "x": 35.0, - "y": 2565.0 + "x": 135.0, + "y": 980.0 } ] }, @@ -3452,8 +3826,8 @@ "name": "unnamedWire#85", "path": [ { - "x": 40.0, - "y": 2575.0 + "x": 140.0, + "y": 990.0 } ] }, @@ -3515,7 +3889,12 @@ "pinName": "" }, "name": "unnamedWire#9", - "path": [] + "path": [ + { + "x": 15.0, + "y": 950.0 + } + ] }, { "pin1": { @@ -3529,12 +3908,20 @@ "name": "unnamedWire#90", "path": [ { - "x": 315.0, - "y": 2155.0 + "x": 616.0, + "y": 665.0 }, { - "x": 315.0, - "y": 550.0 + "x": 615.0, + "y": 1130.0 + }, + { + "x": 90.0, + "y": 1130.0 + }, + { + "x": 90.0, + "y": 450.0 } ] }, @@ -3550,12 +3937,20 @@ "name": "unnamedWire#91", "path": [ { - "x": 320.0, - "y": 2165.0 + "x": 611.0, + "y": 675.0 }, { - "x": 320.0, - "y": 650.0 + "x": 610.0, + "y": 1125.0 + }, + { + "x": 95.0, + "y": 1125.0 + }, + { + "x": 95.0, + "y": 500.0 } ] }, @@ -3569,7 +3964,16 @@ "pinName": "" }, "name": "unnamedWire#92", - "path": [] + "path": [ + { + "x": 635.0, + "y": 625.0 + }, + { + "x": 636.0, + "y": 530.0 + } + ] }, { "pin1": { @@ -3581,7 +3985,16 @@ "pinName": "" }, "name": "unnamedWire#93", - "path": [] + "path": [ + { + "x": 620.0, + "y": 655.0 + }, + { + "x": 620.0, + "y": 545.0 + } + ] }, { "pin1": { @@ -3617,7 +4030,28 @@ "pinName": "C4" }, "name": "unnamedWire#96", - "path": [] + "path": [ + { + "x": 435.0, + "y": 795.0 + }, + { + "x": 190.0, + "y": 795.0 + }, + { + "x": 190.0, + "y": 880.0 + }, + { + "x": 145.0, + "y": 880.0 + }, + { + "x": 145.0, + "y": 870.0 + } + ] }, { "pin1": { @@ -3631,8 +4065,12 @@ "name": "unnamedWire#97", "path": [ { - "x": 335.0, - "y": 950.0 + "x": 455.0, + "y": 735.0 + }, + { + "x": 455.0, + "y": 150.0 } ] }, @@ -3648,8 +4086,8 @@ "name": "unnamedWire#98", "path": [ { - "x": 280.0, - "y": 2090.0 + "x": 380.0, + "y": 505.0 } ] }, @@ -3665,12 +4103,20 @@ "name": "unnamedWire#99", "path": [ { - "x": 285.0, - "y": 2125.0 + "x": 630.0, + "y": 635.0 + }, + { + "x": 630.0, + "y": 535.0 + }, + { + "x": 385.0, + "y": 535.0 }, { - "x": 285.0, - "y": 2095.0 + "x": 385.0, + "y": 510.0 } ] } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json index a0bdd786..3531aae8 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json @@ -1,11 +1,11 @@ { - "width": 35.0, - "height": 230.0, + "width": 96.25, + "height": 110.0, "interfacePins": [ { "location": { "x": 0.0, - "y": 115.0 + "y": 35.0 }, "name": "A1", "logicWidth": 1, @@ -14,7 +14,7 @@ { "location": { "x": 0.0, - "y": 125.0 + "y": 40.0 }, "name": "A2", "logicWidth": 1, @@ -23,7 +23,7 @@ { "location": { "x": 0.0, - "y": 135.0 + "y": 45.0 }, "name": "A3", "logicWidth": 1, @@ -32,7 +32,7 @@ { "location": { "x": 0.0, - "y": 145.0 + "y": 50.0 }, "name": "A4", "logicWidth": 1, @@ -41,7 +41,7 @@ { "location": { "x": 0.0, - "y": 155.0 + "y": 60.0 }, "name": "B1", "logicWidth": 1, @@ -50,7 +50,7 @@ { "location": { "x": 0.0, - "y": 165.0 + "y": 65.0 }, "name": "B2", "logicWidth": 1, @@ -59,7 +59,7 @@ { "location": { "x": 0.0, - "y": 175.0 + "y": 70.0 }, "name": "B3", "logicWidth": 1, @@ -68,7 +68,7 @@ { "location": { "x": 0.0, - "y": 185.0 + "y": 75.0 }, "name": "B4", "logicWidth": 1, @@ -76,8 +76,8 @@ }, { "location": { - "x": 0.0, - "y": 65.0 + "x": 10.0, + "y": 0.0 }, "name": "Cn", "logicWidth": 1, @@ -85,7 +85,7 @@ }, { "location": { - "x": 35.0, + "x": 96.25, "y": 45.0 }, "name": "Cn+4", @@ -95,7 +95,7 @@ { "location": { "x": 0.0, - "y": 75.0 + "y": 10.0 }, "name": "D1", "logicWidth": 1, @@ -104,7 +104,7 @@ { "location": { "x": 0.0, - "y": 85.0 + "y": 15.0 }, "name": "D2", "logicWidth": 1, @@ -113,7 +113,7 @@ { "location": { "x": 0.0, - "y": 95.0 + "y": 20.0 }, "name": "D3", "logicWidth": 1, @@ -122,7 +122,7 @@ { "location": { "x": 0.0, - "y": 105.0 + "y": 25.0 }, "name": "D4", "logicWidth": 1, @@ -130,7 +130,7 @@ }, { "location": { - "x": 35.0, + "x": 96.25, "y": 5.0 }, "name": "F1", @@ -139,7 +139,7 @@ }, { "location": { - "x": 35.0, + "x": 96.25, "y": 15.0 }, "name": "F2", @@ -148,7 +148,7 @@ }, { "location": { - "x": 35.0, + "x": 96.25, "y": 25.0 }, "name": "F3", @@ -157,7 +157,7 @@ }, { "location": { - "x": 35.0, + "x": 96.25, "y": 35.0 }, "name": "F4", @@ -166,8 +166,8 @@ }, { "location": { - "x": 0.0, - "y": 55.0 + "x": 25.0, + "y": 0.0 }, "name": "I0", "logicWidth": 1, @@ -175,8 +175,8 @@ }, { "location": { - "x": 0.0, - "y": 45.0 + "x": 35.0, + "y": 0.0 }, "name": "I1", "logicWidth": 1, @@ -184,8 +184,8 @@ }, { "location": { - "x": 0.0, - "y": 35.0 + "x": 45.0, + "y": 0.0 }, "name": "I2", "logicWidth": 1, @@ -193,8 +193,8 @@ }, { "location": { - "x": 0.0, - "y": 25.0 + "x": 65.0, + "y": 0.0 }, "name": "I3", "logicWidth": 1, @@ -202,8 +202,8 @@ }, { "location": { - "x": 0.0, - "y": 15.0 + "x": 55.0, + "y": 0.0 }, "name": "I4", "logicWidth": 1, @@ -211,8 +211,8 @@ }, { "location": { - "x": 0.0, - "y": 5.0 + "x": 75.0, + "y": 0.0 }, "name": "I5", "logicWidth": 1, @@ -220,7 +220,7 @@ }, { "location": { - "x": 35.0, + "x": 96.25, "y": 55.0 }, "name": "OVR", @@ -230,7 +230,7 @@ { "location": { "x": 0.0, - "y": 195.0 + "y": 85.0 }, "name": "Q1", "logicWidth": 1, @@ -239,7 +239,7 @@ { "location": { "x": 0.0, - "y": 205.0 + "y": 90.0 }, "name": "Q2", "logicWidth": 1, @@ -248,7 +248,7 @@ { "location": { "x": 0.0, - "y": 215.0 + "y": 95.0 }, "name": "Q3", "logicWidth": 1, @@ -257,7 +257,7 @@ { "location": { "x": 0.0, - "y": 225.0 + "y": 100.0 }, "name": "Q4", "logicWidth": 1, @@ -271,7 +271,7 @@ "id": "Am2901ALUInclDecode", "name": "Am2901ALUInclDecode#0", "pos": { - "x": 60.0, + "x": 320.0, "y": 15.0 } }, @@ -279,16 +279,16 @@ "id": "Am2901SourceDecode", "name": "Am2901SourceDecode#0", "pos": { - "x": 15.0, - "y": 165.0 + "x": 160.0, + "y": 160.0 } }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 9.0, - "y": 459.0 + "x": 215.0, + "y": 225.0 }, "params": 1 }, @@ -296,8 +296,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 14.0, - "y": 499.0 + "x": 220.0, + "y": 235.0 }, "params": 1 }, @@ -305,8 +305,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 19.0, - "y": 539.0 + "x": 225.0, + "y": 245.0 }, "params": 1 }, @@ -314,8 +314,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 24.0, - "y": 579.0 + "x": 230.0, + "y": 255.0 }, "params": 1 }, @@ -323,16 +323,16 @@ "id": "sel2_4", "name": "sel2_4#0", "pos": { - "x": 45.0, - "y": 365.0 + "x": 241.0, + "y": 85.0 } }, { "id": "sel3_4", "name": "sel3_4#0", "pos": { - "x": 45.0, - "y": 575.0 + "x": 241.0, + "y": 190.0 } } ], @@ -347,26 +347,27 @@ "pinName": "I5" }, "name": "unnamedWire#0", - "path": [] + "path": [ + { + "x": 300.0, + "y": 20.0 + } + ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "I4" + "pinName": "Cn" }, "pin2": { "compName": "Am2901ALUInclDecode#0", - "pinName": "I4" + "pinName": "Cn" }, "name": "unnamedWire#1", "path": [ { - "x": 5.0, - "y": 60.0 - }, - { - "x": 5.0, - "y": 30.0 + "x": 40.0, + "y": 50.0 } ] }, @@ -380,7 +381,24 @@ "pinName": "A4" }, "name": "unnamedWire#10", - "path": [] + "path": [ + { + "x": 10.0, + "y": 100.0 + }, + { + "x": 10.0, + "y": 85.0 + }, + { + "x": 175.0, + "y": 85.0 + }, + { + "x": 175.0, + "y": 140.0 + } + ] }, { "pin1": { @@ -392,7 +410,16 @@ "pinName": "" }, "name": "unnamedWire#11", - "path": [] + "path": [ + { + "x": 55.0, + "y": 140.0 + }, + { + "x": 55.0, + "y": 225.0 + } + ] }, { "pin1": { @@ -404,7 +431,16 @@ "pinName": "" }, "name": "unnamedWire#12", - "path": [] + "path": [ + { + "x": 50.0, + "y": 160.0 + }, + { + "x": 50.0, + "y": 235.0 + } + ] }, { "pin1": { @@ -416,7 +452,16 @@ "pinName": "" }, "name": "unnamedWire#13", - "path": [] + "path": [ + { + "x": 45.0, + "y": 180.0 + }, + { + "x": 45.0, + "y": 245.0 + } + ] }, { "pin1": { @@ -428,7 +473,16 @@ "pinName": "" }, "name": "unnamedWire#14", - "path": [] + "path": [ + { + "x": 40.0, + "y": 200.0 + }, + { + "x": 40.0, + "y": 255.0 + } + ] }, { "pin1": { @@ -442,8 +496,8 @@ "name": "unnamedWire#15", "path": [ { - "x": 10.0, - "y": 430.0 + "x": 215.0, + "y": 150.0 } ] }, @@ -459,8 +513,8 @@ "name": "unnamedWire#16", "path": [ { - "x": 15.0, - "y": 440.0 + "x": 220.0, + "y": 160.0 } ] }, @@ -476,8 +530,8 @@ "name": "unnamedWire#17", "path": [ { - "x": 20.0, - "y": 450.0 + "x": 225.0, + "y": 170.0 } ] }, @@ -493,8 +547,8 @@ "name": "unnamedWire#18", "path": [ { - "x": 25.0, - "y": 460.0 + "x": 230.0, + "y": 180.0 } ] }, @@ -508,30 +562,21 @@ "pinName": "A1" }, "name": "unnamedWire#19", - "path": [ - { - "x": 10.0, - "y": 610.0 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", + "compName": "Am2901ALUInclDecode#0", "pinName": "I3" }, "pin2": { - "compName": "Am2901ALUInclDecode#0", + "compName": "_submodelinterface", "pinName": "I3" }, "name": "unnamedWire#2", "path": [ { - "x": 15.0, - "y": 100.0 - }, - { - "x": 15.0, + "x": 260.0, "y": 40.0 } ] @@ -546,12 +591,7 @@ "pinName": "A2" }, "name": "unnamedWire#20", - "path": [ - { - "x": 15.0, - "y": 620.0 - } - ] + "path": [] }, { "pin1": { @@ -563,12 +603,7 @@ "pinName": "A3" }, "name": "unnamedWire#21", - "path": [ - { - "x": 20.0, - "y": 630.0 - } - ] + "path": [] }, { "pin1": { @@ -580,12 +615,7 @@ "pinName": "A4" }, "name": "unnamedWire#22", - "path": [ - { - "x": 25.0, - "y": 640.0 - } - ] + "path": [] }, { "pin1": { @@ -599,12 +629,12 @@ "name": "unnamedWire#23", "path": [ { - "x": 5.0, - "y": 620.0 + "x": 25.0, + "y": 240.0 }, { - "x": 5.0, - "y": 650.0 + "x": 25.0, + "y": 265.0 } ] }, @@ -618,7 +648,16 @@ "pinName": "B2" }, "name": "unnamedWire#24", - "path": [] + "path": [ + { + "x": 20.0, + "y": 260.0 + }, + { + "x": 20.0, + "y": 275.0 + } + ] }, { "pin1": { @@ -632,12 +671,12 @@ "name": "unnamedWire#25", "path": [ { - "x": 5.0, - "y": 700.0 + "x": 20.0, + "y": 280.0 }, { - "x": 5.0, - "y": 670.0 + "x": 20.0, + "y": 285.0 } ] }, @@ -653,12 +692,12 @@ "name": "unnamedWire#26", "path": [ { - "x": 10.0, - "y": 740.0 + "x": 20.0, + "y": 300.0 }, { - "x": 10.0, - "y": 680.0 + "x": 20.0, + "y": 295.0 } ] }, @@ -674,12 +713,12 @@ "name": "unnamedWire#27", "path": [ { - "x": 15.0, - "y": 780.0 + "x": 20.0, + "y": 340.0 }, { - "x": 15.0, - "y": 690.0 + "x": 20.0, + "y": 305.0 } ] }, @@ -695,12 +734,12 @@ "name": "unnamedWire#28", "path": [ { - "x": 20.0, - "y": 820.0 + "x": 25.0, + "y": 360.0 }, { - "x": 20.0, - "y": 700.0 + "x": 25.0, + "y": 315.0 } ] }, @@ -716,12 +755,12 @@ "name": "unnamedWire#29", "path": [ { - "x": 25.0, - "y": 860.0 + "x": 30.0, + "y": 380.0 }, { - "x": 25.0, - "y": 710.0 + "x": 30.0, + "y": 325.0 } ] }, @@ -737,12 +776,16 @@ "name": "unnamedWire#3", "path": [ { - "x": 5.0, - "y": 140.0 + "x": 180.0, + "y": 5.0 }, { - "x": 5.0, - "y": 170.0 + "x": 155.0, + "y": 5.0 + }, + { + "x": 155.0, + "y": 165.0 } ] }, @@ -758,70 +801,54 @@ "name": "unnamedWire#30", "path": [ { - "x": 30.0, - "y": 900.0 + "x": 35.0, + "y": 400.0 }, { - "x": 30.0, - "y": 720.0 + "x": 35.0, + "y": 335.0 } ] }, { "pin1": { - "compName": "Am2901SourceDecode#0", - "pinName": "SQ" - }, - "pin2": { "compName": "sel3_4#0", "pinName": "SC" }, + "pin2": { + "compName": "Am2901SourceDecode#0", + "pinName": "SQ" + }, "name": "unnamedWire#31", "path": [ { - "x": 75.0, - "y": 170.0 - }, - { - "x": 75.0, - "y": 240.0 - }, - { - "x": 30.0, - "y": 240.0 + "x": 205.0, + "y": 215.0 }, { - "x": 30.0, - "y": 600.0 + "x": 205.0, + "y": 165.0 } ] }, { "pin1": { "compName": "Am2901SourceDecode#0", - "pinName": "RA" + "pinName": "RD" }, "pin2": { "compName": "sel2_4#0", - "pinName": "SB" + "pinName": "SA" }, "name": "unnamedWire#32", "path": [ { - "x": 70.0, - "y": 180.0 - }, - { - "x": 70.0, - "y": 235.0 - }, - { - "x": 20.0, - "y": 235.0 + "x": 200.0, + "y": 205.0 }, { - "x": 20.0, - "y": 380.0 + "x": 200.0, + "y": 90.0 } ] }, @@ -837,80 +864,26 @@ "name": "unnamedWire#33", "path": [ { - "x": 65.0, - "y": 190.0 + "x": 210.0, + "y": 185.0 }, { - "x": 65.0, - "y": 230.0 - }, - { - "x": 35.0, - "y": 230.0 - }, - { - "x": 35.0, - "y": 590.0 + "x": 210.0, + "y": 205.0 } ] }, { "pin1": { - "compName": "Am2901SourceDecode#0", - "pinName": "SA" - }, - "pin2": { "compName": "sel3_4#0", "pinName": "SA" }, - "name": "unnamedWire#34", - "path": [ - { - "x": 60.0, - "y": 200.0 - }, - { - "x": 60.0, - "y": 225.0 - }, - { - "x": 40.0, - "y": 225.0 - }, - { - "x": 40.0, - "y": 580.0 - } - ] - }, - { - "pin1": { - "compName": "Am2901SourceDecode#0", - "pinName": "RD" - }, "pin2": { - "compName": "sel2_4#0", + "compName": "Am2901SourceDecode#0", "pinName": "SA" }, - "name": "unnamedWire#35", - "path": [ - { - "x": 55.0, - "y": 210.0 - }, - { - "x": 55.0, - "y": 220.0 - }, - { - "x": 25.0, - "y": 220.0 - }, - { - "x": 25.0, - "y": 370.0 - } - ] + "name": "unnamedWire#34", + "path": [] }, { "pin1": { @@ -924,19 +897,11 @@ "name": "unnamedWire#36", "path": [ { - "x": 82.5, - "y": 370.0 - }, - { - "x": 82.5, - "y": 162.5 - }, - { - "x": 20.0, - "y": 162.5 + "x": 280.0, + "y": 90.0 }, { - "x": 20.0, + "x": 280.0, "y": 60.0 } ] @@ -953,19 +918,11 @@ "name": "unnamedWire#37", "path": [ { - "x": 85.0, - "y": 380.0 - }, - { - "x": 85.0, - "y": 160.0 - }, - { - "x": 22.5, - "y": 160.0 + "x": 285.0, + "y": 100.0 }, { - "x": 22.5, + "x": 285.0, "y": 70.0 } ] @@ -982,19 +939,11 @@ "name": "unnamedWire#38", "path": [ { - "x": 87.5, - "y": 390.0 - }, - { - "x": 87.5, - "y": 157.5 - }, - { - "x": 25.0, - "y": 157.5 + "x": 290.0, + "y": 110.0 }, { - "x": 25.0, + "x": 290.0, "y": 80.0 } ] @@ -1011,19 +960,11 @@ "name": "unnamedWire#39", "path": [ { - "x": 90.0, - "y": 400.0 - }, - { - "x": 90.0, - "y": 155.0 - }, - { - "x": 27.5, - "y": 155.0 + "x": 295.0, + "y": 120.0 }, { - "x": 27.5, + "x": 295.0, "y": 90.0 } ] @@ -1038,7 +979,12 @@ "pinName": "I1" }, "name": "unnamedWire#4", - "path": [] + "path": [ + { + "x": 140.0, + "y": 175.0 + } + ] }, { "pin1": { @@ -1052,19 +998,11 @@ "name": "unnamedWire#40", "path": [ { - "x": 92.5, - "y": 580.0 - }, - { - "x": 92.5, - "y": 152.5 - }, - { - "x": 30.0, - "y": 152.5 + "x": 300.0, + "y": 195.0 }, { - "x": 30.0, + "x": 300.0, "y": 100.0 } ] @@ -1081,19 +1019,11 @@ "name": "unnamedWire#41", "path": [ { - "x": 95.0, - "y": 590.0 - }, - { - "x": 95.0, - "y": 150.0 + "x": 305.0, + "y": 205.0 }, { - "x": 32.5, - "y": 150.0 - }, - { - "x": 32.5, + "x": 305.0, "y": 110.0 } ] @@ -1110,19 +1040,11 @@ "name": "unnamedWire#42", "path": [ { - "x": 97.5, - "y": 600.0 - }, - { - "x": 97.5, - "y": 147.5 - }, - { - "x": 35.0, - "y": 147.5 + "x": 310.0, + "y": 215.0 }, { - "x": 35.0, + "x": 310.0, "y": 120.0 } ] @@ -1139,19 +1061,11 @@ "name": "unnamedWire#43", "path": [ { - "x": 100.0, - "y": 610.0 - }, - { - "x": 100.0, - "y": 145.0 - }, - { - "x": 37.5, - "y": 145.0 + "x": 315.0, + "y": 225.0 }, { - "x": 37.5, + "x": 315.0, "y": 130.0 } ] @@ -1180,11 +1094,11 @@ "name": "unnamedWire#45", "path": [ { - "x": 135.0, + "x": 380.0, "y": 30.0 }, { - "x": 135.0, + "x": 380.0, "y": 60.0 } ] @@ -1201,11 +1115,11 @@ "name": "unnamedWire#46", "path": [ { - "x": 130.0, + "x": 375.0, "y": 40.0 }, { - "x": 130.0, + "x": 375.0, "y": 100.0 } ] @@ -1222,11 +1136,11 @@ "name": "unnamedWire#47", "path": [ { - "x": 125.0, + "x": 370.0, "y": 50.0 }, { - "x": 125.0, + "x": 370.0, "y": 140.0 } ] @@ -1243,11 +1157,11 @@ "name": "unnamedWire#48", "path": [ { - "x": 120.0, + "x": 365.0, "y": 60.0 }, { - "x": 120.0, + "x": 365.0, "y": 180.0 } ] @@ -1264,11 +1178,11 @@ "name": "unnamedWire#49", "path": [ { - "x": 115.0, + "x": 360.0, "y": 70.0 }, { - "x": 115.0, + "x": 360.0, "y": 220.0 } ] @@ -1285,33 +1199,46 @@ "name": "unnamedWire#5", "path": [ { - "x": 5.0, - "y": 220.0 - }, - { - "x": 5.0, - "y": 190.0 + "x": 100.0, + "y": 185.0 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "Cn" + "pinName": "I4" }, "pin2": { "compName": "Am2901ALUInclDecode#0", - "pinName": "Cn" + "pinName": "I4" + }, + "name": "unnamedWire#50", + "path": [ + { + "x": 220.0, + "y": 30.0 + } + ] + }, + { + "pin1": { + "compName": "Am2901SourceDecode#0", + "pinName": "RA" + }, + "pin2": { + "compName": "sel2_4#0", + "pinName": "SB" }, "name": "unnamedWire#6", "path": [ { - "x": 10.0, - "y": 260.0 + "x": 210.0, + "y": 175.0 }, { - "x": 10.0, - "y": 50.0 + "x": 210.0, + "y": 100.0 } ] }, @@ -1327,12 +1254,20 @@ "name": "unnamedWire#7", "path": [ { - "x": 15.0, - "y": 300.0 + "x": 10.0, + "y": 40.0 }, { - "x": 15.0, - "y": 390.0 + "x": 10.0, + "y": 55.0 + }, + { + "x": 190.0, + "y": 55.0 + }, + { + "x": 190.0, + "y": 110.0 } ] }, @@ -1349,11 +1284,19 @@ "path": [ { "x": 10.0, - "y": 340.0 + "y": 60.0 }, { "x": 10.0, - "y": 400.0 + "y": 65.0 + }, + { + "x": 185.0, + "y": 65.0 + }, + { + "x": 185.0, + "y": 120.0 } ] }, @@ -1369,12 +1312,20 @@ "name": "unnamedWire#9", "path": [ { - "x": 5.0, - "y": 380.0 + "x": 10.0, + "y": 80.0 }, { - "x": 5.0, - "y": 410.0 + "x": 10.0, + "y": 75.0 + }, + { + "x": 180.0, + "y": 75.0 + }, + { + "x": 180.0, + "y": 130.0 } ] } -- 2.17.1