X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fdff12_we.json;h=188770f4becf91fb28808b18039bcfd2aa51d9b4;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=20f06642aa5cc1626993ade39855bbec009d8634;hpb=e5460cbb1f4ae06479a92d4ab483b08e8e01e4a6;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json index 20f06642..188770f4 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json @@ -1,6 +1,6 @@ { "width": 55.0, - "height": 40.0, + "height": 45.0, "interfacePins": [ { "location": { @@ -42,39 +42,36 @@ "innerScale": 0.2, "submodel": { "components": [ - { - "id": "Merger", - "name": "Merger#0", - "pos": { - "x": 250.0, - "y": 45.0 - }, - "params": 12 - }, { "id": "Splitter", "name": "Splitter#0", "pos": { "x": 70.0, - "y": 65.0 + "y": 45.0 }, - "params": 12 + "params": { + "logicWidth": 12, + "orientation": "RIGHT" + } }, { - "id": "TextComponent", - "name": "TextComponent#0", + "id": "Splitter", + "name": "Splitter#1", "pos": { - "x": -35.0, - "y": -5.0 + "x": 255.0, + "y": 45.0 }, - "params": "a" + "params": { + "logicWidth": 12, + "orientation": "LEFT" + } }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 124.0, - "y": 14.0 + "y": 24.0 }, "params": 1 }, @@ -83,7 +80,7 @@ "name": "WireCrossPoint#1", "pos": { "x": 124.0, - "y": 44.0 + "y": 54.0 }, "params": 1 }, @@ -91,8 +88,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 169.0, - "y": 114.0 + "x": 179.0, + "y": 134.0 }, "params": 1 }, @@ -101,7 +98,7 @@ "name": "WireCrossPoint#2", "pos": { "x": 124.0, - "y": 104.0 + "y": 114.0 }, "params": 1 }, @@ -110,7 +107,7 @@ "name": "WireCrossPoint#3", "pos": { "x": 124.0, - "y": 134.0 + "y": 144.0 }, "params": 1 }, @@ -119,7 +116,7 @@ "name": "WireCrossPoint#4", "pos": { "x": 124.0, - "y": 74.0 + "y": 84.0 }, "params": 1 }, @@ -127,7 +124,7 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 264.0, + "x": 269.0, "y": 99.0 }, "params": 12 @@ -136,8 +133,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 169.0, - "y": 54.0 + "x": 179.0, + "y": 74.0 }, "params": 1 }, @@ -145,8 +142,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 169.0, - "y": 144.0 + "x": 179.0, + "y": 164.0 }, "params": 1 }, @@ -154,8 +151,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 169.0, - "y": 24.0 + "x": 179.0, + "y": 44.0 }, "params": 1 }, @@ -163,8 +160,8 @@ "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 169.0, - "y": 84.0 + "x": 179.0, + "y": 104.0 }, "params": 1 }, @@ -172,24 +169,24 @@ "id": "dff", "name": "dff#0", "pos": { - "x": 175.0, - "y": 20.0 + "x": 185.0, + "y": 30.0 } }, { "id": "dff", "name": "dff#1", "pos": { - "x": 175.0, - "y": 50.0 + "x": 185.0, + "y": 60.0 } }, { "id": "dff", "name": "dff#10", "pos": { - "x": 175.0, - "y": 110.0 + "x": 185.0, + "y": 120.0 } }, { @@ -228,16 +225,16 @@ "id": "dff", "name": "dff#5", "pos": { - "x": 175.0, - "y": 140.0 + "x": 185.0, + "y": 150.0 } }, { "id": "dff", "name": "dff#6", "pos": { - "x": 175.0, - "y": 170.0 + "x": 185.0, + "y": 180.0 } }, { @@ -260,8 +257,8 @@ "id": "dff", "name": "dff#9", "pos": { - "x": 175.0, - "y": 80.0 + "x": 185.0, + "y": 90.0 } }, { @@ -269,7 +266,7 @@ "name": "mux1_12#0", "pos": { "x": 15.0, - "y": 90.0 + "y": 70.0 } } ], @@ -290,7 +287,7 @@ "y": 5.0 }, { - "x": 170.0, + "x": 180.0, "y": 5.0 } ] @@ -305,16 +302,7 @@ "pinName": "C" }, "name": "unnamedWire#1", - "path": [ - { - "x": 55.0, - "y": 15.0 - }, - { - "x": 55.0, - "y": 25.0 - } - ] + "path": [] }, { "pin1": { @@ -326,16 +314,7 @@ "pinName": "O5" }, "name": "unnamedWire#10", - "path": [ - { - "x": 115.0, - "y": 115.0 - }, - { - "x": 115.0, - "y": 125.0 - } - ] + "path": [] }, { "pin1": { @@ -349,11 +328,11 @@ "name": "unnamedWire#11", "path": [ { - "x": 120.0, - "y": 135.0 + "x": 115.0, + "y": 115.0 }, { - "x": 120.0, + "x": 115.0, "y": 125.0 } ] @@ -368,7 +347,16 @@ "pinName": "O3" }, "name": "unnamedWire#12", - "path": [] + "path": [ + { + "x": 110.0, + "y": 135.0 + }, + { + "x": 110.0, + "y": 125.0 + } + ] }, { "pin1": { @@ -380,7 +368,16 @@ "pinName": "D" }, "name": "unnamedWire#13", - "path": [] + "path": [ + { + "x": 105.0, + "y": 135.0 + }, + { + "x": 105.0, + "y": 155.0 + } + ] }, { "pin1": { @@ -394,12 +391,12 @@ "name": "unnamedWire#14", "path": [ { - "x": 90.0, - "y": 175.0 + "x": 100.0, + "y": 165.0 }, { - "x": 90.0, - "y": 165.0 + "x": 100.0, + "y": 145.0 } ] }, @@ -415,11 +412,11 @@ "name": "unnamedWire#15", "path": [ { - "x": 85.0, - "y": 175.0 + "x": 95.0, + "y": 155.0 }, { - "x": 85.0, + "x": 95.0, "y": 185.0 } ] @@ -436,12 +433,12 @@ "name": "unnamedWire#16", "path": [ { - "x": 10.0, + "x": 5.0, "y": 100.0 }, { - "x": 10.0, - "y": 95.0 + "x": 5.0, + "y": 75.0 } ] }, @@ -462,7 +459,7 @@ }, { "x": 5.0, - "y": 150.0 + "y": 130.0 } ] }, @@ -599,15 +596,15 @@ "path": [ { "x": 10.0, - "y": 110.0 + "y": 90.0 }, { "x": 10.0, - "y": 195.0 + "y": 205.0 }, { - "x": 265.0, - "y": 195.0 + "x": 270.0, + "y": 205.0 } ] }, @@ -624,7 +621,7 @@ "path": [ { "x": 125.0, - "y": 165.0 + "y": 175.0 } ] }, @@ -640,8 +637,8 @@ "name": "unnamedWire#31", "path": [ { - "x": 170.0, - "y": 175.0 + "x": 180.0, + "y": 195.0 } ] }, @@ -754,11 +751,11 @@ "path": [ { "x": 85.0, - "y": 65.0 + "y": 45.0 }, { "x": 85.0, - "y": 25.0 + "y": 15.0 } ] }, @@ -791,14 +788,14 @@ }, { "x": 90.0, - "y": 75.0 + "y": 55.0 } ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I11" + "compName": "Splitter#1", + "pinName": "O11" }, "pin2": { "compName": "dff#2", @@ -807,11 +804,19 @@ "name": "unnamedWire#53", "path": [ { - "x": 245.0, + "x": 250.0, "y": 45.0 }, { - "x": 245.0, + "x": 250.0, + "y": 25.0 + }, + { + "x": 170.0, + "y": 25.0 + }, + { + "x": 170.0, "y": 15.0 } ] @@ -822,25 +827,25 @@ "pinName": "Q" }, "pin2": { - "compName": "Merger#0", - "pinName": "I10" + "compName": "Splitter#1", + "pinName": "O10" }, "name": "unnamedWire#54", "path": [ { - "x": 235.0, - "y": 25.0 + "x": 240.0, + "y": 35.0 }, { - "x": 235.0, + "x": 240.0, "y": 55.0 } ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I9" + "compName": "Splitter#1", + "pinName": "O9" }, "pin2": { "compName": "dff#3", @@ -849,11 +854,19 @@ "name": "unnamedWire#55", "path": [ { - "x": 230.0, + "x": 235.0, "y": 65.0 }, { - "x": 230.0, + "x": 235.0, + "y": 55.0 + }, + { + "x": 170.0, + "y": 55.0 + }, + { + "x": 170.0, "y": 45.0 } ] @@ -864,25 +877,25 @@ "pinName": "Q" }, "pin2": { - "compName": "Merger#0", - "pinName": "I8" + "compName": "Splitter#1", + "pinName": "O8" }, "name": "unnamedWire#56", "path": [ { - "x": 225.0, - "y": 55.0 + "x": 230.0, + "y": 65.0 }, { - "x": 225.0, + "x": 230.0, "y": 75.0 } ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I7" + "compName": "Splitter#1", + "pinName": "O7" }, "pin2": { "compName": "dff#4", @@ -891,11 +904,11 @@ "name": "unnamedWire#57", "path": [ { - "x": 220.0, + "x": 170.0, "y": 85.0 }, { - "x": 220.0, + "x": 170.0, "y": 75.0 } ] @@ -906,32 +919,40 @@ "pinName": "Q" }, "pin2": { - "compName": "Merger#0", - "pinName": "I6" + "compName": "Splitter#1", + "pinName": "O6" }, "name": "unnamedWire#58", - "path": [ - { - "x": 215.0, - "y": 85.0 - }, - { - "x": 215.0, - "y": 95.0 - } - ] + "path": [] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I5" + "compName": "Splitter#1", + "pinName": "O5" }, "pin2": { "compName": "dff#11", "pinName": "Q" }, "name": "unnamedWire#59", - "path": [] + "path": [ + { + "x": 225.0, + "y": 105.0 + }, + { + "x": 225.0, + "y": 115.0 + }, + { + "x": 170.0, + "y": 115.0 + }, + { + "x": 170.0, + "y": 105.0 + } + ] }, { "pin1": { @@ -946,30 +967,39 @@ "path": [ { "x": 95.0, - "y": 55.0 + "y": 45.0 }, { "x": 95.0, - "y": 85.0 + "y": 65.0 } ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I4" + "compName": "Splitter#1", + "pinName": "O4" }, "pin2": { "compName": "dff#10", "pinName": "Q" }, "name": "unnamedWire#60", - "path": [] + "path": [ + { + "x": 230.0, + "y": 115.0 + }, + { + "x": 230.0, + "y": 125.0 + } + ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I3" + "compName": "Splitter#1", + "pinName": "O3" }, "pin2": { "compName": "dff#8", @@ -978,11 +1008,19 @@ "name": "unnamedWire#61", "path": [ { - "x": 215.0, + "x": 235.0, "y": 125.0 }, { - "x": 215.0, + "x": 235.0, + "y": 145.0 + }, + { + "x": 170.0, + "y": 145.0 + }, + { + "x": 170.0, "y": 135.0 } ] @@ -993,25 +1031,25 @@ "pinName": "Q" }, "pin2": { - "compName": "Merger#0", - "pinName": "I2" + "compName": "Splitter#1", + "pinName": "O2" }, "name": "unnamedWire#62", "path": [ { - "x": 220.0, - "y": 145.0 + "x": 240.0, + "y": 155.0 }, { - "x": 220.0, + "x": 240.0, "y": 135.0 } ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "I1" + "compName": "Splitter#1", + "pinName": "O1" }, "pin2": { "compName": "dff#7", @@ -1020,11 +1058,19 @@ "name": "unnamedWire#63", "path": [ { - "x": 225.0, + "x": 245.0, "y": 145.0 }, { - "x": 225.0, + "x": 245.0, + "y": 175.0 + }, + { + "x": 170.0, + "y": 175.0 + }, + { + "x": 170.0, "y": 165.0 } ] @@ -1035,25 +1081,25 @@ "pinName": "Q" }, "pin2": { - "compName": "Merger#0", - "pinName": "I0" + "compName": "Splitter#1", + "pinName": "O0" }, "name": "unnamedWire#64", "path": [ { - "x": 230.0, - "y": 175.0 + "x": 250.0, + "y": 185.0 }, { - "x": 230.0, + "x": 250.0, "y": 155.0 } ] }, { "pin1": { - "compName": "Merger#0", - "pinName": "O" + "compName": "Splitter#1", + "pinName": "I" }, "pin2": { "compName": "WireCrossPoint#5", @@ -1087,7 +1133,7 @@ "path": [ { "x": 100.0, - "y": 95.0 + "y": 75.0 }, { "x": 100.0, @@ -1108,11 +1154,11 @@ "path": [ { "x": 105.0, - "y": 85.0 + "y": 75.0 }, { "x": 105.0, - "y": 105.0 + "y": 85.0 } ] }, @@ -1126,16 +1172,7 @@ "pinName": "D" }, "name": "unnamedWire#9", - "path": [ - { - "x": 110.0, - "y": 115.0 - }, - { - "x": 110.0, - "y": 95.0 - } - ] + "path": [] } ], "version": "0.1.1" @@ -1149,6 +1186,128 @@ "pinLabelMargin": 0.5 }, "outlineRendererSnippetID": "default", - "highLevelStateHandlerSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", + "highLevelStateHandlerParams": { + "subcomponentHighLevelStates": {}, + "atomicHighLevelStates": { + "q": { + "id": "bitVectorSplitting", + "params": { + "vectorPartTargets": [ + "q12", + "q11", + "q10", + "q9", + "q8", + "q7", + "q6", + "q5", + "q4", + "q3", + "q2", + "q1" + ], + "vectorPartLengthes": [ + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1 + ] + } + }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff#6", + "subStateID": "q" + } + }, + "q10": { + "id": "delegating", + "params": { + "delegateTarget": "dff#3", + "subStateID": "q" + } + }, + "q11": { + "id": "delegating", + "params": { + "delegateTarget": "dff#0", + "subStateID": "q" + } + }, + "q12": { + "id": "delegating", + "params": { + "delegateTarget": "dff#2", + "subStateID": "q" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff#7", + "subStateID": "q" + } + }, + "q3": { + "id": "delegating", + "params": { + "delegateTarget": "dff#5", + "subStateID": "q" + } + }, + "q4": { + "id": "delegating", + "params": { + "delegateTarget": "dff#8", + "subStateID": "q" + } + }, + "q5": { + "id": "delegating", + "params": { + "delegateTarget": "dff#10", + "subStateID": "q" + } + }, + "q6": { + "id": "delegating", + "params": { + "delegateTarget": "dff#11", + "subStateID": "q" + } + }, + "q7": { + "id": "delegating", + "params": { + "delegateTarget": "dff#9", + "subStateID": "q" + } + }, + "q8": { + "id": "delegating", + "params": { + "delegateTarget": "dff#4", + "subStateID": "q" + } + }, + "q9": { + "id": "delegating", + "params": { + "delegateTarget": "dff#1", + "subStateID": "q" + } + } + } + }, "version": "0.1.5" } \ No newline at end of file