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=eadd2da35ca3bbd69f1581bac4f6d6459160ce9e;hb=b3701e9585a62020f2b40727a0adfc90e46ce2a9;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..eadd2da3 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 } }, { @@ -92,15 +100,27 @@ "name": "BitDisplay#2", "pos": { "x": 280.0, - "y": 60.0 + "y": 65.0 }, "params": 16 }, + { + "id": "Clock", + "name": "Clock#0", + "pos": { + "x": 115.0, + "y": 355.0 + }, + "params": { + "delta": 7000, + "orientation": "RIGHT" + } + }, { "id": "FixedOutput", "name": "FixedOutput#0", "pos": { - "x": 540.0, + "x": 555.0, "y": 270.0 }, "params": { @@ -113,8 +133,8 @@ "id": "FixedOutput", "name": "FixedOutput#1", "pos": { - "x": 635.0, - "y": 380.0 + "x": 645.0, + "y": 390.0 }, "params": { "bits": [ @@ -126,8 +146,8 @@ "id": "FixedOutput", "name": "FixedOutput#2", "pos": { - "x": 365.0, - "y": 505.0 + "x": 385.0, + "y": 510.0 }, "params": { "bits": [ @@ -152,7 +172,7 @@ "id": "FixedOutput", "name": "FixedOutput#4", "pos": { - "x": 420.0, + "x": 430.0, "y": 570.0 }, "params": { @@ -165,8 +185,8 @@ "id": "FixedOutput", "name": "FixedOutput#5", "pos": { - "x": 475.0, - "y": 505.0 + "x": 485.0, + "y": 510.0 }, "params": { "bits": [ @@ -178,8 +198,8 @@ "id": "FixedOutput", "name": "FixedOutput#6", "pos": { - "x": 535.0, - "y": 370.0 + "x": 545.0, + "y": 380.0 }, "params": { "bits": [ @@ -191,8 +211,8 @@ "id": "FixedOutput", "name": "FixedOutput#7", "pos": { - "x": 260.0, - "y": 370.0 + "x": 270.0, + "y": 380.0 }, "params": { "bits": [ @@ -200,15 +220,6 @@ ] } }, - { - "id": "ManualSwitch", - "name": "ManualSwitch#0", - "pos": { - "x": 120.0, - "y": 355.0 - }, - "params": 1 - }, { "id": "NandGate", "name": "NandGate#0", @@ -258,8 +269,8 @@ "id": "NandGate", "name": "NandGate#5", "pos": { - "x": 190.0, - "y": 100.0 + "x": 125.0, + "y": 285.0 }, "params": 1 }, @@ -267,7 +278,7 @@ "id": "NandGate", "name": "NandGate#6", "pos": { - "x": 150.0, + "x": 145.0, "y": 375.0 }, "params": 1 @@ -805,7 +816,7 @@ "name": "TextComponent#0", "pos": { "x": 305.0, - "y": 30.0 + "y": 25.0 }, "params": "D bus" }, @@ -814,7 +825,7 @@ "name": "TextComponent#1", "pos": { "x": 305.0, - "y": 60.0 + "y": 55.0 }, "params": "A bus" }, @@ -827,15 +838,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 +886,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 +1232,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#38", "pos": { - "x": 174.0, + "x": 169.0, "y": 384.0 }, "params": 1 @@ -1260,7 +1250,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#40", "pos": { - "x": 144.0, + "x": 139.0, "y": 364.0 }, "params": 1 @@ -1269,7 +1259,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#41", "pos": { - "x": 144.0, + "x": 139.0, "y": 379.0 }, "params": 1 @@ -1278,8 +1268,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#42", "pos": { - "x": 364.0, - "y": 289.0 + "x": 479.0, + "y": 364.0 }, "params": 1 }, @@ -1292,6 +1282,15 @@ }, "params": 12 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#44", + "pos": { + "x": 364.0, + "y": 364.0 + }, + "params": 1 + }, { "id": "and", "name": "and#0", @@ -1349,13 +1348,12 @@ } }, { - "id": "inc", - "name": "inc#0", + "id": "inc16", + "name": "inc16#0", "pos": { - "x": 315.0, - "y": 135.0 - }, - "params": 16 + "x": 335.0, + "y": 115.0 + } }, { "id": "mux1_4", @@ -1378,7 +1376,7 @@ "name": "mux1_12#0", "pos": { "x": 365.0, - "y": 420.0 + "y": 415.0 } }, { @@ -1419,16 +1417,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, @@ -2174,7 +2172,7 @@ "path": [ { "x": 660.0, - "y": 390.0 + "y": 395.0 } ] }, @@ -2202,12 +2200,12 @@ "name": "unnamedWire#37", "path": [ { - "x": 480.0, + "x": 470.0, "y": 540.0 }, { - "x": 480.0, - "y": 570.0 + "x": 470.0, + "y": 565.0 } ] }, @@ -2224,7 +2222,7 @@ "path": [ { "x": 445.0, - "y": 580.0 + "y": 575.0 } ] }, @@ -2253,7 +2251,7 @@ "path": [ { "x": 560.0, - "y": 380.0 + "y": 385.0 } ] }, @@ -2431,7 +2429,7 @@ "path": [ { "x": 570.0, - "y": 280.0 + "y": 275.0 } ] }, @@ -2991,7 +2989,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#42", "pinName": "" }, "name": "unnamedWire#93", @@ -2999,7 +2997,7 @@ }, { "pin1": { - "compName": "ManualSwitch#0", + "compName": "Clock#0", "pinName": "" }, "pin2": { @@ -3033,7 +3031,7 @@ "name": "unnamedWire#96", "path": [ { - "x": 145.0, + "x": 140.0, "y": 390.0 } ] @@ -3074,7 +3072,7 @@ "name": "unnamedWire#99", "path": [ { - "x": 175.0, + "x": 170.0, "y": 485.0 }, { @@ -3093,7 +3091,7 @@ "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#20", + "compName": "WireCrossPoint#44", "pinName": "" }, "name": "unnamedWire#100", @@ -3458,7 +3456,7 @@ }, "pin2": { "compName": "NandGate#5", - "pinName": "A" + "pinName": "B" }, "name": "unnamedWire#121", "path": [ @@ -3468,15 +3466,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 +3526,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": { @@ -3577,7 +3609,7 @@ }, { "pin1": { - "compName": "inc#0", + "compName": "inc16#0", "pinName": "Y" }, "pin2": { @@ -3585,16 +3617,11 @@ "pinName": "D" }, "name": "unnamedWire#128", - "path": [ - { - "x": 335.0, - "y": 130.0 - } - ] + "path": [] }, { "pin1": { - "compName": "inc#0", + "compName": "inc16#0", "pinName": "A" }, "pin2": { @@ -3604,14 +3631,18 @@ "name": "unnamedWire#129", "path": [ { - "x": 335.0, + "x": 315.0, + "y": 130.0 + }, + { + "x": 315.0, "y": 160.0 } ] }, { "pin1": { - "compName": "inc#0", + "compName": "inc16#0", "pinName": "CI" }, "pin2": { @@ -3620,9 +3651,17 @@ }, "name": "unnamedWire#130", "path": [ + { + "x": 330.0, + "y": 120.0 + }, + { + "x": 330.0, + "y": 160.0 + }, { "x": 360.0, - "y": 145.0 + "y": 160.0 }, { "x": 360.0, @@ -3672,7 +3711,7 @@ "path": [ { "x": 285.0, - "y": 380.0 + "y": 385.0 } ] }, @@ -3695,22 +3734,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 +3774,7 @@ }, { "x": 360.0, - "y": 425.0 + "y": 420.0 } ] }, @@ -4031,7 +4070,7 @@ "path": [ { "x": 435.0, - "y": 450.0 + "y": 445.0 } ] }, @@ -4048,7 +4087,7 @@ "path": [ { "x": 350.0, - "y": 480.0 + "y": 475.0 }, { "x": 350.0, @@ -5143,26 +5182,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 +5904,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 } ] @@ -6561,7 +6600,12 @@ "pinName": "" }, "name": "unnamedWire#330", - "path": [] + "path": [ + { + "x": 275.0, + "y": 35.0 + } + ] }, { "pin1": { @@ -6602,7 +6646,12 @@ "pinName": "" }, "name": "unnamedWire#333", - "path": [] + "path": [ + { + "x": 275.0, + "y": 70.0 + } + ] }, { "pin1": { @@ -6628,17 +6677,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 +6796,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 } ] }, @@ -6783,24 +6844,19 @@ }, { "pin1": { - "compName": "WireCrossPoint#38", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#20", "pinName": "" }, "name": "unnamedWire#346", - "path": [ - { - "x": 175.0, - "y": 290.0 - } - ] + "path": [] }, { "pin1": { - "compName": "WireCrossPoint#42", + "compName": "WireCrossPoint#44", "pinName": "" }, "pin2": { @@ -6827,11 +6883,7 @@ "name": "unnamedWire#348", "path": [ { - "x": 485.0, - "y": 290.0 - }, - { - "x": 485.0, + "x": 480.0, "y": 170.0 } ] @@ -6864,6 +6916,75 @@ }, "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#38", + "pinName": "" + }, + "pin2": { + "compName": "Am2900MemoryController#0", + "pinName": "_C" + }, + "name": "unnamedWire#354", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#20", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#42", + "pinName": "" + }, + "name": "unnamedWire#355", + "path": [] } ], "version": "0.1.1" @@ -6953,7 +7074,17 @@ } } }, - "atomicHighLevelStates": {} + "atomicHighLevelStates": { + "mpm_address": { + "id": "wireForcing", + "params": { + "wiresToForce": [ + "unnamedWire#163" + ], + "wiresToForceInverted": [] + } + } + } }, "version": "0.1.5" } \ No newline at end of file