From: Daniel Kirschten Date: Sun, 11 Oct 2020 15:53:36 +0000 (+0200) Subject: Renamed dff4 to dff4_we X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=4f574b3fdb4c4c86a187451e1e0b36fbce85728a Renamed dff4 to dff4_we --- diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index 8415f84c..b42171f6 100644 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -670,8 +670,8 @@ } }, { - "id": "dff4", - "name": "dff4#0", + "id": "dff4_we", + "name": "dff4_we#0", "pos": { "x": 220.0, "y": 930.0 @@ -992,7 +992,7 @@ "pinName": "" }, "pin2": { - "compName": "dff4#0", + "compName": "dff4_we#0", "pinName": "C" }, "name": "unnamedWire#17", @@ -1664,7 +1664,7 @@ }, { "pin1": { - "compName": "dff4#0", + "compName": "dff4_we#0", "pinName": "Q" }, "pin2": { @@ -1680,7 +1680,7 @@ "pinName": "I" }, "pin2": { - "compName": "dff4#0", + "compName": "dff4_we#0", "pinName": "D" }, "name": "unnamedWire#58", @@ -2644,7 +2644,7 @@ "pinName": "QWE" }, "pin2": { - "compName": "dff4#0", + "compName": "dff4_we#0", "pinName": "WE" }, "name": "unnamedWire#123", @@ -3048,7 +3048,7 @@ "qreg": { "id": "delegating", "params": { - "delegateTarget": "dff4#0" + "delegateTarget": "dff4_we#0" } }, "regs": { diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json deleted file mode 100644 index b7b85a9d..00000000 --- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json +++ /dev/null @@ -1,558 +0,0 @@ -{ - "width": 35.0, - "height": 30.0, - "interfacePins": [ - { - "location": { - "x": 0.0, - "y": 25.0 - }, - "name": "C", - "logicWidth": 1, - "usage": "INPUT" - }, - { - "location": { - "x": 0.0, - "y": 15.0 - }, - "name": "D", - "logicWidth": 4, - "usage": "INPUT" - }, - { - "location": { - "x": 35.0, - "y": 15.0 - }, - "name": "Q", - "logicWidth": 4, - "usage": "OUTPUT" - }, - { - "location": { - "x": 0.0, - "y": 5.0 - }, - "name": "WE", - "logicWidth": 1, - "usage": "INPUT" - } - ], - "innerScale": 0.2, - "submodel": { - "components": [ - { - "id": "Splitter", - "name": "Splitter#0", - "pos": { - "x": 155.0, - "y": 60.0 - }, - "params": { - "logicWidth": 4, - "orientation": "LEFT" - } - }, - { - "id": "Splitter", - "name": "Splitter#1", - "pos": { - "x": 70.0, - "y": 25.0 - }, - "params": { - "logicWidth": 4, - "orientation": "RIGHT" - } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 99.0, - "y": 109.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 99.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 99.0, - "y": 84.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#3", - "pos": { - "x": 169.0, - "y": 74.0 - }, - "params": 4 - }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 105.0, - "y": 20.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 105.0, - "y": 45.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 105.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 105.0, - "y": 95.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 15.0, - "y": 20.0 - } - } - ], - "wires": [ - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#0", - "pinName": "C" - }, - "name": "unnamedWire#0", - "path": [ - { - "x": 100.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O3" - }, - "pin2": { - "compName": "dff#0", - "pinName": "D" - }, - "name": "unnamedWire#1", - "path": [] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O2" - }, - "pin2": { - "compName": "dff#1", - "pinName": "D" - }, - "name": "unnamedWire#2", - "path": [ - { - "x": 95.0, - "y": 35.0 - }, - { - "x": 95.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "dff#3", - "pinName": "C" - }, - "name": "unnamedWire#3", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#4", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "dff#1", - "pinName": "C" - }, - "name": "unnamedWire#5", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "dff#2", - "pinName": "C" - }, - "name": "unnamedWire#7", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, - "pin2": { - "compName": "WireCrossPoint#0", - "pinName": "" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 100.0, - "y": 125.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "S0" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "D" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I1" - }, - "name": "unnamedWire#10", - "path": [ - { - "x": 5.0, - "y": 75.0 - }, - { - "x": 5.0, - "y": 70.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "I" - }, - "name": "unnamedWire#11", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Q" - }, - "name": "unnamedWire#12", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "I0" - }, - "name": "unnamedWire#13", - "path": [ - { - "x": 170.0, - "y": 140.0 - }, - { - "x": 10.0, - "y": 140.0 - }, - { - "x": 10.0, - "y": 40.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "D" - }, - "pin2": { - "compName": "Splitter#1", - "pinName": "O1" - }, - "name": "unnamedWire#14", - "path": [ - { - "x": 90.0, - "y": 75.0 - }, - { - "x": 90.0, - "y": 45.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#3", - "pinName": "D" - }, - "name": "unnamedWire#15", - "path": [ - { - "x": 85.0, - "y": 55.0 - }, - { - "x": 85.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "dff#0", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O3" - }, - "name": "unnamedWire#16", - "path": [ - { - "x": 150.0, - "y": 25.0 - }, - { - "x": 150.0, - "y": 60.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O2" - }, - "pin2": { - "compName": "dff#1", - "pinName": "Q" - }, - "name": "unnamedWire#17", - "path": [ - { - "x": 145.0, - "y": 70.0 - }, - { - "x": 145.0, - "y": 50.0 - } - ] - }, - { - "pin1": { - "compName": "dff#2", - "pinName": "Q" - }, - "pin2": { - "compName": "Splitter#0", - "pinName": "O1" - }, - "name": "unnamedWire#18", - "path": [ - { - "x": 145.0, - "y": 75.0 - }, - { - "x": 145.0, - "y": 80.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#0", - "pinName": "O0" - }, - "pin2": { - "compName": "dff#3", - "pinName": "Q" - }, - "name": "unnamedWire#19", - "path": [ - { - "x": 145.0, - "y": 90.0 - }, - { - "x": 145.0, - "y": 100.0 - } - ] - }, - { - "pin1": { - "compName": "Splitter#1", - "pinName": "I" - }, - "pin2": { - "compName": "mux1_4#0", - "pinName": "Y" - }, - "name": "unnamedWire#20", - "path": [] - } - ], - "version": "0.1.1" - }, - "symbolRendererSnippetID": "simpleRectangularLike", - "symbolRendererParams": { - "centerText": "D flip flop\n4 bit", - "centerTextHeight": 5.0, - "horizontalComponentCenter": 17.5, - "pinLabelHeight": 3.5, - "pinLabelMargin": 0.5 - }, - "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "standard", - "highLevelStateHandlerParams": { - "subcomponentHighLevelStates": {}, - "atomicHighLevelStates": { - "q": { - "id": "bitVectorSplitting", - "params": { - "vectorPartTargets": [ - "q4", - "q3", - "q2", - "q1" - ], - "vectorPartLengthes": [ - 1, - 1, - 1, - 1 - ] - } - }, - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#3", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#2", - "subStateID": "q" - } - }, - "q3": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, - "q4": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - } - } - }, - "version": "0.1.5" -} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json new file mode 100644 index 00000000..b7b85a9d --- /dev/null +++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_we.json @@ -0,0 +1,558 @@ +{ + "width": 35.0, + "height": 30.0, + "interfacePins": [ + { + "location": { + "x": 0.0, + "y": 25.0 + }, + "name": "C", + "logicWidth": 1, + "usage": "INPUT" + }, + { + "location": { + "x": 0.0, + "y": 15.0 + }, + "name": "D", + "logicWidth": 4, + "usage": "INPUT" + }, + { + "location": { + "x": 35.0, + "y": 15.0 + }, + "name": "Q", + "logicWidth": 4, + "usage": "OUTPUT" + }, + { + "location": { + "x": 0.0, + "y": 5.0 + }, + "name": "WE", + "logicWidth": 1, + "usage": "INPUT" + } + ], + "innerScale": 0.2, + "submodel": { + "components": [ + { + "id": "Splitter", + "name": "Splitter#0", + "pos": { + "x": 155.0, + "y": 60.0 + }, + "params": { + "logicWidth": 4, + "orientation": "LEFT" + } + }, + { + "id": "Splitter", + "name": "Splitter#1", + "pos": { + "x": 70.0, + "y": 25.0 + }, + "params": { + "logicWidth": 4, + "orientation": "RIGHT" + } + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 99.0, + "y": 109.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 99.0, + "y": 59.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#2", + "pos": { + "x": 99.0, + "y": 84.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#3", + "pos": { + "x": 169.0, + "y": 74.0 + }, + "params": 4 + }, + { + "id": "dff", + "name": "dff#0", + "pos": { + "x": 105.0, + "y": 20.0 + } + }, + { + "id": "dff", + "name": "dff#1", + "pos": { + "x": 105.0, + "y": 45.0 + } + }, + { + "id": "dff", + "name": "dff#2", + "pos": { + "x": 105.0, + "y": 70.0 + } + }, + { + "id": "dff", + "name": "dff#3", + "pos": { + "x": 105.0, + "y": 95.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 15.0, + "y": 20.0 + } + } + ], + "wires": [ + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "dff#0", + "pinName": "C" + }, + "name": "unnamedWire#0", + "path": [ + { + "x": 100.0, + "y": 35.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O3" + }, + "pin2": { + "compName": "dff#0", + "pinName": "D" + }, + "name": "unnamedWire#1", + "path": [] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O2" + }, + "pin2": { + "compName": "dff#1", + "pinName": "D" + }, + "name": "unnamedWire#2", + "path": [ + { + "x": 95.0, + "y": 35.0 + }, + { + "x": 95.0, + "y": 50.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "dff#3", + "pinName": "C" + }, + "name": "unnamedWire#3", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "name": "unnamedWire#4", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "dff#1", + "pinName": "C" + }, + "name": "unnamedWire#5", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#1", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "name": "unnamedWire#6", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#2", + "pinName": "" + }, + "pin2": { + "compName": "dff#2", + "pinName": "C" + }, + "name": "unnamedWire#7", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "C" + }, + "pin2": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "name": "unnamedWire#8", + "path": [ + { + "x": 100.0, + "y": 125.0 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "WE" + }, + "pin2": { + "compName": "mux1_4#0", + "pinName": "S0" + }, + "name": "unnamedWire#9", + "path": [] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "D" + }, + "pin2": { + "compName": "mux1_4#0", + "pinName": "I1" + }, + "name": "unnamedWire#10", + "path": [ + { + "x": 5.0, + "y": 75.0 + }, + { + "x": 5.0, + "y": 70.0 + } + ] + }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "I" + }, + "name": "unnamedWire#11", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Q" + }, + "name": "unnamedWire#12", + "path": [] + }, + { + "pin1": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "pin2": { + "compName": "mux1_4#0", + "pinName": "I0" + }, + "name": "unnamedWire#13", + "path": [ + { + "x": 170.0, + "y": 140.0 + }, + { + "x": 10.0, + "y": 140.0 + }, + { + "x": 10.0, + "y": 40.0 + } + ] + }, + { + "pin1": { + "compName": "dff#2", + "pinName": "D" + }, + "pin2": { + "compName": "Splitter#1", + "pinName": "O1" + }, + "name": "unnamedWire#14", + "path": [ + { + "x": 90.0, + "y": 75.0 + }, + { + "x": 90.0, + "y": 45.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "O0" + }, + "pin2": { + "compName": "dff#3", + "pinName": "D" + }, + "name": "unnamedWire#15", + "path": [ + { + "x": 85.0, + "y": 55.0 + }, + { + "x": 85.0, + "y": 100.0 + } + ] + }, + { + "pin1": { + "compName": "dff#0", + "pinName": "Q" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O3" + }, + "name": "unnamedWire#16", + "path": [ + { + "x": 150.0, + "y": 25.0 + }, + { + "x": 150.0, + "y": 60.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O2" + }, + "pin2": { + "compName": "dff#1", + "pinName": "Q" + }, + "name": "unnamedWire#17", + "path": [ + { + "x": 145.0, + "y": 70.0 + }, + { + "x": 145.0, + "y": 50.0 + } + ] + }, + { + "pin1": { + "compName": "dff#2", + "pinName": "Q" + }, + "pin2": { + "compName": "Splitter#0", + "pinName": "O1" + }, + "name": "unnamedWire#18", + "path": [ + { + "x": 145.0, + "y": 75.0 + }, + { + "x": 145.0, + "y": 80.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#0", + "pinName": "O0" + }, + "pin2": { + "compName": "dff#3", + "pinName": "Q" + }, + "name": "unnamedWire#19", + "path": [ + { + "x": 145.0, + "y": 90.0 + }, + { + "x": 145.0, + "y": 100.0 + } + ] + }, + { + "pin1": { + "compName": "Splitter#1", + "pinName": "I" + }, + "pin2": { + "compName": "mux1_4#0", + "pinName": "Y" + }, + "name": "unnamedWire#20", + "path": [] + } + ], + "version": "0.1.1" + }, + "symbolRendererSnippetID": "simpleRectangularLike", + "symbolRendererParams": { + "centerText": "D flip flop\n4 bit", + "centerTextHeight": 5.0, + "horizontalComponentCenter": 17.5, + "pinLabelHeight": 3.5, + "pinLabelMargin": 0.5 + }, + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", + "highLevelStateHandlerParams": { + "subcomponentHighLevelStates": {}, + "atomicHighLevelStates": { + "q": { + "id": "bitVectorSplitting", + "params": { + "vectorPartTargets": [ + "q4", + "q3", + "q2", + "q1" + ], + "vectorPartLengthes": [ + 1, + 1, + 1, + 1 + ] + } + }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff#3", + "subStateID": "q" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff#2", + "subStateID": "q" + } + }, + "q3": { + "id": "delegating", + "params": { + "delegateTarget": "dff#1", + "subStateID": "q" + } + }, + "q4": { + "id": "delegating", + "params": { + "delegateTarget": "dff#0", + "subStateID": "q" + } + } + } + }, + "version": "0.1.5" +} \ No newline at end of file diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json index c680e3cb..e9643ddb 100644 --- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json +++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json @@ -30,8 +30,8 @@ "dec12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dec12.json", "demux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/demux2.json", "dff": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff.json", - "dff4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4.json", "dff4_finewe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4_finewe.json", + "dff4_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4_we.json", "dff12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff12.json", "dff12_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff12_we.json", "dff16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16.json",