From: Daniel Kirschten Date: Wed, 7 Oct 2020 22:17:43 +0000 (+0200) Subject: Started cleaning up some components X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=9110eabe62a55d928959b2aa85844d18e4368745 Started cleaning up some components --- diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json index 6cd9dcfb..003a88f9 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json @@ -23,28 +23,10 @@ { "location": { "x": 0.0, - "y": 25.0 - }, - "name": "I3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 + "y": 10.0 }, - "name": "I4", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "I5", - "logicWidth": 1, + "name": "I", + "logicWidth": 3, "usage": "INPUT" }, { @@ -91,7 +73,7 @@ "id": "NandGate", "name": "NandGate#0", "pos": { - "x": 15.0, + "x": 30.0, "y": 10.0 }, "params": 1 @@ -100,8 +82,8 @@ "id": "NandGate", "name": "NandGate#1", "pos": { - "x": 15.0, - "y": 50.0 + "x": 30.0, + "y": 65.0 }, "params": 1 }, @@ -109,8 +91,8 @@ "id": "NandGate", "name": "NandGate#2", "pos": { - "x": 55.0, - "y": 45.0 + "x": 70.0, + "y": 60.0 }, "params": 1 }, @@ -118,8 +100,8 @@ "id": "NandGate", "name": "NandGate#3", "pos": { - "x": 55.0, - "y": 70.0 + "x": 70.0, + "y": 115.0 }, "params": 1 }, @@ -127,17 +109,29 @@ "id": "NandGate", "name": "NandGate#4", "pos": { - "x": 100.0, + "x": 115.0, "y": 50.0 }, "params": 1 }, + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 5.0, + "y": 30.0 + }, + "params": { + "logicWidth": 3, + "orientation": "RIGHT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 4.0, - "y": 19.0 + "x": 24.0, + "y": 39.0 }, "params": 1 }, @@ -145,7 +139,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 4.0, + "x": 19.0, "y": 24.0 }, "params": 1 @@ -154,7 +148,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 4.0, + "x": 19.0, "y": 44.0 }, "params": 1 @@ -163,8 +157,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 9.0, - "y": 59.0 + "x": 24.0, + "y": 69.0 }, "params": 1 }, @@ -172,8 +166,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { - "x": 9.0, - "y": 54.0 + "x": 24.0, + "y": 79.0 }, "params": 1 }, @@ -181,8 +175,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 9.0, - "y": 64.0 + "x": 24.0, + "y": 99.0 }, "params": 1 }, @@ -190,8 +184,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 9.0, - "y": 84.0 + "x": 64.0, + "y": 119.0 }, "params": 1 }, @@ -199,8 +193,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 49.0, - "y": 99.0 + "x": 64.0, + "y": 49.0 }, "params": 1 }, @@ -208,8 +202,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 49.0, - "y": 74.0 + "x": 54.0, + "y": 19.0 }, "params": 1 }, @@ -217,8 +211,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 39.0, - "y": 19.0 + "x": 54.0, + "y": 29.0 }, "params": 1 }, @@ -226,8 +220,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 39.0, - "y": 34.0 + "x": 19.0, + "y": 29.0 }, "params": 1 }, @@ -235,7 +229,7 @@ "id": "and", "name": "and#0", "pos": { - "x": 100.0, + "x": 110.0, "y": 135.0 } }, @@ -243,8 +237,8 @@ "id": "nand3", "name": "nand3#0", "pos": { - "x": 55.0, - "y": 10.0 + "x": 70.0, + "y": 25.0 } } ], @@ -252,18 +246,18 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "I5" + "pinName": "I" }, "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" + "compName": "Splitter#0", + "pinName": "I" }, "name": "unnamedWire#0", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { @@ -273,18 +267,18 @@ "name": "unnamedWire#1", "path": [ { - "x": 5.0, + "x": 20.0, "y": 15.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#0", "pinName": "" }, "name": "unnamedWire#2", @@ -292,12 +286,12 @@ }, { "pin1": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "NandGate#0", - "pinName": "B" + "compName": "WireCrossPoint#10", + "pinName": "" }, "name": "unnamedWire#3", "path": [] @@ -308,8 +302,8 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" + "compName": "NandGate#0", + "pinName": "B" }, "name": "unnamedWire#4", "path": [] @@ -326,12 +320,12 @@ "name": "unnamedWire#5", "path": [ { - "x": 45.0, + "x": 60.0, "y": 45.0 }, { - "x": 45.0, - "y": 50.0 + "x": 60.0, + "y": 65.0 } ] }, @@ -347,18 +341,18 @@ "name": "unnamedWire#6", "path": [ { - "x": 5.0, + "x": 20.0, "y": 180.0 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "I4" + "compName": "Splitter#0", + "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#7", @@ -366,44 +360,31 @@ }, { "pin1": { - "compName": "WireCrossPoint#3", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#4", - "pinName": "" + "compName": "nand3#0", + "pinName": "A" }, "name": "unnamedWire#8", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { "compName": "nand3#0", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#9", - "path": [ - { - "x": 10.0, - "y": 40.0 - }, - { - "x": 45.0, - "y": 40.0 - }, - { - "x": 45.0, - "y": 15.0 - } - ] + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { @@ -419,7 +400,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "name": "unnamedWire#11", @@ -427,7 +408,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { @@ -439,11 +420,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#5", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "name": "unnamedWire#13", @@ -451,7 +432,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { @@ -459,11 +440,16 @@ "pinName": "B" }, "name": "unnamedWire#14", - "path": [] + "path": [ + { + "x": 25.0, + "y": 130.0 + } + ] }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#5", "pinName": "" }, "pin2": { @@ -471,41 +457,23 @@ "pinName": "SN" }, "name": "unnamedWire#15", - "path": [ - { - "x": 10.0, - "y": 105.0 - }, - { - "x": 135.0, - "y": 105.0 - }, - { - "x": 135.0, - "y": 100.0 - } - ] + "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "I3" - }, - "pin2": { "compName": "WireCrossPoint#7", "pinName": "" }, + "pin2": { + "compName": "nand3#0", + "pinName": "C" + }, "name": "unnamedWire#16", - "path": [ - { - "x": 50.0, - "y": 100.0 - } - ] + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { @@ -515,18 +483,18 @@ "name": "unnamedWire#17", "path": [ { - "x": 50.0, + "x": 65.0, "y": 220.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#7", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#7", "pinName": "" }, "name": "unnamedWire#18", @@ -534,31 +502,14 @@ }, { "pin1": { - "compName": "WireCrossPoint#8", - "pinName": "" - }, - "pin2": { - "compName": "nand3#0", - "pinName": "B" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 50.0, - "y": 25.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#8", + "compName": "WireCrossPoint#6", "pinName": "" }, "pin2": { "compName": "NandGate#3", "pinName": "A" }, - "name": "unnamedWire#20", + "name": "unnamedWire#19", "path": [] }, { @@ -567,74 +518,62 @@ "pinName": "Y" }, "pin2": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, - "name": "unnamedWire#21", + "name": "unnamedWire#20", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { "compName": "_submodelinterface", "pinName": "CinE" }, - "name": "unnamedWire#22", + "name": "unnamedWire#21", "path": [ { - "x": 40.0, + "x": 55.0, "y": 5.0 }, { - "x": 115.0, + "x": 130.0, "y": 5.0 }, { - "x": 115.0, + "x": 130.0, "y": 20.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#9", + "compName": "WireCrossPoint#8", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#10", - "pinName": "" - }, - "name": "unnamedWire#23", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, - "pin2": { - "compName": "nand3#0", - "pinName": "C" - }, - "name": "unnamedWire#24", + "name": "unnamedWire#22", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#10", + "compName": "WireCrossPoint#9", "pinName": "" }, "pin2": { "compName": "and#0", "pinName": "B" }, - "name": "unnamedWire#25", + "name": "unnamedWire#23", "path": [ { - "x": 40.0, + "x": 55.0, "y": 150.0 } ] @@ -648,7 +587,7 @@ "compName": "NandGate#2", "pinName": "B" }, - "name": "unnamedWire#26", + "name": "unnamedWire#24", "path": [] }, { @@ -660,7 +599,17 @@ "compName": "NandGate#4", "pinName": "A" }, - "name": "unnamedWire#27" + "name": "unnamedWire#25", + "path": [ + { + "x": 110.0, + "y": 30.0 + }, + { + "x": 110.0, + "y": 55.0 + } + ] }, { "pin1": { @@ -671,7 +620,17 @@ "compName": "NandGate#4", "pinName": "B" }, - "name": "unnamedWire#28" + "name": "unnamedWire#26", + "path": [ + { + "x": 110.0, + "y": 70.0 + }, + { + "x": 110.0, + "y": 65.0 + } + ] }, { "pin1": { @@ -682,7 +641,7 @@ "compName": "and#0", "pinName": "A" }, - "name": "unnamedWire#29" + "name": "unnamedWire#27" }, { "pin1": { @@ -693,7 +652,7 @@ "compName": "_submodelinterface", "pinName": "L" }, - "name": "unnamedWire#30", + "name": "unnamedWire#28", "path": [] }, { @@ -705,8 +664,44 @@ "compName": "_submodelinterface", "pinName": "SBE" }, + "name": "unnamedWire#29", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O2" + }, + "pin2": { + "compName": "WireCrossPoint#10", + "pinName": "" + }, + "name": "unnamedWire#30", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O1" + }, + "pin2": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, "name": "unnamedWire#31", "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#10", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "name": "unnamedWire#32", + "path": [] } ], "version": "0.1.1" diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json index 935b6434..eeb833ae 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json @@ -5,7 +5,7 @@ { "location": { "x": 0.0, - "y": 35.0 + "y": 15.0 }, "name": "Cn", "logicWidth": 1, @@ -56,31 +56,13 @@ "logicWidth": 1, "usage": "OUTPUT" }, - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "I3", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "I4", - "logicWidth": 1, - "usage": "INPUT" - }, { "location": { "x": 0.0, "y": 5.0 }, - "name": "I5", - "logicWidth": 1, + "name": "I", + "logicWidth": 3, "usage": "INPUT" }, { @@ -95,7 +77,7 @@ { "location": { "x": 0.0, - "y": 45.0 + "y": 25.0 }, "name": "R1", "logicWidth": 1, @@ -104,7 +86,7 @@ { "location": { "x": 0.0, - "y": 55.0 + "y": 35.0 }, "name": "R2", "logicWidth": 1, @@ -113,7 +95,7 @@ { "location": { "x": 0.0, - "y": 65.0 + "y": 45.0 }, "name": "R3", "logicWidth": 1, @@ -122,7 +104,7 @@ { "location": { "x": 0.0, - "y": 75.0 + "y": 55.0 }, "name": "R4", "logicWidth": 1, @@ -131,7 +113,7 @@ { "location": { "x": 0.0, - "y": 85.0 + "y": 65.0 }, "name": "S1", "logicWidth": 1, @@ -140,7 +122,7 @@ { "location": { "x": 0.0, - "y": 95.0 + "y": 75.0 }, "name": "S2", "logicWidth": 1, @@ -149,7 +131,7 @@ { "location": { "x": 0.0, - "y": 105.0 + "y": 85.0 }, "name": "S3", "logicWidth": 1, @@ -158,7 +140,7 @@ { "location": { "x": 0.0, - "y": 115.0 + "y": 95.0 }, "name": "S4", "logicWidth": 1, @@ -401,63 +383,21 @@ { "pin1": { "compName": "_submodelinterface", - "pinName": "I5" + "pinName": "I" }, "pin2": { "compName": "Am2901ALUFuncDecode#0", - "pinName": "I5" + "pinName": "I" }, "name": "unnamedWire#0", - "path": [ - { - "x": 5.0, - "y": 20.0 - }, - { - "x": 5.0, - "y": 7.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I4" - }, - "pin2": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "I4" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 10.0, - "y": 60.0 - }, - { - "x": 10.0, - "y": 17.5 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "I3" - }, - "pin2": { - "compName": "Am2901ALUFuncDecode#0", - "pinName": "I3" - }, - "name": "unnamedWire#2", "path": [ { "x": 15.0, - "y": 100.0 + "y": 20.0 }, { "x": 15.0, - "y": 27.5 + "y": 12.5 } ] }, @@ -470,7 +410,7 @@ "compName": "WireCrossPoint#0", "pinName": "" }, - "name": "unnamedWire#3", + "name": "unnamedWire#1", "path": [ { "x": 62.5, @@ -495,7 +435,7 @@ "compName": "WireCrossPoint#1", "pinName": "" }, - "name": "unnamedWire#4", + "name": "unnamedWire#2", "path": [] }, { @@ -507,7 +447,7 @@ "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#5", + "name": "unnamedWire#3", "path": [] }, { @@ -519,7 +459,7 @@ "compName": "Am2901ALUOneBit#0", "pinName": "CoutE" }, - "name": "unnamedWire#6", + "name": "unnamedWire#4", "path": [] }, { @@ -531,7 +471,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "CoutE" }, - "name": "unnamedWire#7", + "name": "unnamedWire#5", "path": [] }, { @@ -543,7 +483,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "CoutE" }, - "name": "unnamedWire#8", + "name": "unnamedWire#6", "path": [] }, { @@ -555,7 +495,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "CoutE" }, - "name": "unnamedWire#9", + "name": "unnamedWire#7", "path": [ { "x": 25.0, @@ -572,7 +512,7 @@ "compName": "WireCrossPoint#3", "pinName": "" }, - "name": "unnamedWire#10", + "name": "unnamedWire#8", "path": [ { "x": 70.0, @@ -597,7 +537,7 @@ "compName": "WireCrossPoint#4", "pinName": "" }, - "name": "unnamedWire#11", + "name": "unnamedWire#9", "path": [] }, { @@ -609,7 +549,7 @@ "compName": "WireCrossPoint#5", "pinName": "" }, - "name": "unnamedWire#12", + "name": "unnamedWire#10", "path": [] }, { @@ -621,7 +561,7 @@ "compName": "Am2901ALUOneBit#0", "pinName": "CinE" }, - "name": "unnamedWire#13", + "name": "unnamedWire#11", "path": [] }, { @@ -633,7 +573,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "CinE" }, - "name": "unnamedWire#14", + "name": "unnamedWire#12", "path": [] }, { @@ -645,7 +585,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "CinE" }, - "name": "unnamedWire#15", + "name": "unnamedWire#13", "path": [] }, { @@ -657,7 +597,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "CinE" }, - "name": "unnamedWire#16", + "name": "unnamedWire#14", "path": [ { "x": 27.5, @@ -674,7 +614,7 @@ "compName": "WireCrossPoint#6", "pinName": "" }, - "name": "unnamedWire#17", + "name": "unnamedWire#15", "path": [ { "x": 57.5, @@ -699,7 +639,7 @@ "compName": "WireCrossPoint#7", "pinName": "" }, - "name": "unnamedWire#18", + "name": "unnamedWire#16", "path": [] }, { @@ -711,7 +651,7 @@ "compName": "WireCrossPoint#8", "pinName": "" }, - "name": "unnamedWire#19", + "name": "unnamedWire#17", "path": [] }, { @@ -723,7 +663,7 @@ "compName": "Am2901ALUOneBit#0", "pinName": "RN" }, - "name": "unnamedWire#20", + "name": "unnamedWire#18", "path": [] }, { @@ -735,7 +675,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "RN" }, - "name": "unnamedWire#21", + "name": "unnamedWire#19", "path": [] }, { @@ -747,7 +687,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "RN" }, - "name": "unnamedWire#22", + "name": "unnamedWire#20", "path": [] }, { @@ -759,7 +699,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "RN" }, - "name": "unnamedWire#23", + "name": "unnamedWire#21", "path": [ { "x": 30.0, @@ -776,7 +716,7 @@ "compName": "WireCrossPoint#9", "pinName": "" }, - "name": "unnamedWire#24", + "name": "unnamedWire#22", "path": [ { "x": 65.0, @@ -801,7 +741,7 @@ "compName": "WireCrossPoint#10", "pinName": "" }, - "name": "unnamedWire#25", + "name": "unnamedWire#23", "path": [] }, { @@ -813,7 +753,7 @@ "compName": "WireCrossPoint#11", "pinName": "" }, - "name": "unnamedWire#26", + "name": "unnamedWire#24", "path": [] }, { @@ -825,7 +765,7 @@ "compName": "Am2901ALUOneBit#0", "pinName": "SN" }, - "name": "unnamedWire#27", + "name": "unnamedWire#25", "path": [] }, { @@ -837,7 +777,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "SN" }, - "name": "unnamedWire#28", + "name": "unnamedWire#26", "path": [] }, { @@ -849,7 +789,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "SN" }, - "name": "unnamedWire#29", + "name": "unnamedWire#27", "path": [] }, { @@ -861,7 +801,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "SN" }, - "name": "unnamedWire#30", + "name": "unnamedWire#28", "path": [ { "x": 32.5, @@ -878,7 +818,7 @@ "compName": "WireCrossPoint#12", "pinName": "" }, - "name": "unnamedWire#31", + "name": "unnamedWire#29", "path": [ { "x": 60.0, @@ -903,7 +843,7 @@ "compName": "WireCrossPoint#13", "pinName": "" }, - "name": "unnamedWire#32", + "name": "unnamedWire#30", "path": [] }, { @@ -915,7 +855,7 @@ "compName": "WireCrossPoint#14", "pinName": "" }, - "name": "unnamedWire#33", + "name": "unnamedWire#31", "path": [] }, { @@ -927,7 +867,7 @@ "compName": "Am2901ALUOneBit#0", "pinName": "FN" }, - "name": "unnamedWire#34", + "name": "unnamedWire#32", "path": [] }, { @@ -939,7 +879,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "FN" }, - "name": "unnamedWire#35", + "name": "unnamedWire#33", "path": [] }, { @@ -951,7 +891,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "FN" }, - "name": "unnamedWire#36", + "name": "unnamedWire#34", "path": [] }, { @@ -963,7 +903,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "FN" }, - "name": "unnamedWire#37", + "name": "unnamedWire#35", "path": [ { "x": 35.0, @@ -980,7 +920,7 @@ "compName": "WireCrossPoint#15", "pinName": "" }, - "name": "unnamedWire#38", + "name": "unnamedWire#36", "path": [ { "x": 67.5, @@ -1005,7 +945,7 @@ "compName": "WireCrossPoint#16", "pinName": "" }, - "name": "unnamedWire#39", + "name": "unnamedWire#37", "path": [] }, { @@ -1017,7 +957,7 @@ "compName": "WireCrossPoint#17", "pinName": "" }, - "name": "unnamedWire#40", + "name": "unnamedWire#38", "path": [] }, { @@ -1029,7 +969,7 @@ "compName": "Am2901ALUOneBit#0", "pinName": "L" }, - "name": "unnamedWire#41", + "name": "unnamedWire#39", "path": [] }, { @@ -1041,7 +981,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "L" }, - "name": "unnamedWire#42", + "name": "unnamedWire#40", "path": [] }, { @@ -1053,7 +993,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "L" }, - "name": "unnamedWire#43", + "name": "unnamedWire#41", "path": [] }, { @@ -1065,7 +1005,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "L" }, - "name": "unnamedWire#44", + "name": "unnamedWire#42", "path": [ { "x": 37.5, @@ -1082,11 +1022,11 @@ "compName": "Am2901ALUOneBit#0", "pinName": "R" }, - "name": "unnamedWire#45", + "name": "unnamedWire#43", "path": [ { "x": 10.0, - "y": 180.0 + "y": 100.0 }, { "x": 10.0, @@ -1103,11 +1043,11 @@ "compName": "Am2901ALUOneBit#1", "pinName": "R" }, - "name": "unnamedWire#46", + "name": "unnamedWire#44", "path": [ { "x": 10.0, - "y": 220.0 + "y": 140.0 }, { "x": 10.0, @@ -1124,14 +1064,14 @@ "compName": "Am2901ALUOneBit#2", "pinName": "R" }, - "name": "unnamedWire#47", + "name": "unnamedWire#45", "path": [ { - "x": 10.0, - "y": 260.0 + "x": 5.0, + "y": 180.0 }, { - "x": 10.0, + "x": 5.0, "y": 315.0 } ] @@ -1145,11 +1085,11 @@ "compName": "Am2901ALUOneBit#3", "pinName": "R" }, - "name": "unnamedWire#48", + "name": "unnamedWire#46", "path": [ { "x": 20.0, - "y": 300.0 + "y": 220.0 }, { "x": 20.0, @@ -1166,11 +1106,11 @@ "compName": "Am2901ALUOneBit#0", "pinName": "S" }, - "name": "unnamedWire#49", + "name": "unnamedWire#47", "path": [ { "x": 15.0, - "y": 340.0 + "y": 260.0 }, { "x": 15.0, @@ -1187,14 +1127,14 @@ "compName": "Am2901ALUOneBit#1", "pinName": "S" }, - "name": "unnamedWire#50", + "name": "unnamedWire#48", "path": [ { - "x": 5.0, - "y": 380.0 + "x": 10.0, + "y": 300.0 }, { - "x": 5.0, + "x": 10.0, "y": 235.0 } ] @@ -1208,11 +1148,11 @@ "compName": "Am2901ALUOneBit#2", "pinName": "S" }, - "name": "unnamedWire#51", + "name": "unnamedWire#49", "path": [ { "x": 10.0, - "y": 420.0 + "y": 340.0 }, { "x": 10.0, @@ -1229,11 +1169,11 @@ "compName": "Am2901ALUOneBit#3", "pinName": "S" }, - "name": "unnamedWire#52", + "name": "unnamedWire#50", "path": [ { "x": 10.0, - "y": 460.0 + "y": 380.0 }, { "x": 10.0, @@ -1250,11 +1190,11 @@ "compName": "Am2901ALUOneBit#0", "pinName": "Cin" }, - "name": "unnamedWire#53", + "name": "unnamedWire#51", "path": [ { "x": 5.0, - "y": 140.0 + "y": 60.0 }, { "x": 5.0, @@ -1271,7 +1211,7 @@ "compName": "Am2901ALUOneBit#1", "pinName": "Cin" }, - "name": "unnamedWire#54", + "name": "unnamedWire#52", "path": [ { "x": 85.0, @@ -1300,7 +1240,7 @@ "compName": "Am2901ALUOneBit#2", "pinName": "Cin" }, - "name": "unnamedWire#55", + "name": "unnamedWire#53", "path": [ { "x": 85.0, @@ -1329,7 +1269,7 @@ "compName": "WireCrossPoint#18", "pinName": "" }, - "name": "unnamedWire#56", + "name": "unnamedWire#54", "path": [ { "x": 85.0, @@ -1346,7 +1286,7 @@ "compName": "Am2901ALUOneBit#3", "pinName": "Cin" }, - "name": "unnamedWire#57", + "name": "unnamedWire#55", "path": [ { "x": 40.0, @@ -1367,7 +1307,7 @@ "compName": "WireCrossPoint#19", "pinName": "" }, - "name": "unnamedWire#58", + "name": "unnamedWire#56", "path": [] }, { @@ -1379,7 +1319,7 @@ "compName": "_submodelinterface", "pinName": "F1" }, - "name": "unnamedWire#59", + "name": "unnamedWire#57", "path": [ { "x": 90.0, @@ -1400,7 +1340,7 @@ "compName": "_submodelinterface", "pinName": "F2" }, - "name": "unnamedWire#60", + "name": "unnamedWire#58", "path": [ { "x": 95.0, @@ -1421,7 +1361,7 @@ "compName": "_submodelinterface", "pinName": "F3" }, - "name": "unnamedWire#61", + "name": "unnamedWire#59", "path": [ { "x": 100.0, @@ -1442,7 +1382,7 @@ "compName": "_submodelinterface", "pinName": "F4" }, - "name": "unnamedWire#62", + "name": "unnamedWire#60", "path": [ { "x": 105.0, @@ -1463,7 +1403,7 @@ "compName": "xor#0", "pinName": "A" }, - "name": "unnamedWire#63", + "name": "unnamedWire#61", "path": [ { "x": 90.0, @@ -1484,7 +1424,7 @@ "compName": "xor#0", "pinName": "B" }, - "name": "unnamedWire#64", + "name": "unnamedWire#62", "path": [ { "x": 85.0, @@ -1501,7 +1441,7 @@ "compName": "_submodelinterface", "pinName": "Cn+4" }, - "name": "unnamedWire#65", + "name": "unnamedWire#63", "path": [ { "x": 130.0, @@ -1522,7 +1462,7 @@ "compName": "_submodelinterface", "pinName": "OVR" }, - "name": "unnamedWire#66" + "name": "unnamedWire#64" } ], "version": "0.1.1" diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json index 87615ab0..aaa31416 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json @@ -154,18 +154,6 @@ { "id": "Splitter", "name": "Splitter#4", - "pos": { - "x": 300.0, - "y": 25.0 - }, - "params": { - "logicWidth": 3, - "orientation": "RIGHT" - } - }, - { - "id": "Splitter", - "name": "Splitter#5", "pos": { "x": 220.0, "y": 110.0 @@ -177,7 +165,7 @@ }, { "id": "Splitter", - "name": "Splitter#6", + "name": "Splitter#5", "pos": { "x": 355.0, "y": 25.0 @@ -189,7 +177,7 @@ }, { "id": "Splitter", - "name": "Splitter#7", + "name": "Splitter#6", "pos": { "x": 195.0, "y": 225.0 @@ -201,7 +189,7 @@ }, { "id": "Splitter", - "name": "Splitter#8", + "name": "Splitter#7", "pos": { "x": 220.0, "y": 265.0 @@ -213,7 +201,7 @@ }, { "id": "Splitter", - "name": "Splitter#9", + "name": "Splitter#8", "pos": { "x": 220.0, "y": 305.0 @@ -302,7 +290,7 @@ "path": [ { "x": 40.0, - "y": 55.0 + "y": 35.0 } ] }, @@ -377,7 +365,7 @@ }, { "pin1": { - "compName": "Splitter#5", + "compName": "Splitter#4", "pinName": "O3" }, "pin2": { @@ -389,7 +377,7 @@ }, { "pin1": { - "compName": "Splitter#5", + "compName": "Splitter#4", "pinName": "O2" }, "pin2": { @@ -401,7 +389,7 @@ }, { "pin1": { - "compName": "Splitter#5", + "compName": "Splitter#4", "pinName": "O1" }, "pin2": { @@ -413,7 +401,7 @@ }, { "pin1": { - "compName": "Splitter#5", + "compName": "Splitter#4", "pinName": "O0" }, "pin2": { @@ -429,7 +417,7 @@ "pinName": "A" }, "pin2": { - "compName": "Splitter#7", + "compName": "Splitter#6", "pinName": "I" }, "name": "unnamedWire#11", @@ -446,7 +434,7 @@ }, { "pin1": { - "compName": "Splitter#7", + "compName": "Splitter#6", "pinName": "O3" }, "pin2": { @@ -458,7 +446,7 @@ }, { "pin1": { - "compName": "Splitter#7", + "compName": "Splitter#6", "pinName": "O2" }, "pin2": { @@ -470,7 +458,7 @@ }, { "pin1": { - "compName": "Splitter#7", + "compName": "Splitter#6", "pinName": "O1" }, "pin2": { @@ -598,7 +586,7 @@ }, { "pin1": { - "compName": "Splitter#7", + "compName": "Splitter#6", "pinName": "O0" }, "pin2": { @@ -610,7 +598,7 @@ }, { "pin1": { - "compName": "Splitter#8", + "compName": "Splitter#7", "pinName": "O3" }, "pin2": { @@ -622,7 +610,7 @@ }, { "pin1": { - "compName": "Splitter#8", + "compName": "Splitter#7", "pinName": "O2" }, "pin2": { @@ -634,7 +622,7 @@ }, { "pin1": { - "compName": "Splitter#8", + "compName": "Splitter#7", "pinName": "O1" }, "pin2": { @@ -646,7 +634,7 @@ }, { "pin1": { - "compName": "Splitter#9", + "compName": "Splitter#8", "pinName": "O0" }, "pin2": { @@ -748,7 +736,7 @@ }, { "x": 275.0, - "y": 65.0 + "y": 45.0 } ] }, @@ -769,7 +757,7 @@ }, { "x": 280.0, - "y": 75.0 + "y": 55.0 } ] }, @@ -790,7 +778,7 @@ }, { "x": 285.0, - "y": 85.0 + "y": 65.0 } ] }, @@ -811,7 +799,7 @@ }, { "x": 290.0, - "y": 95.0 + "y": 75.0 } ] }, @@ -832,7 +820,7 @@ }, { "x": 295.0, - "y": 105.0 + "y": 85.0 } ] }, @@ -853,7 +841,7 @@ }, { "x": 300.0, - "y": 115.0 + "y": 95.0 } ] }, @@ -874,7 +862,7 @@ }, { "x": 305.0, - "y": 125.0 + "y": 105.0 } ] }, @@ -895,13 +883,13 @@ }, { "x": 310.0, - "y": 135.0 + "y": 115.0 } ] }, { "pin1": { - "compName": "Splitter#6", + "compName": "Splitter#5", "pinName": "O3" }, "pin2": { @@ -913,7 +901,7 @@ }, { "pin1": { - "compName": "Splitter#6", + "compName": "Splitter#5", "pinName": "O2" }, "pin2": { @@ -925,7 +913,7 @@ }, { "pin1": { - "compName": "Splitter#6", + "compName": "Splitter#5", "pinName": "O1" }, "pin2": { @@ -941,7 +929,7 @@ "pinName": "F1" }, "pin2": { - "compName": "Splitter#6", + "compName": "Splitter#5", "pinName": "O0" }, "name": "unnamedWire#43", @@ -1068,53 +1056,25 @@ "pinName": "I" }, "pin2": { - "compName": "Splitter#4", + "compName": "Am2901ALUInclDecode#0", "pinName": "I" }, "name": "unnamedWire#51", "path": [ { "x": 185.0, - "y": 35.0 + "y": 40.0 + }, + { + "x": 240.0, + "y": 40.0 + }, + { + "x": 240.0, + "y": 25.0 } ] }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O2" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "I5" - }, - "name": "unnamedWire#52", - "path": [] - }, - { - "pin1": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "I4" - }, - "pin2": { - "compName": "Splitter#4", - "pinName": "O1" - }, - "name": "unnamedWire#53", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#4", - "pinName": "O0" - }, - "pin2": { - "compName": "Am2901ALUInclDecode#0", - "pinName": "I3" - }, - "name": "unnamedWire#54", - "path": [] - }, { "pin1": { "compName": "Splitter#0", @@ -1124,19 +1084,19 @@ "compName": "_submodelinterface", "pinName": "I" }, - "name": "unnamedWire#55", + "name": "unnamedWire#52", "path": [] }, { "pin1": { - "compName": "Splitter#6", + "compName": "Splitter#5", "pinName": "I" }, "pin2": { "compName": "_submodelinterface", "pinName": "F" }, - "name": "unnamedWire#56", + "name": "unnamedWire#53", "path": [] }, { @@ -1145,10 +1105,10 @@ "pinName": "D" }, "pin2": { - "compName": "Splitter#5", + "compName": "Splitter#4", "pinName": "I" }, - "name": "unnamedWire#57", + "name": "unnamedWire#54", "path": [ { "x": 25.0, @@ -1166,70 +1126,70 @@ "pinName": "B1" }, "pin2": { - "compName": "Splitter#8", + "compName": "Splitter#7", "pinName": "O0" }, - "name": "unnamedWire#58", + "name": "unnamedWire#55", "path": [] }, { "pin1": { - "compName": "Splitter#8", + "compName": "Splitter#7", "pinName": "I" }, "pin2": { "compName": "_submodelinterface", "pinName": "B" }, - "name": "unnamedWire#59", + "name": "unnamedWire#56", "path": [] }, { "pin1": { - "compName": "Splitter#9", + "compName": "Splitter#8", "pinName": "O1" }, "pin2": { "compName": "sel3_4#0", "pinName": "C2" }, - "name": "unnamedWire#60", + "name": "unnamedWire#57", "path": [] }, { "pin1": { - "compName": "Splitter#9", + "compName": "Splitter#8", "pinName": "O2" }, "pin2": { "compName": "sel3_4#0", "pinName": "C3" }, - "name": "unnamedWire#61", + "name": "unnamedWire#58", "path": [] }, { "pin1": { - "compName": "Splitter#9", + "compName": "Splitter#8", "pinName": "O3" }, "pin2": { "compName": "sel3_4#0", "pinName": "C4" }, - "name": "unnamedWire#62", + "name": "unnamedWire#59", "path": [] }, { "pin1": { - "compName": "Splitter#9", + "compName": "Splitter#8", "pinName": "I" }, "pin2": { "compName": "_submodelinterface", "pinName": "Q" }, - "name": "unnamedWire#63", + "name": "unnamedWire#60", "path": [] } ],