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=37f08e58421f8b3d2c2ab223d1d2f11028590de3;hb=4166a936aca1d531e799d2920ec472952b76d0e3;hp=df6fc2c07cc6123680e0452f9141e8dbdbbdd766;hpb=522d6050fb531574375488cb8e17ed7687cd415b;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 df6fc2c0..37f08e58 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 } }, { @@ -100,11 +108,11 @@ "id": "Clock", "name": "Clock#0", "pos": { - "x": 120.0, + "x": 115.0, "y": 355.0 }, "params": { - "delta": 500, + "delta": 7000, "orientation": "RIGHT" } }, @@ -138,7 +146,7 @@ "id": "FixedOutput", "name": "FixedOutput#2", "pos": { - "x": 365.0, + "x": 370.0, "y": 505.0 }, "params": { @@ -261,8 +269,8 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 60.0, - "y": 235.0 + "x": 125.0, + "y": 285.0 }, "params": 1 }, @@ -270,20 +278,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", @@ -839,15 +838,6 @@ }, "params": "MPM addr" }, - { - "id": "TextComponent", - "name": "TextComponent#3", - "pos": { - "x": 110.0, - "y": 350.0 - }, - "params": "c" - }, { "id": "TriStateBuffer", "name": "TriStateBuffer#0", @@ -896,30 +886,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", @@ -1266,7 +1232,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#38", "pos": { - "x": 174.0, + "x": 169.0, "y": 384.0 }, "params": 1 @@ -1284,7 +1250,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#40", "pos": { - "x": 144.0, + "x": 139.0, "y": 364.0 }, "params": 1 @@ -1293,7 +1259,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#41", "pos": { - "x": 144.0, + "x": 139.0, "y": 379.0 }, "params": 1 @@ -1302,8 +1268,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#42", "pos": { - "x": 364.0, - "y": 289.0 + "x": 479.0, + "y": 364.0 }, "params": 1 }, @@ -1320,89 +1286,8 @@ "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": 364.0, + "y": 364.0 }, "params": 1 }, @@ -1430,30 +1315,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", @@ -1462,14 +1323,6 @@ "y": 105.0 } }, - { - "id": "dff16", - "name": "dff16#1", - "pos": { - "x": 180.0, - "y": 65.0 - } - }, { "id": "dff16_invwe", "name": "dff16_invwe#0", @@ -1478,30 +1331,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", @@ -1548,7 +1377,7 @@ "name": "mux1_12#0", "pos": { "x": 365.0, - "y": 420.0 + "y": 415.0 } }, { @@ -1589,16 +1418,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, @@ -3161,7 +2990,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#42", "pinName": "" }, "name": "unnamedWire#93", @@ -3203,7 +3032,7 @@ "name": "unnamedWire#96", "path": [ { - "x": 145.0, + "x": 140.0, "y": 390.0 } ] @@ -3244,7 +3073,7 @@ "name": "unnamedWire#99", "path": [ { - "x": 175.0, + "x": 170.0, "y": 485.0 }, { @@ -3263,7 +3092,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#44", "pinName": "" }, "name": "unnamedWire#100", @@ -3641,12 +3470,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 } ] }, @@ -3698,39 +3527,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 } ] }, @@ -3879,18 +3728,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 } ] }, @@ -3915,7 +3768,7 @@ }, { "x": 360.0, - "y": 425.0 + "y": 420.0 } ] }, @@ -4211,7 +4064,7 @@ "path": [ { "x": 435.0, - "y": 450.0 + "y": 445.0 } ] }, @@ -4228,7 +4081,7 @@ "path": [ { "x": 350.0, - "y": 480.0 + "y": 475.0 }, { "x": 350.0, @@ -5327,8 +5180,8 @@ "pinName": "O0" }, "pin2": { - "compName": "WireCrossPoint#47", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "RWmach" }, "name": "unnamedWire#241", "path": [ @@ -5337,8 +5190,12 @@ "y": 320.0 }, { - "x": 60.0, + "x": 150.0, "y": 320.0 + }, + { + "x": 150.0, + "y": 300.0 } ] }, @@ -6809,12 +6666,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 } ] }, @@ -6915,21 +6780,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": { @@ -6954,11 +6828,11 @@ }, { "pin1": { - "compName": "WireCrossPoint#38", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#53", + "compName": "WireCrossPoint#20", "pinName": "" }, "name": "unnamedWire#346", @@ -6966,7 +6840,7 @@ }, { "pin1": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { @@ -6992,10 +6866,6 @@ }, "name": "unnamedWire#348", "path": [ - { - "x": 480.0, - "y": 290.0 - }, { "x": 480.0, "y": 170.0 @@ -7034,458 +6904,71 @@ { "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": [] }, { "pin1": { - "compName": "WireCrossPoint#53", + "compName": "WireCrossPoint#38", "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", - "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" - }, - "name": "unnamedWire#359", - "path": [ - { - "x": 230.0, - "y": 270.0 - }, - { - "x": 230.0, - "y": 170.0 - }, - { - "x": 195.0, - "y": 170.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#47", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#52", - "pinName": "" - }, - "name": "unnamedWire#360", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#49", - "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" - }, - "name": "unnamedWire#364", - "path": [ - { - "x": 60.0, - "y": 260.0 - }, - { - "x": 80.0, - "y": 260.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 - } - ] - }, - { - "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", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "D" - }, - "name": "unnamedWire#374", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#46", + "compName": "WireCrossPoint#20", "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#355", "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" @@ -7575,7 +7058,17 @@ } } }, - "atomicHighLevelStates": {} + "atomicHighLevelStates": { + "mpm_address": { + "id": "wireForcing", + "params": { + "wiresToForce": [ + "unnamedWire#163" + ], + "wiresToForceInverted": [] + } + } + } }, "version": "0.1.5" } \ No newline at end of file