projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
76b27a2
)
HighLevelStates are now sorted in JSONs
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 11 Sep 2019 16:26:54 +0000
(18:26 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 11 Sep 2019 16:27:19 +0000
(18:27 +0200)
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/StandardHighLevelStateHandler.java
patch
|
blob
|
history
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
769a0a4
..
424c547
100644
(file)
--- 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": {
"highLevelStateHandlerSnippetID": "standard",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
- "m
u
sr": {
+ "msr": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "Am2904
mu
SR#0"
+ "delegateTarget": "Am2904
M
SR#0"
}
},
}
},
- "msr": {
+ "m
u
sr": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "Am2904
M
SR#0"
+ "delegateTarget": "Am2904
mu
SR#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
9163fc3
..
b1bc97f
100644
(file)
--- 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": {
"highLevelStateHandlerSnippetID": "standard",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
- "
r
": {
+ "
mupc
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "
Am2910RegCntr
#0"
+ "delegateTarget": "
dff12
#0"
}
},
}
},
- "
stack
": {
+ "
r
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "
ram5_12
#0"
+ "delegateTarget": "
Am2910RegCntr
#0"
}
},
}
},
- "
mupc
": {
+ "
sp
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "
dff12
#0"
+ "delegateTarget": "
Am2910SP
#0"
}
},
}
},
- "s
p
": {
+ "s
tack
": {
"id": "delegating",
"params": {
"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
ac0a451
..
fe18cf1
100644
(file)
--- 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": {
"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": {
"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": {
"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
0320f12
..
7615dc7
100644
(file)
--- 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": {
"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": {
"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": {
"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
27361df
..
c85ca3c
100644
(file)
--- 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": {
"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": {
"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": {
"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
a9175b7
..
3732257
100644
(file)
--- 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"
}
},
"delegateTarget": "dlatch4#0"
}
},
- "c
1
1": {
+ "c
0
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "dlatch4#
3
"
+ "delegateTarget": "dlatch4#
1
"
}
},
"c10": {
}
},
"c10": {
@@
-2998,10
+2998,10
@@
"delegateTarget": "dlatch4#2"
}
},
"delegateTarget": "dlatch4#2"
}
},
- "c
0
1": {
+ "c
1
1": {
"id": "delegating",
"params": {
"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
7b57534
..
de91b6b
100644
(file)
--- 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"
}
},
"delegateTarget": "ram2#0"
}
},
- "c
11
": {
+ "c
0000
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#3"
+ "delegateTarget": "ram2#0",
+ "prefix": "c00"
}
},
}
},
- "c
10
": {
+ "c
0001
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#2"
+ "delegateTarget": "ram2#1",
+ "prefix": "c00"
}
},
}
},
- "c0
1
": {
+ "c0
010
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#1"
+ "delegateTarget": "ram2#2",
+ "prefix": "c00"
}
},
}
},
- "c
1000
": {
+ "c
0011
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
0
",
- "prefix": "c
1
0"
+ "delegateTarget": "ram2#
3
",
+ "prefix": "c
0
0"
}
},
}
},
- "c
101
1": {
+ "c
0
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#3",
- "prefix": "c10"
+ "delegateTarget": "ram2#1"
}
},
}
},
- "c
111
0": {
+ "c
010
0": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
2
",
- "prefix": "c
1
1"
+ "delegateTarget": "ram2#
0
",
+ "prefix": "c
0
1"
}
},
}
},
- "c
10
01": {
+ "c
01
01": {
"id": "delegating",
"params": {
"delegateTarget": "ram2#1",
"id": "delegating",
"params": {
"delegateTarget": "ram2#1",
- "prefix": "c
10
"
+ "prefix": "c
01
"
}
},
}
},
- "c
110
0": {
+ "c
011
0": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
0
",
- "prefix": "c
1
1"
+ "delegateTarget": "ram2#
2
",
+ "prefix": "c
0
1"
}
},
}
},
- "c
1
111": {
+ "c
0
111": {
"id": "delegating",
"params": {
"delegateTarget": "ram2#3",
"id": "delegating",
"params": {
"delegateTarget": "ram2#3",
- "prefix": "c
1
1"
+ "prefix": "c
0
1"
}
},
}
},
- "c
000
0": {
+ "c
1
0": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#0",
- "prefix": "c00"
+ "delegateTarget": "ram2#2"
}
},
}
},
- "c
0011
": {
+ "c
1000
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
3
",
- "prefix": "c
0
0"
+ "delegateTarget": "ram2#
0
",
+ "prefix": "c
1
0"
}
},
}
},
- "c
0110
": {
+ "c
1001
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
2
",
- "prefix": "c
01
"
+ "delegateTarget": "ram2#
1
",
+ "prefix": "c
10
"
}
},
}
},
- "c
0
010": {
+ "c
1
010": {
"id": "delegating",
"params": {
"delegateTarget": "ram2#2",
"id": "delegating",
"params": {
"delegateTarget": "ram2#2",
- "prefix": "c
0
0"
+ "prefix": "c
1
0"
}
},
}
},
- "c101
0
": {
+ "c101
1
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
2
",
+ "delegateTarget": "ram2#
3
",
"prefix": "c10"
}
},
"prefix": "c10"
}
},
- "c
010
1": {
+ "c
1
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#1",
- "prefix": "c01"
+ "delegateTarget": "ram2#3"
}
},
}
},
- "c
0001
": {
+ "c
1100
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
1
",
- "prefix": "c
00
"
+ "delegateTarget": "ram2#
0
",
+ "prefix": "c
11
"
}
},
}
},
- "c
0100
": {
+ "c
1101
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
0
",
- "prefix": "c
0
1"
+ "delegateTarget": "ram2#
1
",
+ "prefix": "c
1
1"
}
},
}
},
- "c
0111
": {
+ "c
1110
": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
3
",
- "prefix": "c
0
1"
+ "delegateTarget": "ram2#
2
",
+ "prefix": "c
1
1"
}
},
}
},
- "c11
0
1": {
+ "c11
1
1": {
"id": "delegating",
"params": {
"id": "delegating",
"params": {
- "delegateTarget": "ram2#
1
",
+ "delegateTarget": "ram2#
3
",
"prefix": "c11"
}
}
"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
490b267
..
c5eb6da
100644
(file)
--- 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.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.TreeMap;
import java.util.function.BiFunction;
import java.util.function.Function;
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();
public StandardHighLevelStateHandlerParams getParamsForSerializing(IdentifyParams idParams)
{
StandardHighLevelStateHandlerParams params = new StandardHighLevelStateHandlerParams();
- params.subcomponentHighLevelStates = new
Hash
Map<>();
- params.atomicHighLevelStates = new
Hash
Map<>();
+ params.subcomponentHighLevelStates = new
Tree
Map<>();
+ params.atomicHighLevelStates = new
Tree
Map<>();
for (Entry<String, SubcomponentHighLevelStateHandler> e : subcomponentHighLevelStateHandlers.entrySet())
{
String stateID = e.getKey();
for (Entry<String, SubcomponentHighLevelStateHandler> e : subcomponentHighLevelStateHandlers.entrySet())
{
String stateID = e.getKey();