X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=fe7cde2dcda8114d951556ea914cf158692a3fe3;hb=3eef89febd75efd2f41df4ec79d4b8cc2c2ec5b3;hp=0be21591115cc9b5b90fd1c89ebb7f76f2d07555;hpb=dd31c2fcac0895701a4cea8a89e900cdf065e13f;p=Mograsim.git diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index 0be21591..fe7cde2d 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -9,8 +9,16 @@ "id": "Am2900MainMemory", "name": "Am2900MainMemory#0", "pos": { - "x": 35.0, - "y": 70.0 + "x": 80.0, + "y": 105.0 + } + }, + { + "id": "Am2900MemoryController", + "name": "Am2900MemoryController#0", + "pos": { + "x": 155.0, + "y": 275.0 } }, { @@ -96,6 +104,18 @@ }, "params": 16 }, + { + "id": "Clock", + "name": "Clock#0", + "pos": { + "x": 70.0, + "y": 365.0 + }, + "params": { + "delta": 500, + "orientation": "RIGHT" + } + }, { "id": "FixedOutput", "name": "FixedOutput#0", @@ -126,7 +146,7 @@ "id": "FixedOutput", "name": "FixedOutput#2", "pos": { - "x": 365.0, + "x": 370.0, "y": 505.0 }, "params": { @@ -204,8 +224,17 @@ "id": "ManualSwitch", "name": "ManualSwitch#0", "pos": { - "x": 120.0, - "y": 355.0 + "x": 70.0, + "y": 347.5 + }, + "params": 1 + }, + { + "id": "ManualSwitch", + "name": "ManualSwitch#1", + "pos": { + "x": 70.0, + "y": 387.5 }, "params": 1 }, @@ -258,8 +287,8 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 60.0, - "y": 235.0 + "x": 125.0, + "y": 285.0 }, "params": 1 }, @@ -267,20 +296,11 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 150.0, + "x": 145.0, "y": 375.0 }, "params": 1 }, - { - "id": "NandGate", - "name": "NandGate#7", - "pos": { - "x": 65.0, - "y": 270.0 - }, - "params": 1 - }, { "id": "Splitter", "name": "Splitter#0", @@ -836,15 +856,6 @@ }, "params": "MPM addr" }, - { - "id": "TextComponent", - "name": "TextComponent#3", - "pos": { - "x": 110.0, - "y": 355.0 - }, - "params": "c" - }, { "id": "TriStateBuffer", "name": "TriStateBuffer#0", @@ -893,30 +904,6 @@ "orientation": "RIGHT_ALT" } }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#4", - "pos": { - "x": 185.0, - "y": 175.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#5", - "pos": { - "x": 185.0, - "y": 145.0 - }, - "params": { - "logicWidth": 16, - "orientation": "LEFT" - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -1263,7 +1250,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#38", "pos": { - "x": 174.0, + "x": 169.0, "y": 384.0 }, "params": 1 @@ -1281,7 +1268,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#40", "pos": { - "x": 144.0, + "x": 139.0, "y": 364.0 }, "params": 1 @@ -1290,7 +1277,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#41", "pos": { - "x": 144.0, + "x": 139.0, "y": 379.0 }, "params": 1 @@ -1300,7 +1287,7 @@ "name": "WireCrossPoint#42", "pos": { "x": 364.0, - "y": 289.0 + "y": 359.0 }, "params": 1 }, @@ -1313,93 +1300,12 @@ }, "params": 12 }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#44", - "pos": { - "x": 174.0, - "y": 289.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#45", - "pos": { - "x": 129.0, - "y": 304.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#46", - "pos": { - "x": 129.0, - "y": 279.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#47", - "pos": { - "x": 59.0, - "y": 294.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#48", - "pos": { - "x": 84.0, - "y": 244.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#49", - "pos": { - "x": 59.0, - "y": 274.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#50", - "pos": { - "x": 234.0, - "y": 154.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#51", - "pos": { - "x": 164.0, - "y": 154.0 - }, - "params": 16 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#52", - "pos": { - "x": 59.0, - "y": 284.0 - }, - "params": 1 - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#53", "pos": { - "x": 174.0, - "y": 314.0 + "x": 169.0, + "y": 359.0 }, "params": 1 }, @@ -1427,30 +1333,6 @@ "y": 595.0 } }, - { - "id": "and", - "name": "and#3", - "pos": { - "x": 90.0, - "y": 240.0 - } - }, - { - "id": "and", - "name": "and#4", - "pos": { - "x": 90.0, - "y": 265.0 - } - }, - { - "id": "and", - "name": "and#5", - "pos": { - "x": 185.0, - "y": 240.0 - } - }, { "id": "dff16", "name": "dff16#0", @@ -1459,14 +1341,6 @@ "y": 105.0 } }, - { - "id": "dff16", - "name": "dff16#1", - "pos": { - "x": 180.0, - "y": 65.0 - } - }, { "id": "dff16_invwe", "name": "dff16_invwe#0", @@ -1475,30 +1349,6 @@ "y": 165.0 } }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 135.0, - "y": 265.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 135.0, - "y": 240.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 135.0, - "y": 290.0 - } - }, { "id": "dlatch80", "name": "dlatch80#0", @@ -1524,6 +1374,14 @@ }, "params": 16 }, + { + "id": "mux1", + "name": "mux1#0", + "pos": { + "x": 100.0, + "y": 360.0 + } + }, { "id": "mux1_4", "name": "mux1_4#0", @@ -1545,7 +1403,7 @@ "name": "mux1_12#0", "pos": { "x": 365.0, - "y": 420.0 + "y": 415.0 } }, { @@ -1586,16 +1444,16 @@ "y": 355.0 }, { - "x": 470.0, + "x": 490.0, "y": 355.0 }, { - "x": 470.0, - "y": 505.0 + "x": 490.0, + "y": 500.0 }, { "x": 400.0, - "y": 505.0 + "y": 500.0 }, { "x": 400.0, @@ -3166,8 +3024,8 @@ }, { "pin1": { - "compName": "ManualSwitch#0", - "pinName": "" + "compName": "mux1#0", + "pinName": "Y" }, "pin2": { "compName": "WireCrossPoint#40", @@ -3200,7 +3058,7 @@ "name": "unnamedWire#96", "path": [ { - "x": 145.0, + "x": 140.0, "y": 390.0 } ] @@ -3241,7 +3099,7 @@ "name": "unnamedWire#99", "path": [ { - "x": 175.0, + "x": 170.0, "y": 485.0 }, { @@ -3638,12 +3496,12 @@ "y": 325.0 }, { - "x": 55.0, + "x": 120.0, "y": 325.0 }, { - "x": 55.0, - "y": 250.0 + "x": 120.0, + "y": 300.0 } ] }, @@ -3695,39 +3553,59 @@ }, { "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "Dmach" }, "pin2": { - "compName": "dff16#1", - "pinName": "D" + "compName": "WireCrossPoint#29", + "pinName": "" }, "name": "unnamedWire#125", "path": [ { - "x": 170.0, - "y": 60.0 + "x": 145.0, + "y": 280.0 }, { - "x": 170.0, - "y": 90.0 + "x": 145.0, + "y": 260.0 + }, + { + "x": 225.0, + "y": 260.0 + }, + { + "x": 225.0, + "y": 45.0 } ] }, { "pin1": { - "compName": "Am2900MainMemory#0", - "pinName": "D" + "compName": "WireCrossPoint#19", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#51", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "Amach" }, "name": "unnamedWire#126", "path": [ { - "x": 165.0, - "y": 120.0 + "x": 230.0, + "y": 60.0 + }, + { + "x": 230.0, + "y": 265.0 + }, + { + "x": 150.0, + "y": 265.0 + }, + { + "x": 150.0, + "y": 285.0 } ] }, @@ -3876,18 +3754,22 @@ }, { "pin1": { - "compName": "TriStateBuffer#4", - "pinName": "OUT" + "compName": "Am2900MemoryController#0", + "pinName": "Dmem" }, "pin2": { - "compName": "WireCrossPoint#50", - "pinName": "" + "compName": "Am2900MainMemory#0", + "pinName": "D" }, "name": "unnamedWire#135", "path": [ { - "x": 235.0, - "y": 185.0 + "x": 205.0, + "y": 280.0 + }, + { + "x": 205.0, + "y": 155.0 } ] }, @@ -3912,7 +3794,7 @@ }, { "x": 360.0, - "y": 425.0 + "y": 420.0 } ] }, @@ -4208,7 +4090,7 @@ "path": [ { "x": 435.0, - "y": 450.0 + "y": 445.0 } ] }, @@ -4225,7 +4107,7 @@ "path": [ { "x": 350.0, - "y": 480.0 + "y": 475.0 }, { "x": 350.0, @@ -5324,8 +5206,8 @@ "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#47", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "RWmach" }, "name": "unnamedWire#241", "path": [ @@ -5334,8 +5216,12 @@ "y": 320.0 }, { - "x": 60.0, + "x": 150.0, "y": 320.0 + }, + { + "x": 150.0, + "y": 300.0 } ] }, @@ -6806,12 +6692,20 @@ "name": "unnamedWire#335", "path": [ { - "x": 55.0, + "x": 270.0, "y": 230.0 }, { - "x": 55.0, - "y": 240.0 + "x": 270.0, + "y": 270.0 + }, + { + "x": 120.0, + "y": 270.0 + }, + { + "x": 120.0, + "y": 290.0 } ] }, @@ -6912,21 +6806,30 @@ "path": [ { "x": 260.0, - "y": 440.0 + "y": 435.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#52", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "Amem" }, "pin2": { - "compName": "NandGate#7", - "pinName": "B" + "compName": "Am2900MainMemory#0", + "pinName": "A" }, "name": "unnamedWire#344", - "path": [] + "path": [ + { + "x": 210.0, + "y": 285.0 + }, + { + "x": 210.0, + "y": 135.0 + } + ] }, { "pin1": { @@ -6991,7 +6894,7 @@ "path": [ { "x": 480.0, - "y": 290.0 + "y": 360.0 }, { "x": 480.0, @@ -7031,52 +6934,44 @@ { "pin1": { "compName": "Am2900MainMemory#0", - "pinName": "A" + "pinName": "RW" }, "pin2": { - "compName": "dff16#1", - "pinName": "Q" + "compName": "Am2900MemoryController#0", + "pinName": "RWmem" }, "name": "unnamedWire#351", "path": [ { - "x": 170.0, - "y": 100.0 - }, - { - "x": 170.0, - "y": 125.0 - }, - { - "x": 230.0, - "y": 125.0 + "x": 215.0, + "y": 175.0 }, { - "x": 230.0, - "y": 90.0 + "x": 215.0, + "y": 300.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#44", - "pinName": "" + "compName": "NandGate#5", + "pinName": "Y" }, "pin2": { - "compName": "WireCrossPoint#42", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "EN" }, "name": "unnamedWire#352", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#53", + "compName": "WireCrossPoint#39", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#44", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "C" }, "name": "unnamedWire#353", "path": [] @@ -7087,402 +6982,77 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#45", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "_C" }, "name": "unnamedWire#354", - "path": [ - { - "x": 130.0, - "y": 315.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#44", - "pinName": "" - }, - "pin2": { - "compName": "dff16#1", - "pinName": "C" - }, - "name": "unnamedWire#355", - "path": [ - { - "x": 175.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#45", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#356", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#45", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#46", + "compName": "ManualSwitch#0", "pinName": "" }, - "name": "unnamedWire#357", - "path": [] - }, - { - "pin1": { - "compName": "and#5", - "pinName": "Y" - }, "pin2": { - "compName": "TriStateBuffer#4", - "pinName": "EN" - }, - "name": "unnamedWire#358", - "path": [ - { - "x": 225.0, - "y": 245.0 - }, - { - "x": 225.0, - "y": 200.0 - }, - { - "x": 195.0, - "y": 200.0 - } - ] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "EN" + "compName": "mux1#0", + "pinName": "S0" }, - "name": "unnamedWire#359", + "name": "unnamedWire#355", "path": [ { - "x": 230.0, - "y": 270.0 - }, - { - "x": 230.0, - "y": 170.0 + "x": 95.0, + "y": 355.0 }, { - "x": 195.0, - "y": 170.0 + "x": 95.0, + "y": 365.0 } ] }, { "pin1": { - "compName": "WireCrossPoint#47", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#52", - "pinName": "" - }, - "name": "unnamedWire#360", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#49", + "compName": "ManualSwitch#1", "pinName": "" }, "pin2": { - "compName": "NandGate#7", - "pinName": "A" - }, - "name": "unnamedWire#361", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#48", - "pinName": "" - }, - "pin2": { - "compName": "and#3", - "pinName": "A" - }, - "name": "unnamedWire#362", - "path": [] - }, - { - "pin1": { - "compName": "and#4", - "pinName": "Y" - }, - "pin2": { - "compName": "dff#0", - "pinName": "D" - }, - "name": "unnamedWire#363", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#49", - "pinName": "" - }, - "pin2": { - "compName": "and#3", - "pinName": "B" + "compName": "mux1#0", + "pinName": "I1" }, - "name": "unnamedWire#364", + "name": "unnamedWire#356", "path": [ { - "x": 60.0, - "y": 260.0 - }, - { - "x": 80.0, - "y": 260.0 + "x": 95.0, + "y": 395.0 }, { - "x": 80.0, - "y": 255.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#48", - "pinName": "" - }, - "pin2": { - "compName": "and#4", - "pinName": "A" - }, - "name": "unnamedWire#365", - "path": [ - { - "x": 85.0, - "y": 270.0 - } - ] - }, - { - "pin1": { - "compName": "NandGate#5", - "pinName": "Y" - }, - "pin2": { - "compName": "WireCrossPoint#48", - "pinName": "" - }, - "name": "unnamedWire#366", - "path": [] - }, - { - "pin1": { - "compName": "and#3", - "pinName": "Y" - }, - "pin2": { - "compName": "dff#1", - "pinName": "D" - }, - "name": "unnamedWire#367", - "path": [] - }, - { - "pin1": { - "compName": "NandGate#7", - "pinName": "Y" - }, - "pin2": { - "compName": "and#4", - "pinName": "B" - }, - "name": "unnamedWire#368", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#50", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" - }, - "name": "unnamedWire#369", - "path": [ - { - "x": 235.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#51", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#5", - "pinName": "OUT" - }, - "name": "unnamedWire#370", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#51", - "pinName": "" - }, - "pin2": { - "compName": "TriStateBuffer#4", - "pinName": "IN" - }, - "name": "unnamedWire#371", - "path": [ - { - "x": 165.0, - "y": 185.0 + "x": 95.0, + "y": 385.0 } ] }, { "pin1": { - "compName": "TriStateBuffer#5", - "pinName": "IN" - }, - "pin2": { - "compName": "WireCrossPoint#50", - "pinName": "" - }, - "name": "unnamedWire#372", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#52", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#49", - "pinName": "" - }, - "name": "unnamedWire#373", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#47", + "compName": "Clock#0", "pinName": "" }, "pin2": { - "compName": "dff#2", - "pinName": "D" + "compName": "mux1#0", + "pinName": "I0" }, - "name": "unnamedWire#374", + "name": "unnamedWire#357", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#46", + "compName": "WireCrossPoint#53", "pinName": "" }, "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#375", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#46", + "compName": "WireCrossPoint#42", "pinName": "" }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#376", - "path": [ - { - "x": 130.0, - "y": 255.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "Q" - }, - "pin2": { - "compName": "Am2900MainMemory#0", - "pinName": "RW" - }, - "name": "unnamedWire#377", - "path": [ - { - "x": 235.0, - "y": 295.0 - }, - { - "x": 235.0, - "y": 210.0 - }, - { - "x": 160.0, - "y": 210.0 - }, - { - "x": 160.0, - "y": 140.0 - } - ] - }, - { - "pin1": { - "compName": "dff#1", - "pinName": "Q" - }, - "pin2": { - "compName": "and#5", - "pinName": "A" - }, - "name": "unnamedWire#378", + "name": "unnamedWire#358", "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#39", - "pinName": "" - }, - "pin2": { - "compName": "and#5", - "pinName": "B" - }, - "name": "unnamedWire#379", - "path": [ - { - "x": 180.0, - "y": 255.0 - } - ] } ], "version": "0.1.1"