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=730810ecd7aa34fb85c66ceeb5ab16d201f68d71;hb=6d4548400697464922346338386d5f3d20e13e0d;hp=136fcd06ef55953f140a27560b0c0fba84d99a7c;hpb=5c03a4fa605a1c3946eddece3b566b5aa0677759;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 136fcd06..730810ec 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": 30.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": 190.0, - "y": 100.0 + "x": 125.0, + "y": 285.0 }, "params": 1 }, @@ -267,7 +296,7 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 150.0, + "x": 145.0, "y": 375.0 }, "params": 1 @@ -827,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", @@ -884,18 +904,6 @@ "orientation": "RIGHT_ALT" } }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#4", - "pos": { - "x": 205.0, - "y": 70.0 - }, - "params": { - "logicWidth": 16, - "orientation": "RIGHT_ALT" - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -1242,7 +1250,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#38", "pos": { - "x": 174.0, + "x": 169.0, "y": 384.0 }, "params": 1 @@ -1260,7 +1268,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#40", "pos": { - "x": 144.0, + "x": 139.0, "y": 364.0 }, "params": 1 @@ -1269,7 +1277,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#41", "pos": { - "x": 144.0, + "x": 139.0, "y": 379.0 }, "params": 1 @@ -1279,7 +1287,7 @@ "name": "WireCrossPoint#42", "pos": { "x": 364.0, - "y": 289.0 + "y": 359.0 }, "params": 1 }, @@ -1292,6 +1300,15 @@ }, "params": 12 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#44", + "pos": { + "x": 169.0, + "y": 359.0 + }, + "params": 1 + }, { "id": "and", "name": "and#0", @@ -1357,6 +1374,14 @@ }, "params": 16 }, + { + "id": "mux1", + "name": "mux1#0", + "pos": { + "x": 100.0, + "y": 360.0 + } + }, { "id": "mux1_4", "name": "mux1_4#0", @@ -1378,7 +1403,7 @@ "name": "mux1_12#0", "pos": { "x": 365.0, - "y": 420.0 + "y": 415.0 } }, { @@ -1419,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, @@ -2999,8 +3024,8 @@ }, { "pin1": { - "compName": "ManualSwitch#0", - "pinName": "" + "compName": "mux1#0", + "pinName": "Y" }, "pin2": { "compName": "WireCrossPoint#40", @@ -3033,7 +3058,7 @@ "name": "unnamedWire#96", "path": [ { - "x": 145.0, + "x": 140.0, "y": 390.0 } ] @@ -3074,7 +3099,7 @@ "name": "unnamedWire#99", "path": [ { - "x": 175.0, + "x": 170.0, "y": 485.0 }, { @@ -3458,7 +3483,7 @@ }, "pin2": { "compName": "NandGate#5", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#121", "path": [ @@ -3468,15 +3493,15 @@ }, { "x": 340.0, - "y": 260.0 + "y": 325.0 }, { - "x": 180.0, - "y": 260.0 + "x": 120.0, + "y": 325.0 }, { - "x": 180.0, - "y": 105.0 + "x": 120.0, + "y": 300.0 } ] }, @@ -3528,27 +3553,61 @@ }, { "pin1": { - "compName": "WireCrossPoint#19", - "pinName": "" + "compName": "Am2900MemoryController#0", + "pinName": "Dmach" }, "pin2": { - "compName": "Am2900MainMemory#0", - "pinName": "A" + "compName": "WireCrossPoint#29", + "pinName": "" }, "name": "unnamedWire#125", - "path": [] + "path": [ + { + "x": 145.0, + "y": 280.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": "TriStateBuffer#4", - "pinName": "IN" + "compName": "Am2900MemoryController#0", + "pinName": "Amach" }, "name": "unnamedWire#126", - "path": [] + "path": [ + { + "x": 230.0, + "y": 60.0 + }, + { + "x": 230.0, + "y": 265.0 + }, + { + "x": 150.0, + "y": 265.0 + }, + { + "x": 150.0, + "y": 285.0 + } + ] }, { "pin1": { @@ -3695,22 +3754,22 @@ }, { "pin1": { - "compName": "TriStateBuffer#4", - "pinName": "OUT" + "compName": "Am2900MemoryController#0", + "pinName": "Dmem" }, "pin2": { - "compName": "WireCrossPoint#29", - "pinName": "" + "compName": "Am2900MainMemory#0", + "pinName": "D" }, "name": "unnamedWire#135", "path": [ { - "x": 230.0, - "y": 80.0 + "x": 205.0, + "y": 280.0 }, { - "x": 230.0, - "y": 45.0 + "x": 205.0, + "y": 155.0 } ] }, @@ -3735,7 +3794,7 @@ }, { "x": 360.0, - "y": 425.0 + "y": 420.0 } ] }, @@ -4031,7 +4090,7 @@ "path": [ { "x": 435.0, - "y": 450.0 + "y": 445.0 } ] }, @@ -4048,7 +4107,7 @@ "path": [ { "x": 350.0, - "y": 480.0 + "y": 475.0 }, { "x": 350.0, @@ -5143,26 +5202,26 @@ }, { "pin1": { - "compName": "Am2900MainMemory#0", - "pinName": "RW" - }, - "pin2": { "compName": "Splitter#10", "pinName": "O0" }, + "pin2": { + "compName": "Am2900MemoryController#0", + "pinName": "RWmach" + }, "name": "unnamedWire#241", "path": [ { - "x": 175.0, - "y": 100.0 + "x": 345.0, + "y": 320.0 }, { - "x": 175.0, - "y": 265.0 + "x": 150.0, + "y": 320.0 }, { - "x": 345.0, - "y": 265.0 + "x": 150.0, + "y": 300.0 } ] }, @@ -5865,14 +5924,14 @@ "path": [ { "x": 355.0, - "y": 265.0 + "y": 320.0 }, { - "x": 480.0, - "y": 265.0 + "x": 485.0, + "y": 320.0 }, { - "x": 480.0, + "x": 485.0, "y": 185.0 } ] @@ -6628,17 +6687,25 @@ }, "pin2": { "compName": "NandGate#5", - "pinName": "B" + "pinName": "A" }, "name": "unnamedWire#335", "path": [ { - "x": 185.0, + "x": 270.0, "y": 230.0 }, { - "x": 185.0, - "y": 115.0 + "x": 270.0, + "y": 270.0 + }, + { + "x": 120.0, + "y": 270.0 + }, + { + "x": 120.0, + "y": 290.0 } ] }, @@ -6739,24 +6806,28 @@ "path": [ { "x": 260.0, - "y": 440.0 + "y": 435.0 } ] }, { "pin1": { - "compName": "TriStateBuffer#4", - "pinName": "EN" + "compName": "Am2900MemoryController#0", + "pinName": "Amem" }, "pin2": { - "compName": "NandGate#5", - "pinName": "Y" + "compName": "Am2900MainMemory#0", + "pinName": "A" }, "name": "unnamedWire#344", "path": [ { - "x": 215.0, - "y": 110.0 + "x": 210.0, + "y": 285.0 + }, + { + "x": 210.0, + "y": 135.0 } ] }, @@ -6787,16 +6858,11 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#44", "pinName": "" }, "name": "unnamedWire#346", - "path": [ - { - "x": 175.0, - "y": 290.0 - } - ] + "path": [] }, { "pin1": { @@ -6827,11 +6893,11 @@ "name": "unnamedWire#348", "path": [ { - "x": 485.0, - "y": 290.0 + "x": 480.0, + "y": 360.0 }, { - "x": 485.0, + "x": 480.0, "y": 170.0 } ] @@ -6864,6 +6930,129 @@ }, "name": "unnamedWire#350", "path": [] + }, + { + "pin1": { + "compName": "Am2900MainMemory#0", + "pinName": "RW" + }, + "pin2": { + "compName": "Am2900MemoryController#0", + "pinName": "RWmem" + }, + "name": "unnamedWire#351", + "path": [ + { + "x": 215.0, + "y": 175.0 + }, + { + "x": 215.0, + "y": 300.0 + } + ] + }, + { + "pin1": { + "compName": "NandGate#5", + "pinName": "Y" + }, + "pin2": { + "compName": "Am2900MemoryController#0", + "pinName": "EN" + }, + "name": "unnamedWire#352", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#39", + "pinName": "" + }, + "pin2": { + "compName": "Am2900MemoryController#0", + "pinName": "C" + }, + "name": "unnamedWire#353", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#44", + "pinName": "" + }, + "pin2": { + "compName": "Am2900MemoryController#0", + "pinName": "_C" + }, + "name": "unnamedWire#354", + "path": [] + }, + { + "pin1": { + "compName": "ManualSwitch#0", + "pinName": "" + }, + "pin2": { + "compName": "mux1#0", + "pinName": "S0" + }, + "name": "unnamedWire#355", + "path": [ + { + "x": 95.0, + "y": 355.0 + }, + { + "x": 95.0, + "y": 365.0 + } + ] + }, + { + "pin1": { + "compName": "ManualSwitch#1", + "pinName": "" + }, + "pin2": { + "compName": "mux1#0", + "pinName": "I1" + }, + "name": "unnamedWire#356", + "path": [ + { + "x": 95.0, + "y": 395.0 + }, + { + "x": 95.0, + "y": 385.0 + } + ] + }, + { + "pin1": { + "compName": "Clock#0", + "pinName": "" + }, + "pin2": { + "compName": "mux1#0", + "pinName": "I0" + }, + "name": "unnamedWire#357", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#44", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#42", + "pinName": "" + }, + "name": "unnamedWire#358", + "path": [] } ], "version": "0.1.1"