X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fam2910%2FAm2910.json;h=4615e7693e39fa7cf3e44708ff90569b3e12ce8e;hb=2f4993ad065c0dc55345221f8fd8d05be4d37aa5;hp=a8a587800dff7708e6a223001c0071b9b7158692;hpb=3a0a2ed5e5522243d1f22fbb320c9b3a5e9a217e;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json index a8a58780..4615e769 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json @@ -136,7 +136,7 @@ "name": "Am2910RegCntr#0", "pos": { "x": 130.0, - "y": 15.0 + "y": 10.0 } }, { @@ -144,7 +144,7 @@ "name": "Am2910InstrPLA#0", "pos": { "x": 30.0, - "y": 90.0 + "y": 100.0 } }, { @@ -170,7 +170,16 @@ "name": "NandGate#2", "pos": { "x": 205.0, - "y": 195.0 + "y": 200.0 + }, + "params": 1 + }, + { + "id": "NandGate", + "name": "NandGate#3", + "pos": { + "x": 90.0, + "y": 20.0 }, "params": 1 }, @@ -179,7 +188,7 @@ "name": "TriStateBuffer#0", "pos": { "x": 165.0, - "y": 180.0 + "y": 185.0 }, "params": { "logicWidth": 12, @@ -191,7 +200,7 @@ "name": "WireCrossPoint#0", "pos": { "x": 264.0, - "y": 99.0 + "y": 94.0 }, "params": 12 }, @@ -200,7 +209,7 @@ "name": "WireCrossPoint#1", "pos": { "x": 229.0, - "y": 59.0 + "y": 54.0 }, "params": 1 }, @@ -208,8 +217,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 174.0, - "y": 174.0 + "x": 199.0, + "y": 179.0 }, "params": 12 }, @@ -217,8 +226,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 164.0, - "y": 59.0 + "x": 149.0, + "y": 54.0 }, "params": 12 }, @@ -227,7 +236,7 @@ "name": "WireCrossPoint#4", "pos": { "x": 149.0, - "y": 9.0 + "y": 4.0 }, "params": 12 }, @@ -254,7 +263,7 @@ "name": "WireCrossPoint#7", "pos": { "x": 199.0, - "y": 34.0 + "y": 29.0 }, "params": 1 }, @@ -263,7 +272,7 @@ "name": "WireCrossPoint#8", "pos": { "x": 239.0, - "y": 69.0 + "y": 64.0 }, "params": 1 }, @@ -272,7 +281,7 @@ "name": "WireCrossPoint#9", "pos": { "x": 199.0, - "y": 209.0 + "y": 214.0 }, "params": 1 }, @@ -281,24 +290,23 @@ "name": "dff12#0", "pos": { "x": 245.0, - "y": 105.0 + "y": 100.0 } }, { - "id": "inc", - "name": "inc#0", + "id": "inc12", + "name": "inc12#0", "pos": { - "x": 245.0, - "y": 140.0 - }, - "params": 12 + "x": 255.0, + "y": 165.0 + } }, { "id": "nor12", "name": "nor12#0", "pos": { "x": 175.0, - "y": 45.0 + "y": 40.0 } }, { @@ -306,15 +314,15 @@ "name": "ram5_12#0", "pos": { "x": 245.0, - "y": 55.0 + "y": 50.0 } }, { "id": "sel4_12", "name": "sel4_12#0", "pos": { - "x": 135.0, - "y": 110.0 + "x": 130.0, + "y": 100.0 } } ], @@ -326,7 +334,7 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "SA" + "pinName": "S1" }, "name": "unnamedWire#0", "path": [] @@ -338,7 +346,7 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "SB" + "pinName": "S2" }, "name": "unnamedWire#1", "path": [] @@ -350,7 +358,7 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "SC" + "pinName": "S3" }, "name": "unnamedWire#2", "path": [] @@ -362,14 +370,14 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "SD" + "pinName": "S4" }, "name": "unnamedWire#3", "path": [] }, { "pin1": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "Y" }, "pin2": { @@ -377,19 +385,45 @@ "pinName": "D" }, "name": "unnamedWire#4", - "path": [] + "path": [ + { + "x": 280.0, + "y": 180.0 + }, + { + "x": 280.0, + "y": 145.0 + }, + { + "x": 240.0, + "y": 145.0 + }, + { + "x": 240.0, + "y": 120.0 + } + ] }, { "pin1": { "compName": "dff12#0", - "pinName": "Y" + "pinName": "Q" }, "pin2": { "compName": "WireCrossPoint#0", "pinName": "" }, "name": "unnamedWire#5", - "path": [] + "path": [ + { + "x": 290.0, + "y": 120.0 + }, + { + "x": 290.0, + "y": 95.0 + } + ] }, { "pin1": { @@ -437,12 +471,7 @@ "pinName": "" }, "name": "unnamedWire#9", - "path": [ - { - "x": 150.0, - "y": 60.0 - } - ] + "path": [] }, { "pin1": { @@ -457,36 +486,15 @@ "path": [ { "x": 225.0, - "y": 60.0 + "y": 55.0 }, { "x": 225.0, - "y": 80.0 + "y": 75.0 }, { "x": 70.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Am2910InstrPLA#0", - "pinName": "RLD" - }, - "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "LD" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 115.0, - "y": 95.0 - }, - { - "x": 115.0, - "y": 35.0 + "y": 75.0 } ] }, @@ -499,15 +507,15 @@ "compName": "Am2910RegCntr#0", "pinName": "DEC" }, - "name": "unnamedWire#12", + "name": "unnamedWire#11", "path": [ { "x": 120.0, - "y": 105.0 + "y": 115.0 }, { "x": 120.0, - "y": 45.0 + "y": 40.0 } ] }, @@ -520,11 +528,11 @@ "compName": "WireCrossPoint#1", "pinName": "" }, - "name": "unnamedWire#13", + "name": "unnamedWire#12", "path": [ { "x": 230.0, - "y": 155.0 + "y": 165.0 } ] }, @@ -537,11 +545,11 @@ "compName": "Am2910SP#0", "pinName": "STKI1" }, - "name": "unnamedWire#14", + "name": "unnamedWire#13", "path": [ { "x": 235.0, - "y": 165.0 + "y": 175.0 }, { "x": 235.0, @@ -558,7 +566,7 @@ "compName": "Am2910SP#0", "pinName": "STKI0" }, - "name": "unnamedWire#15", + "name": "unnamedWire#14", "path": [ { "x": 230.0, @@ -575,7 +583,7 @@ "compName": "WireCrossPoint#1", "pinName": "" }, - "name": "unnamedWire#16", + "name": "unnamedWire#15", "path": [] }, { @@ -587,8 +595,13 @@ "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#17", - "path": [] + "name": "unnamedWire#16", + "path": [ + { + "x": 200.0, + "y": 130.0 + } + ] }, { "pin1": { @@ -596,16 +609,11 @@ "pinName": "" }, "pin2": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "A" }, - "name": "unnamedWire#18", - "path": [ - { - "x": 265.0, - "y": 175.0 - } - ] + "name": "unnamedWire#17", + "path": [] }, { "pin1": { @@ -614,13 +622,13 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "C" + "pinName": "I3" }, - "name": "unnamedWire#19", + "name": "unnamedWire#18", "path": [ { - "x": 185.0, - "y": 85.0 + "x": 160.0, + "y": 80.0 } ] }, @@ -631,13 +639,13 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "D" + "pinName": "I4" }, - "name": "unnamedWire#20", + "name": "unnamedWire#19", "path": [ { - "x": 205.0, - "y": 100.0 + "x": 170.0, + "y": 95.0 } ] }, @@ -648,9 +656,9 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "B" + "pinName": "I2" }, - "name": "unnamedWire#21", + "name": "unnamedWire#20", "path": [] }, { @@ -662,7 +670,7 @@ "compName": "nor12#0", "pinName": "D" }, - "name": "unnamedWire#22", + "name": "unnamedWire#21", "path": [] }, { @@ -674,7 +682,7 @@ "compName": "WireCrossPoint#4", "pinName": "" }, - "name": "unnamedWire#23", + "name": "unnamedWire#22", "path": [] }, { @@ -686,7 +694,7 @@ "compName": "Am2910RegCntr#0", "pinName": "D" }, - "name": "unnamedWire#24", + "name": "unnamedWire#23", "path": [] }, { @@ -696,20 +704,20 @@ }, "pin2": { "compName": "sel4_12#0", - "pinName": "A" + "pinName": "I1" }, - "name": "unnamedWire#25", + "name": "unnamedWire#24", "path": [ { "x": 125.0, - "y": 10.0 + "y": 5.0 }, { "x": 125.0, "y": 65.0 }, { - "x": 145.0, + "x": 140.0, "y": 65.0 } ] @@ -720,20 +728,11 @@ "pinName": "_RLD" }, "pin2": { - "compName": "Am2910RegCntr#0", - "pinName": "_RLD" + "compName": "NandGate#3", + "pinName": "A" }, - "name": "unnamedWire#26", - "path": [ - { - "x": 50.0, - "y": 25.0 - }, - { - "x": 50.0, - "y": 20.0 - } - ] + "name": "unnamedWire#25", + "path": [] }, { "pin1": { @@ -744,8 +743,13 @@ "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#27", - "path": [] + "name": "unnamedWire#26", + "path": [ + { + "x": 175.0, + "y": 180.0 + } + ] }, { "pin1": { @@ -756,7 +760,7 @@ "compName": "Am2910InstrPLA#0", "pinName": "PASS" }, - "name": "unnamedWire#28", + "name": "unnamedWire#27", "path": [ { "x": 65.0, @@ -767,12 +771,8 @@ "y": 85.0 }, { - "x": 25.0, + "x": 35.0, "y": 85.0 - }, - { - "x": 25.0, - "y": 95.0 } ] }, @@ -785,7 +785,7 @@ "compName": "NandGate#0", "pinName": "A" }, - "name": "unnamedWire#29", + "name": "unnamedWire#28", "path": [] }, { @@ -797,7 +797,7 @@ "compName": "WireCrossPoint#5", "pinName": "" }, - "name": "unnamedWire#30", + "name": "unnamedWire#29", "path": [] }, { @@ -809,7 +809,7 @@ "compName": "NandGate#1", "pinName": "A" }, - "name": "unnamedWire#31", + "name": "unnamedWire#30", "path": [ { "x": 5.0, @@ -826,7 +826,7 @@ "compName": "NandGate#1", "pinName": "B" }, - "name": "unnamedWire#32", + "name": "unnamedWire#31", "path": [] }, { @@ -838,7 +838,7 @@ "compName": "NandGate#0", "pinName": "B" }, - "name": "unnamedWire#33", + "name": "unnamedWire#32", "path": [ { "x": 35.0, @@ -859,7 +859,7 @@ "compName": "_submodelinterface", "pinName": "_FULL" }, - "name": "unnamedWire#34", + "name": "unnamedWire#33", "path": [] }, { @@ -871,11 +871,11 @@ "compName": "dff12#0", "pinName": "C" }, - "name": "unnamedWire#35", + "name": "unnamedWire#34", "path": [ { "x": 240.0, - "y": 115.0 + "y": 105.0 } ] }, @@ -888,7 +888,7 @@ "compName": "WireCrossPoint#8", "pinName": "" }, - "name": "unnamedWire#36", + "name": "unnamedWire#35", "path": [] }, { @@ -900,7 +900,7 @@ "compName": "Am2910SP#0", "pinName": "C" }, - "name": "unnamedWire#37", + "name": "unnamedWire#36", "path": [] }, { @@ -912,8 +912,13 @@ "compName": "WireCrossPoint#6", "pinName": "" }, - "name": "unnamedWire#38", - "path": [] + "name": "unnamedWire#37", + "path": [ + { + "x": 240.0, + "y": 30.0 + } + ] }, { "pin1": { @@ -924,7 +929,7 @@ "compName": "Am2910RegCntr#0", "pinName": "C" }, - "name": "unnamedWire#39", + "name": "unnamedWire#38", "path": [] }, { @@ -936,20 +941,37 @@ "compName": "WireCrossPoint#7", "pinName": "" }, - "name": "unnamedWire#40", + "name": "unnamedWire#39", "path": [] }, { "pin1": { - "compName": "inc#0", + "compName": "inc12#0", "pinName": "CI" }, "pin2": { "compName": "_submodelinterface", "pinName": "CI" }, - "name": "unnamedWire#41", - "path": [] + "name": "unnamedWire#40", + "path": [ + { + "x": 250.0, + "y": 170.0 + }, + { + "x": 250.0, + "y": 160.0 + }, + { + "x": 290.0, + "y": 160.0 + }, + { + "x": 290.0, + "y": 150.0 + } + ] }, { "pin1": { @@ -960,15 +982,15 @@ "compName": "_submodelinterface", "pinName": "_PL" }, - "name": "unnamedWire#42", + "name": "unnamedWire#41", "path": [ { "x": 45.0, - "y": 180.0 + "y": 190.0 }, { "x": 50.0, - "y": 180.0 + "y": 190.0 } ] }, @@ -981,15 +1003,15 @@ "compName": "_submodelinterface", "pinName": "_MAP" }, - "name": "unnamedWire#43", + "name": "unnamedWire#42", "path": [ { - "x": 55.0, - "y": 185.0 + "x": 60.0, + "y": 195.0 }, { "x": 75.0, - "y": 185.0 + "y": 195.0 } ] }, @@ -1002,15 +1024,15 @@ "compName": "_submodelinterface", "pinName": "_VECT" }, - "name": "unnamedWire#44", + "name": "unnamedWire#43", "path": [ { - "x": 65.0, - "y": 180.0 + "x": 75.0, + "y": 190.0 }, { "x": 100.0, - "y": 180.0 + "y": 190.0 } ] }, @@ -1023,7 +1045,7 @@ "compName": "Am2910InstrPLA#0", "pinName": "I" }, - "name": "unnamedWire#45", + "name": "unnamedWire#44", "path": [ { "x": 25.0, @@ -1031,7 +1053,7 @@ }, { "x": 25.0, - "y": 110.0 + "y": 105.0 } ] }, @@ -1044,7 +1066,7 @@ "compName": "ram5_12#0", "pinName": "C" }, - "name": "unnamedWire#46", + "name": "unnamedWire#45", "path": [] }, { @@ -1056,7 +1078,7 @@ "compName": "_submodelinterface", "pinName": "Y" }, - "name": "unnamedWire#47", + "name": "unnamedWire#46", "path": [] }, { @@ -1068,7 +1090,7 @@ "compName": "WireCrossPoint#9", "pinName": "" }, - "name": "unnamedWire#48", + "name": "unnamedWire#47", "path": [] }, { @@ -1080,7 +1102,7 @@ "compName": "NandGate#2", "pinName": "B" }, - "name": "unnamedWire#49", + "name": "unnamedWire#48", "path": [] }, { @@ -1092,11 +1114,11 @@ "compName": "WireCrossPoint#9", "pinName": "" }, - "name": "unnamedWire#50", + "name": "unnamedWire#49", "path": [ { "x": 200.0, - "y": 200.0 + "y": 205.0 } ] }, @@ -1109,17 +1131,58 @@ "compName": "NandGate#2", "pinName": "Y" }, - "name": "unnamedWire#51", + "name": "unnamedWire#50", "path": [ { "x": 230.0, - "y": 190.0 + "y": 195.0 }, { "x": 230.0, - "y": 205.0 + "y": 210.0 } ] + }, + { + "pin1": { + "compName": "Am2910InstrPLA#0", + "pinName": "_RLD" + }, + "pin2": { + "compName": "NandGate#3", + "pinName": "B" + }, + "name": "unnamedWire#51", + "path": [ + { + "x": 95.0, + "y": 105.0 + }, + { + "x": 95.0, + "y": 95.0 + }, + { + "x": 85.0, + "y": 95.0 + }, + { + "x": 85.0, + "y": 35.0 + } + ] + }, + { + "pin1": { + "compName": "NandGate#3", + "pinName": "Y" + }, + "pin2": { + "compName": "Am2910RegCntr#0", + "pinName": "LD" + }, + "name": "unnamedWire#52", + "path": [] } ], "version": "0.1.1"