From 71b9365427f28f4bb489c12b768e26db5492f8f1 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Fri, 6 Sep 2019 00:05:30 +0200 Subject: [PATCH] Reserialized JSONs (changed component order due to new IDs) --- .../Am2904Testbench.json | 192 +++++++------- .../logic/model/am2900/components/Am2900.json | 40 +-- .../am2900/components/am2901/Am2901.json | 144 +++++------ .../am2901/Am2901ALUFuncDecode.json | 32 +-- .../am2901/Am2901ALUInclDecode.json | 16 +- ...ALUInclSourceDecodeInclFunctionDecode.json | 32 +-- .../components/am2901/Am2901ALUOneBit.json | 36 +-- .../am2900/components/am2904/Am2904.json | 104 ++++---- .../am2900/components/am2904/Am2904MSR.json | 16 +- .../am2900/components/am2904/Am2904muSR.json | 16 +- .../am2900/components/am2910/Am2910.json | 80 +++--- .../logic/model/am2900/components/and41.json | 54 ++-- .../logic/model/am2900/components/demux2.json | 64 ++--- .../logic/model/am2900/components/dff.json | 48 ++-- .../model/am2900/components/dff16_invwe.json | 2 +- .../logic/model/am2900/components/dff4.json | 64 ++--- .../model/am2900/components/dff4_invwe.json | 64 ++--- .../logic/model/am2900/components/dlatch.json | 16 +- .../model/am2900/components/dlatch4.json | 54 ++-- .../logic/model/am2900/components/mux1_4.json | 54 ++-- .../logic/model/am2900/components/ram2.json | 240 +++++++++--------- .../logic/model/am2900/components/ram4.json | 240 +++++++++--------- .../logic/model/am2900/components/sel3_4.json | 32 +-- 23 files changed, 820 insertions(+), 820 deletions(-) diff --git a/net.mograsim.logic.model.am2900/Am2904Testbench.json b/net.mograsim.logic.model.am2900/Am2904Testbench.json index 2146f401..4875d9c5 100644 --- a/net.mograsim.logic.model.am2900/Am2904Testbench.json +++ b/net.mograsim.logic.model.am2900/Am2904Testbench.json @@ -463,102 +463,6 @@ }, "params": 13 }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#0", - "pos": { - "x": 175.0, - "y": 315.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#1", - "pos": { - "x": 175.0, - "y": 330.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#2", - "pos": { - "x": 175.0, - "y": 385.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#3", - "pos": { - "x": 175.0, - "y": 370.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#4", - "pos": { - "x": 335.0, - "y": 105.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#5", - "pos": { - "x": 335.0, - "y": 90.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#6", - "pos": { - "x": 335.0, - "y": 120.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, - { - "id": "TriStateBuffer", - "name": "TriStateBuffer#7", - "pos": { - "x": 335.0, - "y": 135.0 - }, - "params": { - "logicWidth": 1, - "orientation": "RIGHT" - } - }, { "id": "TextComponent", "name": "TextComponent#0", @@ -1000,6 +904,102 @@ }, "params": "_EOVR" }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#0", + "pos": { + "x": 175.0, + "y": 315.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#1", + "pos": { + "x": 175.0, + "y": 330.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#2", + "pos": { + "x": 175.0, + "y": 385.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#3", + "pos": { + "x": 175.0, + "y": 370.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#4", + "pos": { + "x": 335.0, + "y": 105.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#5", + "pos": { + "x": 335.0, + "y": 90.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#6", + "pos": { + "x": 335.0, + "y": 120.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, + { + "id": "TriStateBuffer", + "name": "TriStateBuffer#7", + "pos": { + "x": 335.0, + "y": 135.0 + }, + "params": { + "logicWidth": 1, + "orientation": "RIGHT" + } + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index f52b2d39..8b6e7fbe 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -5,6 +5,18 @@ "innerScale": 0.4, "submodel": { "components": [ + { + "id": "Clock", + "name": "Clock#0", + "pos": { + "x": 155.0, + "y": 246.0 + }, + "params": { + "delta": 1000, + "orientation": "DOWN" + } + }, { "id": "Am2901", "name": "DeserializedSubmodelComponent#0", @@ -117,18 +129,6 @@ "y": 106.0 } }, - { - "id": "Clock", - "name": "Clock#0", - "pos": { - "x": 155.0, - "y": 246.0 - }, - "params": { - "delta": 1000, - "orientation": "DOWN" - } - }, { "id": "FixedOutput", "name": "FixedOutput#0", @@ -382,14 +382,6 @@ }, "params": 4 }, - { - "id": "inc12", - "name": "inc12#0", - "pos": { - "x": 245.0, - "y": 525.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -524,6 +516,14 @@ "y": 225.0 }, "params": 4 + }, + { + "id": "inc12", + "name": "inc12#0", + "pos": { + "x": 245.0, + "y": 525.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index 70fbac01..e3e7243b 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -403,78 +403,6 @@ "orientation": "RIGHT_ALT" } }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 190.0, - "y": 65.0 - } - }, - { - "id": "dff4", - "name": "dff4#0", - "pos": { - "x": 90.0, - "y": 2490.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#0", - "pos": { - "x": 160.0, - "y": 2220.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#1", - "pos": { - "x": 160.0, - "y": 2275.0 - } - }, - { - "id": "mux1_4", - "name": "mux1_4#0", - "pos": { - "x": 275.0, - "y": 135.0 - } - }, - { - "id": "or4", - "name": "or4#0", - "pos": { - "x": 275.0, - "y": 445.0 - } - }, - { - "id": "ram4", - "name": "ram4#0", - "pos": { - "x": 95.0, - "y": 2220.0 - } - }, - { - "id": "sel3_4", - "name": "sel3_4#0", - "pos": { - "x": 45.0, - "y": 2310.0 - } - }, - { - "id": "sel3_4", - "name": "sel3_4#1", - "pos": { - "x": 45.0, - "y": 2510.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -906,6 +834,78 @@ "y": 2244.0 }, "params": 1 + }, + { + "id": "and", + "name": "and#0", + "pos": { + "x": 190.0, + "y": 65.0 + } + }, + { + "id": "dff4", + "name": "dff4#0", + "pos": { + "x": 90.0, + "y": 2490.0 + } + }, + { + "id": "dlatch4", + "name": "dlatch4#0", + "pos": { + "x": 160.0, + "y": 2220.0 + } + }, + { + "id": "dlatch4", + "name": "dlatch4#1", + "pos": { + "x": 160.0, + "y": 2275.0 + } + }, + { + "id": "mux1_4", + "name": "mux1_4#0", + "pos": { + "x": 275.0, + "y": 135.0 + } + }, + { + "id": "or4", + "name": "or4#0", + "pos": { + "x": 275.0, + "y": 445.0 + } + }, + { + "id": "ram4", + "name": "ram4#0", + "pos": { + "x": 95.0, + "y": 2220.0 + } + }, + { + "id": "sel3_4", + "name": "sel3_4#0", + "pos": { + "x": 45.0, + "y": 2310.0 + } + }, + { + "id": "sel3_4", + "name": "sel3_4#1", + "pos": { + "x": 45.0, + "y": 2510.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json index ff3e377c..90f0ad95 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json @@ -132,22 +132,6 @@ }, "params": 1 }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 100.0, - "y": 135.0 - } - }, - { - "id": "nand3", - "name": "nand3#0", - "pos": { - "x": 55.0, - "y": 10.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -246,6 +230,22 @@ "y": 19.0 }, "params": 1 + }, + { + "id": "and", + "name": "and#0", + "pos": { + "x": 100.0, + "y": 135.0 + } + }, + { + "id": "nand3", + "name": "nand3#0", + "pos": { + "x": 55.0, + "y": 10.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json index 314cfc23..9652a6d6 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json @@ -208,14 +208,6 @@ "y": 380.0 } }, - { - "id": "xor", - "name": "xor#0", - "pos": { - "x": 95.0, - "y": 400.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -395,6 +387,14 @@ "y": 144.0 }, "params": 1 + }, + { + "id": "xor", + "name": "xor#0", + "pos": { + "x": 95.0, + "y": 400.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json index 49a4cc6c..a0bdd786 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json @@ -283,22 +283,6 @@ "y": 165.0 } }, - { - "id": "sel2_4", - "name": "sel2_4#0", - "pos": { - "x": 45.0, - "y": 365.0 - } - }, - { - "id": "sel3_4", - "name": "sel3_4#0", - "pos": { - "x": 45.0, - "y": 575.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -334,6 +318,22 @@ "y": 579.0 }, "params": 1 + }, + { + "id": "sel2_4", + "name": "sel2_4#0", + "pos": { + "x": 45.0, + "y": 365.0 + } + }, + { + "id": "sel3_4", + "name": "sel3_4#0", + "pos": { + "x": 45.0, + "y": 575.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json index 65ae6bef..31cf8af2 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json @@ -114,6 +114,24 @@ }, "params": 1 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 49.0, + "y": 59.0 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 54.0, + "y": 69.0 + }, + "params": 1 + }, { "id": "and", "name": "and#0", @@ -169,24 +187,6 @@ "x": 135.0, "y": 70.0 } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 49.0, - "y": 59.0 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 54.0, - "y": 69.0 - }, - "params": 1 } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json index d32bca28..64a84788 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json @@ -240,6 +240,58 @@ "innerScale": 0.2, "submodel": { "components": [ + { + "id": "Am2904RegCTInstrDecode", + "name": "Am2904RegCTInstrDecode#0", + "pos": { + "x": 50.0, + "y": 240.0 + } + }, + { + "id": "Am2904ShiftInstrDecode", + "name": "Am2904ShiftInstrDecode#0", + "pos": { + "x": 50.0, + "y": 360.0 + } + }, + { + "id": "BitDisplay", + "name": "BitDisplay#0", + "pos": { + "x": 530.0, + "y": 70.0 + }, + "params": 4 + }, + { + "id": "BitDisplay", + "name": "BitDisplay#1", + "pos": { + "x": 565.0, + "y": 180.0 + }, + "params": 4 + }, + { + "id": "BitDisplay", + "name": "BitDisplay#2", + "pos": { + "x": 530.0, + "y": 200.0 + }, + "params": 4 + }, + { + "id": "BitDisplay", + "name": "BitDisplay#3", + "pos": { + "x": 560.0, + "y": 150.0 + }, + "params": 1 + }, { "id": "Am2904MSR", "name": "DeserializedSubmodelComponent#0", @@ -416,58 +468,6 @@ "y": 310.0 } }, - { - "id": "Am2904RegCTInstrDecode", - "name": "Am2904RegCTInstrDecode#0", - "pos": { - "x": 50.0, - "y": 240.0 - } - }, - { - "id": "Am2904ShiftInstrDecode", - "name": "Am2904ShiftInstrDecode#0", - "pos": { - "x": 50.0, - "y": 360.0 - } - }, - { - "id": "BitDisplay", - "name": "BitDisplay#0", - "pos": { - "x": 530.0, - "y": 70.0 - }, - "params": 4 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#1", - "pos": { - "x": 565.0, - "y": 180.0 - }, - "params": 4 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#2", - "pos": { - "x": 530.0, - "y": 200.0 - }, - "params": 4 - }, - { - "id": "BitDisplay", - "name": "BitDisplay#3", - "pos": { - "x": 560.0, - "y": 150.0 - }, - "params": 1 - }, { "id": "Merger", "name": "Merger#0", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index 5d492b49..eff06115 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -240,14 +240,6 @@ }, "params": 4 }, - { - "id": "dff4_finewe", - "name": "dff4_finewe#0", - "pos": { - "x": 375.0, - "y": 170.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -400,6 +392,14 @@ "y": 114.0 }, "params": 1 + }, + { + "id": "dff4_finewe", + "name": "dff4_finewe#0", + "pos": { + "x": 375.0, + "y": 170.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index 79106b07..a1991009 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -192,14 +192,6 @@ }, "params": 2 }, - { - "id": "dff4_finewe", - "name": "dff4_finewe#0", - "pos": { - "x": 375.0, - "y": 170.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -244,6 +236,14 @@ "y": 244.0 }, "params": 1 + }, + { + "id": "dff4_finewe", + "name": "dff4_finewe#0", + "pos": { + "x": 375.0, + "y": 170.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json index b0d1cfd2..2a91d76d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json @@ -240,46 +240,6 @@ "orientation": "DOWN" } }, - { - "id": "dff12", - "name": "dff12#0", - "pos": { - "x": 305.0, - "y": 160.0 - } - }, - { - "id": "inc12", - "name": "inc12#0", - "pos": { - "x": 305.0, - "y": 190.0 - } - }, - { - "id": "nor12", - "name": "nor12#0", - "pos": { - "x": 190.0, - "y": 80.0 - } - }, - { - "id": "ram5_12", - "name": "ram5_12#0", - "pos": { - "x": 305.0, - "y": 100.0 - } - }, - { - "id": "sel4_12", - "name": "sel4_12#0", - "pos": { - "x": 150.0, - "y": 175.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -378,6 +338,46 @@ "y": 114.0 }, "params": 1 + }, + { + "id": "dff12", + "name": "dff12#0", + "pos": { + "x": 305.0, + "y": 160.0 + } + }, + { + "id": "inc12", + "name": "inc12#0", + "pos": { + "x": 305.0, + "y": 190.0 + } + }, + { + "id": "nor12", + "name": "nor12#0", + "pos": { + "x": 190.0, + "y": 80.0 + } + }, + { + "id": "ram5_12", + "name": "ram5_12#0", + "pos": { + "x": 305.0, + "y": 100.0 + } + }, + { + "id": "sel4_12", + "name": "sel4_12#0", + "pos": { + "x": 150.0, + "y": 175.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json index 0c89805a..b8c98863 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json @@ -87,6 +87,33 @@ "innerScale": 0.4, "submodel": { "components": [ + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 24.0, + "y": 46.5 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 24.0, + "y": 71.5 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#2", + "pos": { + "x": 24.0, + "y": 96.5 + }, + "params": 1 + }, { "id": "and", "name": "and#0", @@ -118,33 +145,6 @@ "x": 30.0, "y": 82.5 } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 24.0, - "y": 46.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 71.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 24.0, - "y": 96.5 - }, - "params": 1 } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json index befc8b06..d8d7c36a 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json @@ -78,38 +78,6 @@ }, "params": 1 }, - { - "id": "and", - "name": "and#0", - "pos": { - "x": 40.0, - "y": 2.5 - } - }, - { - "id": "and", - "name": "and#1", - "pos": { - "x": 40.0, - "y": 27.5 - } - }, - { - "id": "and", - "name": "and#2", - "pos": { - "x": 40.0, - "y": 52.5 - } - }, - { - "id": "and", - "name": "and#3", - "pos": { - "x": 40.0, - "y": 77.5 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -181,6 +149,38 @@ "y": 36.5 }, "params": 1 + }, + { + "id": "and", + "name": "and#0", + "pos": { + "x": 40.0, + "y": 2.5 + } + }, + { + "id": "and", + "name": "and#1", + "pos": { + "x": 40.0, + "y": 27.5 + } + }, + { + "id": "and", + "name": "and#2", + "pos": { + "x": 40.0, + "y": 52.5 + } + }, + { + "id": "and", + "name": "and#3", + "pos": { + "x": 40.0, + "y": 77.5 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json index cb4abaf9..298101f1 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json @@ -51,30 +51,6 @@ }, "params": 1 }, - { - "id": "_rsLatch", - "name": "_rsLatch#0", - "pos": { - "x": 40.0, - "y": 10.0 - } - }, - { - "id": "_rsLatch", - "name": "_rsLatch#1", - "pos": { - "x": 120.0, - "y": 30.0 - } - }, - { - "id": "nand3", - "name": "nand3#0", - "pos": { - "x": 40.0, - "y": 40.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -110,6 +86,30 @@ "y": 44.0 }, "params": 1 + }, + { + "id": "_rsLatch", + "name": "_rsLatch#0", + "pos": { + "x": 40.0, + "y": 10.0 + } + }, + { + "id": "_rsLatch", + "name": "_rsLatch#1", + "pos": { + "x": 120.0, + "y": 30.0 + } + }, + { + "id": "nand3", + "name": "nand3#0", + "pos": { + "x": 40.0, + "y": 40.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json index ed4ae62a..af3897d6 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json @@ -1458,7 +1458,7 @@ "symbolRendererParams": { "centerText": "D flip flop\n16 bit", "centerTextHeight": 5.0, - "horizontalComponentCenter": 30, + "horizontalComponentCenter": 30.0, "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json index ced8d500..d54a34e8 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json @@ -104,38 +104,6 @@ "y": 70.0 } }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 115.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 115.0, - "y": 120.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 115.0, - "y": 170.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -198,6 +166,38 @@ "y": 174.0 }, "params": 1 + }, + { + "id": "dff", + "name": "dff#0", + "pos": { + "x": 115.0, + "y": 20.0 + } + }, + { + "id": "dff", + "name": "dff#1", + "pos": { + "x": 115.0, + "y": 70.0 + } + }, + { + "id": "dff", + "name": "dff#2", + "pos": { + "x": 115.0, + "y": 120.0 + } + }, + { + "id": "dff", + "name": "dff#3", + "pos": { + "x": 115.0, + "y": 170.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json index 0bcf5719..2902594d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json @@ -104,38 +104,6 @@ "y": 70.0 } }, - { - "id": "dff", - "name": "dff#0", - "pos": { - "x": 115.0, - "y": 20.0 - } - }, - { - "id": "dff", - "name": "dff#1", - "pos": { - "x": 115.0, - "y": 70.0 - } - }, - { - "id": "dff", - "name": "dff#2", - "pos": { - "x": 115.0, - "y": 120.0 - } - }, - { - "id": "dff", - "name": "dff#3", - "pos": { - "x": 115.0, - "y": 170.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -198,6 +166,38 @@ "y": 174.0 }, "params": 1 + }, + { + "id": "dff", + "name": "dff#0", + "pos": { + "x": 115.0, + "y": 20.0 + } + }, + { + "id": "dff", + "name": "dff#1", + "pos": { + "x": 115.0, + "y": 70.0 + } + }, + { + "id": "dff", + "name": "dff#2", + "pos": { + "x": 115.0, + "y": 120.0 + } + }, + { + "id": "dff", + "name": "dff#3", + "pos": { + "x": 115.0, + "y": 170.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json index 212ca70f..3884fc0b 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json @@ -60,14 +60,6 @@ }, "params": 1 }, - { - "id": "_rsLatch", - "name": "_rsLatch#0", - "pos": { - "x": 45.0, - "y": 7.5 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -85,6 +77,14 @@ "y": 11.5 }, "params": 1 + }, + { + "id": "_rsLatch", + "name": "_rsLatch#0", + "pos": { + "x": 45.0, + "y": 7.5 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json index 9fdbac01..27361df9 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json @@ -87,6 +87,33 @@ "innerScale": 0.4, "submodel": { "components": [ + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 14.0, + "y": 46.5 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 14.0, + "y": 71.5 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#2", + "pos": { + "x": 14.0, + "y": 96.5 + }, + "params": 1 + }, { "id": "dlatch", "name": "dlatch#0", @@ -118,33 +145,6 @@ "x": 30.0, "y": 82.5 } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 14.0, - "y": 46.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 14.0, - "y": 71.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 14.0, - "y": 96.5 - }, - "params": 1 } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json index a84df229..b5b16b89 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json @@ -123,6 +123,33 @@ "innerScale": 0.4, "submodel": { "components": [ + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#0", + "pos": { + "x": 24.0, + "y": 11.5 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#1", + "pos": { + "x": 24.0, + "y": 46.5 + }, + "params": 1 + }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#2", + "pos": { + "x": 24.0, + "y": 81.5 + }, + "params": 1 + }, { "id": "mux1", "name": "mux1#0", @@ -154,33 +181,6 @@ "x": 30.0, "y": 112.5 } - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#0", - "pos": { - "x": 24.0, - "y": 11.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", - "pos": { - "x": 24.0, - "y": 46.5 - }, - "params": 1 - }, - { - "id": "WireCrossPoint", - "name": "WireCrossPoint#2", - "pos": { - "x": 24.0, - "y": 81.5 - }, - "params": 1 } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json index 2dd4182e..a9175b72 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json @@ -159,126 +159,6 @@ "innerScale": 0.1, "submodel": { "components": [ - { - "id": "and41", - "name": "and41#0", - "pos": { - "x": 130.0, - "y": 150.0 - } - }, - { - "id": "and41", - "name": "and41#1", - "pos": { - "x": 235.0, - "y": 375.0 - } - }, - { - "id": "and41", - "name": "and41#2", - "pos": { - "x": 135.0, - "y": 325.0 - } - }, - { - "id": "andor414", - "name": "andor414#0", - "pos": { - "x": 235.0, - "y": 485.0 - } - }, - { - "id": "andor414", - "name": "andor414#1", - "pos": { - "x": 235.0, - "y": 635.0 - } - }, - { - "id": "andor414", - "name": "andor414#2", - "pos": { - "x": 235.0, - "y": 785.0 - } - }, - { - "id": "andor414", - "name": "andor414#3", - "pos": { - "x": 135.0, - "y": 435.0 - } - }, - { - "id": "andor414", - "name": "andor414#4", - "pos": { - "x": 135.0, - "y": 585.0 - } - }, - { - "id": "andor414", - "name": "andor414#5", - "pos": { - "x": 135.0, - "y": 735.0 - } - }, - { - "id": "demux2", - "name": "demux2#0", - "pos": { - "x": 55.0, - "y": 45.0 - } - }, - { - "id": "demux2", - "name": "demux2#1", - "pos": { - "x": 55.0, - "y": 150.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#0", - "pos": { - "x": 55.0, - "y": 325.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#1", - "pos": { - "x": 55.0, - "y": 475.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#2", - "pos": { - "x": 55.0, - "y": 625.0 - } - }, - { - "id": "dlatch4", - "name": "dlatch4#3", - "pos": { - "x": 55.0, - "y": 775.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -566,6 +446,126 @@ "y": 489.0 }, "params": 1 + }, + { + "id": "and41", + "name": "and41#0", + "pos": { + "x": 130.0, + "y": 150.0 + } + }, + { + "id": "and41", + "name": "and41#1", + "pos": { + "x": 235.0, + "y": 375.0 + } + }, + { + "id": "and41", + "name": "and41#2", + "pos": { + "x": 135.0, + "y": 325.0 + } + }, + { + "id": "andor414", + "name": "andor414#0", + "pos": { + "x": 235.0, + "y": 485.0 + } + }, + { + "id": "andor414", + "name": "andor414#1", + "pos": { + "x": 235.0, + "y": 635.0 + } + }, + { + "id": "andor414", + "name": "andor414#2", + "pos": { + "x": 235.0, + "y": 785.0 + } + }, + { + "id": "andor414", + "name": "andor414#3", + "pos": { + "x": 135.0, + "y": 435.0 + } + }, + { + "id": "andor414", + "name": "andor414#4", + "pos": { + "x": 135.0, + "y": 585.0 + } + }, + { + "id": "andor414", + "name": "andor414#5", + "pos": { + "x": 135.0, + "y": 735.0 + } + }, + { + "id": "demux2", + "name": "demux2#0", + "pos": { + "x": 55.0, + "y": 45.0 + } + }, + { + "id": "demux2", + "name": "demux2#1", + "pos": { + "x": 55.0, + "y": 150.0 + } + }, + { + "id": "dlatch4", + "name": "dlatch4#0", + "pos": { + "x": 55.0, + "y": 325.0 + } + }, + { + "id": "dlatch4", + "name": "dlatch4#1", + "pos": { + "x": 55.0, + "y": 475.0 + } + }, + { + "id": "dlatch4", + "name": "dlatch4#2", + "pos": { + "x": 55.0, + "y": 625.0 + } + }, + { + "id": "dlatch4", + "name": "dlatch4#3", + "pos": { + "x": 55.0, + "y": 775.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json index 51a74517..7b57534d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json @@ -195,126 +195,6 @@ "innerScale": 0.1, "submodel": { "components": [ - { - "id": "and41", - "name": "and41#0", - "pos": { - "x": 235.0, - "y": 150.0 - } - }, - { - "id": "and41", - "name": "and41#1", - "pos": { - "x": 250.0, - "y": 375.0 - } - }, - { - "id": "and41", - "name": "and41#2", - "pos": { - "x": 155.0, - "y": 325.0 - } - }, - { - "id": "andor414", - "name": "andor414#0", - "pos": { - "x": 250.0, - "y": 485.0 - } - }, - { - "id": "andor414", - "name": "andor414#1", - "pos": { - "x": 250.0, - "y": 635.0 - } - }, - { - "id": "andor414", - "name": "andor414#2", - "pos": { - "x": 250.0, - "y": 785.0 - } - }, - { - "id": "andor414", - "name": "andor414#3", - "pos": { - "x": 155.0, - "y": 435.0 - } - }, - { - "id": "andor414", - "name": "andor414#4", - "pos": { - "x": 155.0, - "y": 585.0 - } - }, - { - "id": "andor414", - "name": "andor414#5", - "pos": { - "x": 155.0, - "y": 735.0 - } - }, - { - "id": "demux2", - "name": "demux2#0", - "pos": { - "x": 55.0, - "y": 45.0 - } - }, - { - "id": "demux2", - "name": "demux2#1", - "pos": { - "x": 55.0, - "y": 150.0 - } - }, - { - "id": "ram2", - "name": "ram2#0", - "pos": { - "x": 80.0, - "y": 330.0 - } - }, - { - "id": "ram2", - "name": "ram2#1", - "pos": { - "x": 80.0, - "y": 480.0 - } - }, - { - "id": "ram2", - "name": "ram2#2", - "pos": { - "x": 80.0, - "y": 630.0 - } - }, - { - "id": "ram2", - "name": "ram2#3", - "pos": { - "x": 80.0, - "y": 780.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -566,6 +446,126 @@ "y": 694.0 }, "params": 1 + }, + { + "id": "and41", + "name": "and41#0", + "pos": { + "x": 235.0, + "y": 150.0 + } + }, + { + "id": "and41", + "name": "and41#1", + "pos": { + "x": 250.0, + "y": 375.0 + } + }, + { + "id": "and41", + "name": "and41#2", + "pos": { + "x": 155.0, + "y": 325.0 + } + }, + { + "id": "andor414", + "name": "andor414#0", + "pos": { + "x": 250.0, + "y": 485.0 + } + }, + { + "id": "andor414", + "name": "andor414#1", + "pos": { + "x": 250.0, + "y": 635.0 + } + }, + { + "id": "andor414", + "name": "andor414#2", + "pos": { + "x": 250.0, + "y": 785.0 + } + }, + { + "id": "andor414", + "name": "andor414#3", + "pos": { + "x": 155.0, + "y": 435.0 + } + }, + { + "id": "andor414", + "name": "andor414#4", + "pos": { + "x": 155.0, + "y": 585.0 + } + }, + { + "id": "andor414", + "name": "andor414#5", + "pos": { + "x": 155.0, + "y": 735.0 + } + }, + { + "id": "demux2", + "name": "demux2#0", + "pos": { + "x": 55.0, + "y": 45.0 + } + }, + { + "id": "demux2", + "name": "demux2#1", + "pos": { + "x": 55.0, + "y": 150.0 + } + }, + { + "id": "ram2", + "name": "ram2#0", + "pos": { + "x": 80.0, + "y": 330.0 + } + }, + { + "id": "ram2", + "name": "ram2#1", + "pos": { + "x": 80.0, + "y": 480.0 + } + }, + { + "id": "ram2", + "name": "ram2#2", + "pos": { + "x": 80.0, + "y": 630.0 + } + }, + { + "id": "ram2", + "name": "ram2#3", + "pos": { + "x": 80.0, + "y": 780.0 + } } ], "wires": [ diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json index ad1b3977..c16624c8 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json @@ -249,22 +249,6 @@ }, "params": 1 }, - { - "id": "not4", - "name": "not4#0", - "pos": { - "x": 75.0, - "y": 250.0 - } - }, - { - "id": "sel2_4", - "name": "sel2_4#0", - "pos": { - "x": 35.0, - "y": 250.0 - } - }, { "id": "WireCrossPoint", "name": "WireCrossPoint#0", @@ -291,6 +275,22 @@ "y": 684.0 }, "params": 1 + }, + { + "id": "not4", + "name": "not4#0", + "pos": { + "x": 75.0, + "y": 250.0 + } + }, + { + "id": "sel2_4", + "name": "sel2_4#0", + "pos": { + "x": 35.0, + "y": 250.0 + } } ], "wires": [ -- 2.17.1