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:
20b68bb
)
Added BitDisplays for A and B in GUIAm2910; updated Editor's components
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 31 Aug 2019 21:08:47 +0000
(23:08 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sat, 31 Aug 2019 21:08:47 +0000
(23:08 +0200)
net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
index
250cb24
..
c016ec8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
+++ b/
net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json
@@
-124,7
+124,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2910.
GUIAm2910InstrPLA",
+ "id": "GUIAm2910InstrPLA",
"name": "GUIAm2910InstrPLA#0",
"pos": {
"x": 80.0,
"name": "GUIAm2910InstrPLA#0",
"pos": {
"x": 80.0,
@@
-132,7
+132,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2910.
GUIAm2910RegCntr",
+ "id": "GUIAm2910RegCntr",
"name": "GUIAm2910RegCntr#0",
"pos": {
"x": 160.0,
"name": "GUIAm2910RegCntr#0",
"pos": {
"x": 160.0,
@@
-140,7
+140,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2910.
GUIAm2910SP",
+ "id": "GUIAm2910SP",
"name": "GUIAm2910SP#0",
"pos": {
"x": 305.0,
"name": "GUIAm2910SP#0",
"pos": {
"x": 305.0,
@@
-148,7
+148,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#0",
"pos": {
"x": 160.0,
"name": "GUIBitDisplay#0",
"pos": {
"x": 160.0,
@@
-157,7
+157,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#1",
"pos": {
"x": 260.0,
"name": "GUIBitDisplay#1",
"pos": {
"x": 260.0,
@@
-166,7
+166,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#2",
"pos": {
"x": 345.0,
"name": "GUIBitDisplay#2",
"pos": {
"x": 345.0,
@@
-175,7
+175,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#3",
"pos": {
"x": 265.0,
"name": "GUIBitDisplay#3",
"pos": {
"x": 265.0,
@@
-184,7
+184,25
@@
"params": 12
},
{
"params": 12
},
{
- "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+ "id": "GUIBitDisplay",
+ "name": "GUIBitDisplay#4",
+ "pos": {
+ "x": 260.0,
+ "y": 85.0
+ },
+ "params": 3
+ },
+ {
+ "id": "GUIBitDisplay",
+ "name": "GUIBitDisplay#5",
+ "pos": {
+ "x": 260.0,
+ "y": 70.0
+ },
+ "params": 3
+ },
+ {
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 40.0,
"name": "GUINandGate#0",
"pos": {
"x": 40.0,
@@
-193,7
+211,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
@@
-202,7
+220,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#0",
"pos": {
"x": 180.0,
"name": "GUITriStateBuffer#0",
"pos": {
"x": 180.0,
@@
-214,7
+232,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIdff12",
+ "id": "GUIdff12",
"name": "GUIdff12#0",
"pos": {
"x": 305.0,
"name": "GUIdff12#0",
"pos": {
"x": 305.0,
@@
-222,7
+240,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIinc12",
+ "id": "GUIinc12",
"name": "GUIinc12#0",
"pos": {
"x": 305.0,
"name": "GUIinc12#0",
"pos": {
"x": 305.0,
@@
-230,7
+248,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUInor12",
+ "id": "GUInor12",
"name": "GUInor12#0",
"pos": {
"x": 190.0,
"name": "GUInor12#0",
"pos": {
"x": 190.0,
@@
-238,7
+256,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIram5_12",
+ "id": "GUIram5_12",
"name": "GUIram5_12#0",
"pos": {
"x": 305.0,
"name": "GUIram5_12#0",
"pos": {
"x": 305.0,
@@
-246,7
+264,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIsel4_12",
+ "id": "GUIsel4_12",
"name": "GUIsel4_12#0",
"pos": {
"x": 150.0,
"name": "GUIsel4_12#0",
"pos": {
"x": 150.0,
@@
-254,7
+272,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 324.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 324.0,
@@
-263,7
+281,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 294.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 294.0,
@@
-272,7
+290,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 189.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 189.0,
@@
-281,7
+299,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 179.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 179.0,
@@
-290,7
+308,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 179.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 179.0,
@@
-299,7
+317,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
@@
-308,7
+326,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 299.0,
@@
-317,7
+335,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 299.0,
@@
-326,7
+344,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 299.0,
@@
-335,7
+353,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 299.0,
@@
-1083,6
+1101,30
@@
}
]
},
}
]
},
+ {
+ "pin1": {
+ "compName": "GUIAm2910SP#0",
+ "pinName": "A"
+ },
+ "pin2": {
+ "compName": "GUIBitDisplay#5",
+ "pinName": ""
+ },
+ "name": "unnamedWire#54",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "GUIAm2910SP#0",
+ "pinName": "B"
+ },
+ "pin2": {
+ "compName": "GUIBitDisplay#4",
+ "pinName": ""
+ },
+ "name": "unnamedWire#55",
+ "path": []
+ },
{
"pin1": {
"compName": "WireCrossPoint#0",
{
"pin1": {
"compName": "WireCrossPoint#0",
@@
-1134,7
+1176,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2910",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Am2910",
"centerTextHeight": 5.0,
@@
-1142,33
+1184,33
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"r": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"r": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIAm2910RegCntr#0"
}
},
"params": {
"delegateTarget": "GUIAm2910RegCntr#0"
}
},
- "sp": {
- "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler",
- "params": {
- "delegateTarget": "GUIAm2910SP#0"
- }
- },
"stack": {
"stack": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram5_12#0"
}
},
"mupc": {
"params": {
"delegateTarget": "GUIram5_12#0"
}
},
"mupc": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff12#0"
}
"params": {
"delegateTarget": "GUIdff12#0"
}
+ },
+ "sp": {
+ "id": "delegating",
+ "params": {
+ "delegateTarget": "GUIAm2910SP#0"
+ }
}
},
"atomicHighLevelStates": {}
}
},
"atomicHighLevelStates": {}
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
index
9b47e86
..
7a5dffc
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
@@
-4006,7
+4006,20
@@
"outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer",
"highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
"highLevelStateHandlerParams": {
"outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer",
"highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
"highLevelStateHandlerParams": {
- "subcomponentHighLevelStates": {},
+ "subcomponentHighLevelStates": {
+ "msr": {
+ "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler",
+ "params": {
+ "delegateTarget": "DeserializedSubmodelComponent#0"
+ }
+ },
+ "musr": {
+ "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler",
+ "params": {
+ "delegateTarget": "DeserializedSubmodelComponent#1"
+ }
+ }
+ },
"atomicHighLevelStates": {}
},
"version": "0.1.5"
"atomicHighLevelStates": {}
},
"version": "0.1.5"
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
index
d5e6094
..
bf0ea33
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
@@
-1914,7
+1914,15
@@
"highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
- "atomicHighLevelStates": {}
+ "atomicHighLevelStates": {
+ "q": {
+ "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler",
+ "params": {
+ "delegateTarget": "GUIdff4_finewe#0",
+ "subStateID": "q"
+ }
+ }
+ }
},
"version": "0.1.5"
}
\ No newline at end of file
},
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
index
bb91791
..
3c5845a
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
@@
-1087,7
+1087,15
@@
"highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
- "atomicHighLevelStates": {}
+ "atomicHighLevelStates": {
+ "q": {
+ "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler",
+ "params": {
+ "delegateTarget": "GUIdff4_finewe#0",
+ "subStateID": "q"
+ }
+ }
+ }
},
"version": "0.1.5"
}
\ No newline at end of file
},
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json
b/net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json
index
e078ec5
..
c016ec8
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json
+++ b/
net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json
@@
-124,7
+124,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2910.
GUIAm2910InstrPLA",
+ "id": "GUIAm2910InstrPLA",
"name": "GUIAm2910InstrPLA#0",
"pos": {
"x": 80.0,
"name": "GUIAm2910InstrPLA#0",
"pos": {
"x": 80.0,
@@
-132,7
+132,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2910.
GUIAm2910RegCntr",
+ "id": "GUIAm2910RegCntr",
"name": "GUIAm2910RegCntr#0",
"pos": {
"x": 160.0,
"name": "GUIAm2910RegCntr#0",
"pos": {
"x": 160.0,
@@
-140,7
+140,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2910.
GUIAm2910SP",
+ "id": "GUIAm2910SP",
"name": "GUIAm2910SP#0",
"pos": {
"x": 305.0,
"name": "GUIAm2910SP#0",
"pos": {
"x": 305.0,
@@
-148,7
+148,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#0",
"pos": {
"x": 160.0,
"name": "GUIBitDisplay#0",
"pos": {
"x": 160.0,
@@
-157,7
+157,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#1",
"pos": {
"x": 260.0,
"name": "GUIBitDisplay#1",
"pos": {
"x": 260.0,
@@
-166,7
+166,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#2",
"pos": {
"x": 345.0,
"name": "GUIBitDisplay#2",
"pos": {
"x": 345.0,
@@
-175,7
+175,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#3",
"pos": {
"x": 265.0,
"name": "GUIBitDisplay#3",
"pos": {
"x": 265.0,
@@
-184,7
+184,25
@@
"params": 12
},
{
"params": 12
},
{
- "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+ "id": "GUIBitDisplay",
+ "name": "GUIBitDisplay#4",
+ "pos": {
+ "x": 260.0,
+ "y": 85.0
+ },
+ "params": 3
+ },
+ {
+ "id": "GUIBitDisplay",
+ "name": "GUIBitDisplay#5",
+ "pos": {
+ "x": 260.0,
+ "y": 70.0
+ },
+ "params": 3
+ },
+ {
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 40.0,
"name": "GUINandGate#0",
"pos": {
"x": 40.0,
@@
-193,7
+211,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
@@
-202,7
+220,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#0",
"pos": {
"x": 180.0,
"name": "GUITriStateBuffer#0",
"pos": {
"x": 180.0,
@@
-214,7
+232,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIdff12",
+ "id": "GUIdff12",
"name": "GUIdff12#0",
"pos": {
"x": 305.0,
"name": "GUIdff12#0",
"pos": {
"x": 305.0,
@@
-222,7
+240,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIinc12",
+ "id": "GUIinc12",
"name": "GUIinc12#0",
"pos": {
"x": 305.0,
"name": "GUIinc12#0",
"pos": {
"x": 305.0,
@@
-230,7
+248,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUInor12",
+ "id": "GUInor12",
"name": "GUInor12#0",
"pos": {
"x": 190.0,
"name": "GUInor12#0",
"pos": {
"x": 190.0,
@@
-238,7
+256,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIram5_12",
+ "id": "GUIram5_12",
"name": "GUIram5_12#0",
"pos": {
"x": 305.0,
"name": "GUIram5_12#0",
"pos": {
"x": 305.0,
@@
-246,7
+264,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIsel4_12",
+ "id": "GUIsel4_12",
"name": "GUIsel4_12#0",
"pos": {
"x": 150.0,
"name": "GUIsel4_12#0",
"pos": {
"x": 150.0,
@@
-254,7
+272,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 324.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 324.0,
@@
-263,7
+281,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 294.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 294.0,
@@
-272,7
+290,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 189.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 189.0,
@@
-281,7
+299,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 179.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 179.0,
@@
-290,7
+308,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 179.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 179.0,
@@
-299,7
+317,7
@@
"params": 12
},
{
"params": 12
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
@@
-308,7
+326,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 299.0,
@@
-317,7
+335,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 299.0,
@@
-326,7
+344,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 299.0,
@@
-335,7
+353,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 299.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 299.0,
@@
-1083,6
+1101,30
@@
}
]
},
}
]
},
+ {
+ "pin1": {
+ "compName": "GUIAm2910SP#0",
+ "pinName": "A"
+ },
+ "pin2": {
+ "compName": "GUIBitDisplay#5",
+ "pinName": ""
+ },
+ "name": "unnamedWire#54",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "GUIAm2910SP#0",
+ "pinName": "B"
+ },
+ "pin2": {
+ "compName": "GUIBitDisplay#4",
+ "pinName": ""
+ },
+ "name": "unnamedWire#55",
+ "path": []
+ },
{
"pin1": {
"compName": "WireCrossPoint#0",
{
"pin1": {
"compName": "WireCrossPoint#0",
@@
-1134,7
+1176,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2910",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Am2910",
"centerTextHeight": 5.0,
@@
-1142,10
+1184,35
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"highLevelStateHandlerParams": {
- "subcomponentHighLevelStates": {},
+ "subcomponentHighLevelStates": {
+ "r": {
+ "id": "delegating",
+ "params": {
+ "delegateTarget": "GUIAm2910RegCntr#0"
+ }
+ },
+ "stack": {
+ "id": "delegating",
+ "params": {
+ "delegateTarget": "GUIram5_12#0"
+ }
+ },
+ "mupc": {
+ "id": "delegating",
+ "params": {
+ "delegateTarget": "GUIdff12#0"
+ }
+ },
+ "sp": {
+ "id": "delegating",
+ "params": {
+ "delegateTarget": "GUIAm2910SP#0"
+ }
+ }
+ },
"atomicHighLevelStates": {}
},
"version": "0.1.5"
"atomicHighLevelStates": {}
},
"version": "0.1.5"