From a6afef0c4c6e8d2324548304e249992eb9949c6c Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sat, 14 Sep 2019 16:11:33 +0200 Subject: [PATCH] Fixed problems found by ReserializeAndVerifyJSONs --- .../am2900/components/am2904/Am2904muSR.json | 82 ++++++++----------- .../am2900/components/am2910/Am2910.json | 11 ++- .../logic/model/am2900/components/dff4.json | 14 +--- .../model/am2900/components/dff4_invwe.json | 14 +--- 4 files changed, 47 insertions(+), 74 deletions(-) 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 3b859b24..2949d8da 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 @@ -670,18 +670,6 @@ } ] }, - { - "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#3", - "pinName": "" - }, - "name": "unnamedWire#33", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#3", @@ -691,7 +679,7 @@ "compName": "NandGate#1", "pinName": "B" }, - "name": "unnamedWire#34", + "name": "unnamedWire#33", "path": [ { "x": 225.0, @@ -716,7 +704,7 @@ "compName": "xor#0", "pinName": "A" }, - "name": "unnamedWire#35", + "name": "unnamedWire#34", "path": [ { "x": 125.0, @@ -737,7 +725,7 @@ "compName": "xor#0", "pinName": "B" }, - "name": "unnamedWire#36", + "name": "unnamedWire#35", "path": [ { "x": 105.0, @@ -758,7 +746,7 @@ "compName": "_submodelinterface", "pinName": "_EZ" }, - "name": "unnamedWire#37", + "name": "unnamedWire#36", "path": [ { "x": 180.0, @@ -783,7 +771,7 @@ "compName": "dff4_finewe#0", "pinName": "C" }, - "name": "unnamedWire#38", + "name": "unnamedWire#37", "path": [ { "x": 55.0, @@ -804,7 +792,7 @@ "compName": "dff4_finewe#0", "pinName": "_WE4" }, - "name": "unnamedWire#39", + "name": "unnamedWire#38", "path": [ { "x": 200.0, @@ -822,47 +810,47 @@ }, { "pin1": { - "compName": "Splitter#3", - "pinName": "I" + "compName": "dff4_finewe#0", + "pinName": "_WE3" }, "pin2": { "compName": "_submodelinterface", - "pinName": "Q" + "pinName": "_EN" }, - "name": "unnamedWire#4", + "name": "unnamedWire#39", "path": [ { - "x": 245.0, - "y": 45.0 + "x": 170.0, + "y": 60.0 }, { - "x": 245.0, - "y": 50.0 + "x": 170.0, + "y": 15.0 + }, + { + "x": 150.0, + "y": 15.0 } ] }, { "pin1": { - "compName": "dff4_finewe#0", - "pinName": "_WE3" + "compName": "Splitter#3", + "pinName": "I" }, "pin2": { "compName": "_submodelinterface", - "pinName": "_EN" + "pinName": "Q" }, - "name": "unnamedWire#40", + "name": "unnamedWire#4", "path": [ { - "x": 170.0, - "y": 60.0 - }, - { - "x": 170.0, - "y": 15.0 + "x": 245.0, + "y": 45.0 }, { - "x": 150.0, - "y": 15.0 + "x": 245.0, + "y": 50.0 } ] }, @@ -875,7 +863,7 @@ "compName": "dff4_finewe#0", "pinName": "_WE2" }, - "name": "unnamedWire#41", + "name": "unnamedWire#40", "path": [ { "x": 100.0, @@ -900,7 +888,7 @@ "compName": "mux1_4#1", "pinName": "Y1" }, - "name": "unnamedWire#42", + "name": "unnamedWire#41", "path": [] }, { @@ -912,7 +900,7 @@ "compName": "dff4_finewe#0", "pinName": "D2" }, - "name": "unnamedWire#43", + "name": "unnamedWire#42", "path": [ { "x": 170.0, @@ -933,7 +921,7 @@ "compName": "mux1_4#1", "pinName": "Y3" }, - "name": "unnamedWire#44", + "name": "unnamedWire#43", "path": [] }, { @@ -945,7 +933,7 @@ "compName": "mux1_4#1", "pinName": "Y4" }, - "name": "unnamedWire#45", + "name": "unnamedWire#44", "path": [ { "x": 115.0, @@ -962,7 +950,7 @@ "compName": "dff4_finewe#0", "pinName": "D4" }, - "name": "unnamedWire#46", + "name": "unnamedWire#45", "path": [ { "x": 180.0, @@ -983,7 +971,7 @@ "compName": "NandGate#2", "pinName": "A" }, - "name": "unnamedWire#47", + "name": "unnamedWire#46", "path": [] }, { @@ -995,7 +983,7 @@ "compName": "NandGate#2", "pinName": "B" }, - "name": "unnamedWire#48", + "name": "unnamedWire#47", "path": [ { "x": 115.0, @@ -1012,7 +1000,7 @@ "compName": "mux1_4#0", "pinName": "I0_1" }, - "name": "unnamedWire#49", + "name": "unnamedWire#48", "path": [ { "x": 20.0, 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 b1bc97fa..9a6e0ba7 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 @@ -635,7 +635,16 @@ "pinName": "_RLD" }, "name": "unnamedWire#26", - "path": [] + "path": [ + { + "x": 50.0, + "y": 25.0 + }, + { + "x": 50.0, + "y": 20.0 + } + ] }, { "pin1": { 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 99b9a912..02286a97 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 @@ -534,18 +534,6 @@ } ] }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#6", @@ -555,7 +543,7 @@ "compName": "mux1_4#0", "pinName": "I0_4" }, - "name": "unnamedWire#28", + "name": "unnamedWire#27", "path": [ { "x": 155.0, 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 9a188411..704948e6 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 @@ -543,18 +543,6 @@ } ] }, - { - "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" - }, - "name": "unnamedWire#27", - "path": [] - }, { "pin1": { "compName": "WireCrossPoint#6", @@ -564,7 +552,7 @@ "compName": "mux1_4#0", "pinName": "I1_4" }, - "name": "unnamedWire#28", + "name": "unnamedWire#27", "path": [ { "x": 155.0, -- 2.17.1