From 86d2109a7a413614ed4aaf9663632cea04018001 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 28 Aug 2019 10:24:31 +0200 Subject: [PATCH] Added new GUIAm2904.json to editor's component folder --- .../components/am2904/GUIAm2904.json | 298 +++++++++++++++++- 1 file changed, 291 insertions(+), 7 deletions(-) diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json index 33bdddab..a1959d98 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json @@ -1,7 +1,7 @@ mograsim version: 0.1.3 { "width": 120.0, - "height": 94.0, + "height": 139.0, "interfacePins": [ { "location": { @@ -69,8 +69,8 @@ mograsim version: 0.1.3 }, { "location": { - "x": -24.6, - "y": 24.400000000000002 + "x": 120.0, + "y": 108.0 }, "name": "C0", "logicWidth": 1 @@ -93,8 +93,8 @@ mograsim version: 0.1.3 }, { "location": { - "x": -14.600000000000001, - "y": 14.4 + "x": 0.0, + "y": 110.0 }, "name": "Cx", "logicWidth": 1 @@ -267,6 +267,15 @@ mograsim version: 0.1.3 }, "params": 4 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#17", + "pos": { + "x": 360.0, + "y": 495.0 + }, + "params": 1 + }, { "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#1", @@ -444,6 +453,15 @@ mograsim version: 0.1.3 "y": 40.0 } }, + { + "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "name": "GUIMerger#4", + "pos": { + "x": 25.0, + "y": 355.0 + }, + "params": 2 + }, { "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", "name": "GUIMerger#3", @@ -512,6 +530,38 @@ mograsim version: 0.1.3 "y": 295.0 } }, + { + "id": "GUImux1", + "name": "DeserializedSubmodelComponent#14", + "pos": { + "x": 415.0, + "y": 465.0 + } + }, + { + "id": "GUImux1", + "name": "DeserializedSubmodelComponent#13", + "pos": { + "x": 365.0, + "y": 485.0 + } + }, + { + "id": "GUIxor", + "name": "DeserializedSubmodelComponent#12", + "pos": { + "x": 315.0, + "y": 505.0 + } + }, + { + "id": "GUImux1", + "name": "DeserializedSubmodelComponent#11", + "pos": { + "x": 265.0, + "y": 515.0 + } + }, { "id": "GUIxor", "name": "DeserializedSubmodelComponent#10", @@ -619,6 +669,15 @@ mograsim version: 0.1.3 }, "params": 1 }, + { + "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "name": "GUISplitter#9", + "pos": { + "x": 240.0, + "y": 475.0 + }, + "params": 4 + }, { "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", "name": "GUISplitter#4", @@ -705,9 +764,18 @@ mograsim version: 0.1.3 "name": "GUIAm2904RegCTInstrDecode#0", "pos": { "x": 50.0, - "y": 230.0 + "y": 240.0 } }, + { + "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "name": "GUISplitter#10", + "pos": { + "x": 445.0, + "y": 410.0 + }, + "params": 4 + }, { "id": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904ShiftInstrDecode", "name": "GUIAm2904ShiftInstrDecode#0", @@ -1274,7 +1342,7 @@ mograsim version: 0.1.3 }, "pin2": { "compName": "GUIAm2904RegCTInstrDecode#0", - "pinName": "I" + "pinName": "I5-0" }, "name": "unnamedWire#15", "path": [] @@ -1534,6 +1602,78 @@ mograsim version: 0.1.3 "name": "unnamedWire#79", "path": [] }, + { + "pin1": { + "compName": "WireCrossPoint#17", + "pinName": "" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#13", + "pinName": "S0" + }, + "name": "unnamedWire#150", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#12", + "pinName": "Y" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#13", + "pinName": "I1" + }, + "name": "unnamedWire#151", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#14", + "pinName": "I0" + }, + "pin2": { + "compName": "WireCrossPoint#17", + "pinName": "" + }, + "name": "unnamedWire#154", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#14", + "pinName": "S0" + }, + "pin2": { + "compName": "GUISplitter#9", + "pinName": "O3" + }, + "name": "unnamedWire#155", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#13", + "pinName": "I0" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "Cx" + }, + "name": "unnamedWire#152", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#13", + "pinName": "Y" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#14", + "pinName": "I1" + }, + "name": "unnamedWire#153", + "path": [] + }, { "pin1": { "compName": "GUINandGate#10", @@ -1546,6 +1686,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#81", "path": [] }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#14", + "pinName": "Y" + }, + "pin2": { + "compName": "_submodelinterface", + "pinName": "C0" + }, + "name": "unnamedWire#156", + "path": [] + }, { "pin1": { "compName": "WireCrossPoint#13", @@ -1654,6 +1806,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#88", "path": [] }, + { + "pin1": { + "compName": "GUIMerger#4", + "pinName": "I1" + }, + "pin2": { + "compName": "GUISplitter#0", + "pinName": "O12" + }, + "name": "unnamedWire#140", + "path": [] + }, { "pin1": { "compName": "GUIMerger#0", @@ -1666,6 +1830,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#9", "path": [] }, + { + "pin1": { + "compName": "GUISplitter#8", + "pinName": "O1" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#11", + "pinName": "I1" + }, + "name": "unnamedWire#143", + "path": [] + }, { "pin1": { "compName": "GUISplitter#0", @@ -1678,6 +1854,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#8", "path": [] }, + { + "pin1": { + "compName": "GUISplitter#10", + "pinName": "I" + }, + "pin2": { + "compName": "WireCrossPoint#3", + "pinName": "" + }, + "name": "unnamedWire#144", + "path": [] + }, { "pin1": { "compName": "GUIMerger#0", @@ -1690,6 +1878,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#7", "path": [] }, + { + "pin1": { + "compName": "GUIMerger#4", + "pinName": "O" + }, + "pin2": { + "compName": "GUIAm2904RegCTInstrDecode#0", + "pinName": "I12-11" + }, + "name": "unnamedWire#141", + "path": [] + }, { "pin1": { "compName": "GUISplitter#0", @@ -1702,6 +1902,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#6", "path": [] }, + { + "pin1": { + "compName": "GUIAm2904RegCTInstrDecode#0", + "pinName": "C0_MUX" + }, + "pin2": { + "compName": "GUISplitter#9", + "pinName": "I" + }, + "name": "unnamedWire#142", + "path": [] + }, { "pin1": { "compName": "GUIMerger#3", @@ -1714,6 +1926,30 @@ mograsim version: 0.1.3 "name": "unnamedWire#90", "path": [] }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#11", + "pinName": "Y" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#12", + "pinName": "B" + }, + "name": "unnamedWire#147", + "path": [] + }, + { + "pin1": { + "compName": "DeserializedSubmodelComponent#12", + "pinName": "A" + }, + "pin2": { + "compName": "GUISplitter#9", + "pinName": "O0" + }, + "name": "unnamedWire#148", + "path": [] + }, { "pin1": { "compName": "GUIMerger#3", @@ -1726,6 +1962,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#92", "path": [] }, + { + "pin1": { + "compName": "GUISplitter#10", + "pinName": "O1" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#11", + "pinName": "I0" + }, + "name": "unnamedWire#145", + "path": [] + }, { "pin1": { "compName": "DeserializedSubmodelComponent#3", @@ -1738,6 +1986,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#91", "path": [] }, + { + "pin1": { + "compName": "GUISplitter#9", + "pinName": "O1" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#11", + "pinName": "S0" + }, + "name": "unnamedWire#146", + "path": [] + }, { "pin1": { "compName": "GUIAm2904RegCTInstrDecode#0", @@ -1807,6 +2067,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#96", "path": [] }, + { + "pin1": { + "compName": "GUISplitter#9", + "pinName": "O2" + }, + "pin2": { + "compName": "WireCrossPoint#17", + "pinName": "" + }, + "name": "unnamedWire#149", + "path": [] + }, { "pin1": { "compName": "GUISplitter#2", @@ -2131,6 +2403,18 @@ mograsim version: 0.1.3 "name": "unnamedWire#62", "path": [] }, + { + "pin1": { + "compName": "GUISplitter#0", + "pinName": "O11" + }, + "pin2": { + "compName": "GUIMerger#4", + "pinName": "I0" + }, + "name": "unnamedWire#139", + "path": [] + }, { "pin1": { "compName": "WireCrossPoint#12", -- 2.17.1