From a9a490aea792e58525f7da243c61b948a71f4355 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 11 Sep 2019 18:26:54 +0200 Subject: [PATCH] HighLevelStates are now sorted in JSONs --- .../am2900/components/am2904/Am2904.json | 8 +- .../am2900/components/am2910/Am2910.json | 16 +-- .../logic/model/am2900/components/dff4.json | 28 +++--- .../model/am2900/components/dff4_invwe.json | 28 +++--- .../model/am2900/components/dlatch4.json | 28 +++--- .../logic/model/am2900/components/ram2.json | 8 +- .../logic/model/am2900/components/ram4.json | 98 +++++++++---------- .../StandardHighLevelStateHandler.java | 5 +- 8 files changed, 110 insertions(+), 109 deletions(-) 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 769a0a4a..424c5471 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 @@ -5203,16 +5203,16 @@ "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { - "musr": { + "msr": { "id": "delegating", "params": { - "delegateTarget": "Am2904muSR#0" + "delegateTarget": "Am2904MSR#0" } }, - "msr": { + "musr": { "id": "delegating", "params": { - "delegateTarget": "Am2904MSR#0" + "delegateTarget": "Am2904muSR#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 9163fc3c..b1bc97fa 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 @@ -1119,28 +1119,28 @@ "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { - "r": { + "mupc": { "id": "delegating", "params": { - "delegateTarget": "Am2910RegCntr#0" + "delegateTarget": "dff12#0" } }, - "stack": { + "r": { "id": "delegating", "params": { - "delegateTarget": "ram5_12#0" + "delegateTarget": "Am2910RegCntr#0" } }, - "mupc": { + "sp": { "id": "delegating", "params": { - "delegateTarget": "dff12#0" + "delegateTarget": "Am2910SP#0" } }, - "sp": { + "stack": { "id": "delegating", "params": { - "delegateTarget": "Am2910SP#0" + "delegateTarget": "ram5_12#0" } } }, 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 ac0a4511..fe18cf1d 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 @@ -676,20 +676,6 @@ "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, "q": { "id": "bitVectorSplitting", "params": { @@ -707,6 +693,20 @@ ] } }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff#0", + "subStateID": "q" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff#1", + "subStateID": "q" + } + }, "q3": { "id": "delegating", "params": { 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 0320f12d..7615dc7c 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 @@ -685,20 +685,6 @@ "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dff#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dff#1", - "subStateID": "q" - } - }, "q": { "id": "bitVectorSplitting", "params": { @@ -716,6 +702,20 @@ ] } }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dff#0", + "subStateID": "q" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dff#1", + "subStateID": "q" + } + }, "q3": { "id": "delegating", "params": { 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 27361df9..c85ca3cd 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 @@ -354,20 +354,6 @@ "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { - "q1": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#0", - "subStateID": "q" - } - }, - "q2": { - "id": "delegating", - "params": { - "delegateTarget": "dlatch#1", - "subStateID": "q" - } - }, "q": { "id": "bitVectorSplitting", "params": { @@ -385,6 +371,20 @@ ] } }, + "q1": { + "id": "delegating", + "params": { + "delegateTarget": "dlatch#0", + "subStateID": "q" + } + }, + "q2": { + "id": "delegating", + "params": { + "delegateTarget": "dlatch#1", + "subStateID": "q" + } + }, "q3": { "id": "delegating", "params": { 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 a9175b72..37322570 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 @@ -2986,10 +2986,10 @@ "delegateTarget": "dlatch4#0" } }, - "c11": { + "c01": { "id": "delegating", "params": { - "delegateTarget": "dlatch4#3" + "delegateTarget": "dlatch4#1" } }, "c10": { @@ -2998,10 +2998,10 @@ "delegateTarget": "dlatch4#2" } }, - "c01": { + "c11": { "id": "delegating", "params": { - "delegateTarget": "dlatch4#1" + "delegateTarget": "dlatch4#3" } } }, 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 7b57534d..de91b6be 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 @@ -3370,133 +3370,133 @@ "delegateTarget": "ram2#0" } }, - "c11": { + "c0000": { "id": "delegating", "params": { - "delegateTarget": "ram2#3" + "delegateTarget": "ram2#0", + "prefix": "c00" } }, - "c10": { + "c0001": { "id": "delegating", "params": { - "delegateTarget": "ram2#2" + "delegateTarget": "ram2#1", + "prefix": "c00" } }, - "c01": { + "c0010": { "id": "delegating", "params": { - "delegateTarget": "ram2#1" + "delegateTarget": "ram2#2", + "prefix": "c00" } }, - "c1000": { + "c0011": { "id": "delegating", "params": { - "delegateTarget": "ram2#0", - "prefix": "c10" + "delegateTarget": "ram2#3", + "prefix": "c00" } }, - "c1011": { + "c01": { "id": "delegating", "params": { - "delegateTarget": "ram2#3", - "prefix": "c10" + "delegateTarget": "ram2#1" } }, - "c1110": { + "c0100": { "id": "delegating", "params": { - "delegateTarget": "ram2#2", - "prefix": "c11" + "delegateTarget": "ram2#0", + "prefix": "c01" } }, - "c1001": { + "c0101": { "id": "delegating", "params": { "delegateTarget": "ram2#1", - "prefix": "c10" + "prefix": "c01" } }, - "c1100": { + "c0110": { "id": "delegating", "params": { - "delegateTarget": "ram2#0", - "prefix": "c11" + "delegateTarget": "ram2#2", + "prefix": "c01" } }, - "c1111": { + "c0111": { "id": "delegating", "params": { "delegateTarget": "ram2#3", - "prefix": "c11" + "prefix": "c01" } }, - "c0000": { + "c10": { "id": "delegating", "params": { - "delegateTarget": "ram2#0", - "prefix": "c00" + "delegateTarget": "ram2#2" } }, - "c0011": { + "c1000": { "id": "delegating", "params": { - "delegateTarget": "ram2#3", - "prefix": "c00" + "delegateTarget": "ram2#0", + "prefix": "c10" } }, - "c0110": { + "c1001": { "id": "delegating", "params": { - "delegateTarget": "ram2#2", - "prefix": "c01" + "delegateTarget": "ram2#1", + "prefix": "c10" } }, - "c0010": { + "c1010": { "id": "delegating", "params": { "delegateTarget": "ram2#2", - "prefix": "c00" + "prefix": "c10" } }, - "c1010": { + "c1011": { "id": "delegating", "params": { - "delegateTarget": "ram2#2", + "delegateTarget": "ram2#3", "prefix": "c10" } }, - "c0101": { + "c11": { "id": "delegating", "params": { - "delegateTarget": "ram2#1", - "prefix": "c01" + "delegateTarget": "ram2#3" } }, - "c0001": { + "c1100": { "id": "delegating", "params": { - "delegateTarget": "ram2#1", - "prefix": "c00" + "delegateTarget": "ram2#0", + "prefix": "c11" } }, - "c0100": { + "c1101": { "id": "delegating", "params": { - "delegateTarget": "ram2#0", - "prefix": "c01" + "delegateTarget": "ram2#1", + "prefix": "c11" } }, - "c0111": { + "c1110": { "id": "delegating", "params": { - "delegateTarget": "ram2#3", - "prefix": "c01" + "delegateTarget": "ram2#2", + "prefix": "c11" } }, - "c1101": { + "c1111": { "id": "delegating", "params": { - "delegateTarget": "ram2#1", + "delegateTarget": "ram2#3", "prefix": "c11" } } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java index 490b2676..c5eb6da3 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import java.util.TreeMap; import java.util.function.BiFunction; import java.util.function.Function; @@ -178,8 +179,8 @@ public class StandardHighLevelStateHandler implements HighLevelStateHandler public StandardHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams) { StandardHighLevelStateHandlerParams params = new StandardHighLevelStateHandlerParams(); - params.subcomponentHighLevelStates = new HashMap<>(); - params.atomicHighLevelStates = new HashMap<>(); + params.subcomponentHighLevelStates = new TreeMap<>(); + params.atomicHighLevelStates = new TreeMap<>(); for (Entry e : subcomponentHighLevelStateHandlers.entrySet()) { String stateID = e.getKey(); -- 2.17.1