projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a bug in Am2900; created dlatch8/80; relayouted some components
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
am2904
/
Am2904.json
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
f6e571b
..
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
@@
-280,51
+280,6
@@
"y": 95.0
}
},
"y": 95.0
}
},
- {
- "id": "Merger",
- "name": "Merger#0",
- "pos": {
- "x": 20.0,
- "y": 235.0
- },
- "params": 6
- },
- {
- "id": "Merger",
- "name": "Merger#1",
- "pos": {
- "x": 20.0,
- "y": 185.0
- },
- "params": 5
- },
- {
- "id": "Merger",
- "name": "Merger#2",
- "pos": {
- "x": 15.0,
- "y": 65.0
- },
- "params": 4
- },
- {
- "id": "Merger",
- "name": "Merger#3",
- "pos": {
- "x": 520.0,
- "y": 95.0
- },
- "params": 4
- },
- {
- "id": "Merger",
- "name": "Merger#4",
- "pos": {
- "x": 20.0,
- "y": 165.0
- },
- "params": 2
- },
{
"id": "NandGate",
"name": "NandGate#0",
{
"id": "NandGate",
"name": "NandGate#0",
@@
-348,7
+303,7
@@
"name": "NandGate#10",
"pos": {
"x": 455.0,
"name": "NandGate#10",
"pos": {
"x": 455.0,
- "y":
60
.0
+ "y":
55
.0
},
"params": 1
},
},
"params": 1
},
@@
-440,7
+395,10
@@
"x": 5.0,
"y": 165.0
},
"x": 5.0,
"y": 165.0
},
- "params": 13
+ "params": {
+ "logicWidth": 13,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-449,7
+407,10
@@
"x": 575.0,
"y": 40.0
},
"x": 575.0,
"y": 40.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-458,7
+419,10
@@
"x": 445.0,
"y": 300.0
},
"x": 445.0,
"y": 300.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-467,7
+431,10
@@
"x": 455.0,
"y": 635.0
},
"x": 455.0,
"y": 635.0
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-476,7
+443,10
@@
"x": 455.0,
"y": 710.0
},
"x": 455.0,
"y": 710.0
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-485,7
+455,10
@@
"x": 135.0,
"y": 645.0
},
"x": 135.0,
"y": 645.0
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-494,7
+467,10
@@
"x": 310.0,
"y": 645.0
},
"x": 310.0,
"y": 645.0
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-503,43
+479,118
@@
"x": 430.0,
"y": 535.0
},
"x": 430.0,
"y": 535.0
},
- "params": 2
+ "params": {
+ "logicWidth": 2,
+ "orientation": "RIGHT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#16",
+ "pos": {
+ "x": 20.0,
+ "y": 235.0
+ },
+ "params": {
+ "logicWidth": 6,
+ "orientation": "LEFT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#17",
+ "pos": {
+ "x": 20.0,
+ "y": 185.0
+ },
+ "params": {
+ "logicWidth": 5,
+ "orientation": "LEFT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#18",
+ "pos": {
+ "x": 15.0,
+ "y": 65.0
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#19",
+ "pos": {
+ "x": 520.0,
+ "y": 90.0
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#2",
"pos": {
"x": 440.0,
},
{
"id": "Splitter",
"name": "Splitter#2",
"pos": {
"x": 440.0,
- "y": 9
5
.0
+ "y": 9
0
.0
},
},
- "params": 2
+ "params": {
+ "logicWidth": 2,
+ "orientation": "RIGHT"
+ }
+ },
+ {
+ "id": "Splitter",
+ "name": "Splitter#20",
+ "pos": {
+ "x": 20.0,
+ "y": 165.0
+ },
+ "params": {
+ "logicWidth": 2,
+ "orientation": "LEFT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#3",
"pos": {
"x": 465.0,
},
{
"id": "Splitter",
"name": "Splitter#3",
"pos": {
"x": 465.0,
- "y": 10
5
.0
+ "y": 10
0
.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#4",
"pos": {
"x": 425.0,
},
{
"id": "Splitter",
"name": "Splitter#4",
"pos": {
"x": 425.0,
- "y": 15
5
.0
+ "y": 15
0
.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
"name": "Splitter#5",
"pos": {
"x": 425.0,
},
{
"id": "Splitter",
"name": "Splitter#5",
"pos": {
"x": 425.0,
- "y": 19
5
.0
+ "y": 19
0
.0
},
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-548,7
+599,10
@@
"x": 320.0,
"y": 310.0
},
"x": 320.0,
"y": 310.0
},
- "params": 3
+ "params": {
+ "logicWidth": 3,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-557,7
+611,10
@@
"x": 445.0,
"y": 340.0
},
"x": 445.0,
"y": 340.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-566,7
+623,10
@@
"x": 445.0,
"y": 380.0
},
"x": 445.0,
"y": 380.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "Splitter",
},
{
"id": "Splitter",
@@
-575,14
+635,17
@@
"x": 255.0,
"y": 430.0
},
"x": 255.0,
"y": 430.0
},
- "params": 4
+ "params": {
+ "logicWidth": 4,
+ "orientation": "RIGHT"
+ }
},
{
"id": "TriStateBuffer",
"name": "TriStateBuffer#0",
"pos": {
"x": 540.0,
},
{
"id": "TriStateBuffer",
"name": "TriStateBuffer#0",
"pos": {
"x": 540.0,
- "y": 7
5
.0
+ "y": 7
0
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-699,7
+762,7
@@
"name": "WireCrossPoint#13",
"pos": {
"x": 449.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 449.0,
- "y":
64
.0
+ "y":
59
.0
},
"params": 1
},
},
"params": 1
},
@@
-708,7
+771,7
@@
"name": "WireCrossPoint#14",
"pos": {
"x": 534.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 534.0,
- "y": 10
9
.0
+ "y": 10
4
.0
},
"params": 4
},
},
"params": 4
},
@@
-861,7
+924,7
@@
"name": "WireCrossPoint#3",
"pos": {
"x": 404.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 404.0,
- "y": 11
9
.0
+ "y": 11
4
.0
},
"params": 4
},
},
"params": 4
},
@@
-897,7
+960,7
@@
"name": "WireCrossPoint#33",
"pos": {
"x": 389.0,
"name": "WireCrossPoint#33",
"pos": {
"x": 389.0,
- "y": 20
9
.0
+ "y": 20
4
.0
},
"params": 4
},
},
"params": 4
},
@@
-1032,7
+1095,7
@@
"name": "and#0",
"pos": {
"x": 495.0,
"name": "and#0",
"pos": {
"x": 495.0,
- "y": 6
5
.0
+ "y": 6
0
.0
}
},
{
}
},
{
@@
-1088,7
+1151,7
@@
"name": "mux1_4#0",
"pos": {
"x": 480.0,
"name": "mux1_4#0",
"pos": {
"x": 480.0,
- "y":
90
.0
+ "y":
85
.0
}
},
{
}
},
{
@@
-1096,7
+1159,7
@@
"name": "mux1_4#1",
"pos": {
"x": 440.0,
"name": "mux1_4#1",
"pos": {
"x": 440.0,
- "y": 1
40
.0
+ "y": 1
35
.0
}
},
{
}
},
{
@@
-1220,8
+1283,8
@@
"pinName": "O6"
},
"pin2": {
"pinName": "O6"
},
"pin2": {
- "compName": "
Merger#1
",
- "pinName": "
I
0"
+ "compName": "
Splitter#17
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#10",
"path": []
},
"name": "unnamedWire#10",
"path": []
@@
-1353,8
+1416,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#1
",
- "pinName": "
I
1"
+ "compName": "
Splitter#17
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1413,7
+1476,7
@@
"path": [
{
"x": 535.0,
"path": [
{
"x": 535.0,
- "y": 8
5
.0
+ "y": 8
0
.0
}
]
},
}
]
},
@@
-1528,8
+1591,8
@@
"pinName": "O8"
},
"pin2": {
"pinName": "O8"
},
"pin2": {
- "compName": "
Merger#1
",
- "pinName": "
I
2"
+ "compName": "
Splitter#17
",
+ "pinName": "
O
2"
},
"name": "unnamedWire#12",
"path": []
},
"name": "unnamedWire#12",
"path": []
@@
-1680,8
+1743,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#1
",
- "pinName": "
I
3"
+ "compName": "
Splitter#17
",
+ "pinName": "
O
3"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1860,15
+1923,15
@@
},
{
"x": 410.0,
},
{
"x": 410.0,
- "y": 8
5
.0
+ "y": 8
0
.0
},
{
"x": 485.0,
},
{
"x": 485.0,
- "y": 8
5
.0
+ "y": 8
0
.0
},
{
"x": 485.0,
},
{
"x": 485.0,
- "y":
80
.0
+ "y":
75
.0
}
]
},
}
]
},
@@
-1878,8
+1941,8
@@
"pinName": "O11"
},
"pin2": {
"pinName": "O11"
},
"pin2": {
- "compName": "
Merger#4
",
- "pinName": "
I
0"
+ "compName": "
Splitter#20
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#139",
"path": []
},
"name": "unnamedWire#139",
"path": []
@@
-1890,16
+1953,16
@@
"pinName": "O10"
},
"pin2": {
"pinName": "O10"
},
"pin2": {
- "compName": "
Merger#1
",
- "pinName": "
I
4"
+ "compName": "
Splitter#17
",
+ "pinName": "
O
4"
},
"name": "unnamedWire#14",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#14",
"path": []
},
{
"pin1": {
- "compName": "
Merger#4
",
- "pinName": "
I
1"
+ "compName": "
Splitter#20
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-1910,8
+1973,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#4
",
- "pinName": "
O
"
+ "compName": "
Splitter#20
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "Am2904RegCTInstrDecode#0",
},
"pin2": {
"compName": "Am2904RegCTInstrDecode#0",
@@
-2093,8
+2156,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
O
"
+ "compName": "
Splitter#16
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "Am2904RegCTInstrDecode#0",
},
"pin2": {
"compName": "Am2904RegCTInstrDecode#0",
@@
-2292,8
+2355,8
@@
"pinName": "I"
},
"pin2": {
"pinName": "I"
},
"pin2": {
- "compName": "
Merger#1
",
- "pinName": "
O
"
+ "compName": "
Splitter#17
",
+ "pinName": "
I
"
},
"name": "unnamedWire#16",
"path": [
},
"name": "unnamedWire#16",
"path": [
@@
-2465,8
+2528,8
@@
"pinName": "IOVR"
},
"pin2": {
"pinName": "IOVR"
},
"pin2": {
- "compName": "
Merger#2
",
- "pinName": "
I
0"
+ "compName": "
Splitter#18
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#17",
"path": [
},
"name": "unnamedWire#17",
"path": [
@@
-2641,8
+2704,8
@@
"pinName": "IN"
},
"pin2": {
"pinName": "IN"
},
"pin2": {
- "compName": "
Merger#2
",
- "pinName": "
I
1"
+ "compName": "
Splitter#18
",
+ "pinName": "
O
1"
},
"name": "unnamedWire#18",
"path": [
},
"name": "unnamedWire#18",
"path": [
@@
-2810,8
+2873,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#2
",
- "pinName": "
I
2"
+ "compName": "
Splitter#18
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "_submodelinterface",
},
"pin2": {
"compName": "_submodelinterface",
@@
-3051,8
+3114,8
@@
"pinName": "IZ"
},
"pin2": {
"pinName": "IZ"
},
"pin2": {
- "compName": "
Merger#2
",
- "pinName": "
I
3"
+ "compName": "
Splitter#18
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#20",
"path": [
},
"name": "unnamedWire#20",
"path": [
@@
-3448,8
+3511,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#2
",
- "pinName": "
O
"
+ "compName": "
Splitter#18
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "WireCrossPoint#1",
},
"pin2": {
"compName": "WireCrossPoint#1",
@@
-3869,12
+3932,7
@@
"pinName": "I"
},
"name": "unnamedWire#26",
"pinName": "I"
},
"name": "unnamedWire#26",
- "path": [
- {
- "x": 425.0,
- "y": 165.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-4100,8
+4158,8
@@
"pinName": "O0"
},
"pin2": {
"pinName": "O0"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
0"
+ "compName": "
Splitter#16
",
+ "pinName": "
O
0"
},
"name": "unnamedWire#4",
"path": []
},
"name": "unnamedWire#4",
"path": []
@@
-4280,8
+4338,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
1"
+ "compName": "
Splitter#16
",
+ "pinName": "
O
1"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-4367,9
+4425,13
@@
},
"name": "unnamedWire#54",
"path": [
},
"name": "unnamedWire#54",
"path": [
+ {
+ "x": 570.0,
+ "y": 50.0
+ },
{
"x": 415.0,
{
"x": 415.0,
- "y": 5
5
.0
+ "y": 5
0
.0
},
{
"x": 415.0,
},
{
"x": 415.0,
@@
-4479,8
+4541,8
@@
"pinName": "O2"
},
"pin2": {
"pinName": "O2"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
2"
+ "compName": "
Splitter#16
",
+ "pinName": "
O
2"
},
"name": "unnamedWire#6",
"path": []
},
"name": "unnamedWire#6",
"path": []
@@
-4632,8
+4694,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
3"
+ "compName": "
Splitter#16
",
+ "pinName": "
O
3"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-4810,7
+4872,7
@@
"path": [
{
"x": 570.0,
"path": [
{
"x": 570.0,
- "y": 8
5
.0
+ "y": 8
0
.0
}
]
},
}
]
},
@@
-4820,8
+4882,8
@@
"pinName": "O4"
},
"pin2": {
"pinName": "O4"
},
"pin2": {
- "compName": "
Merger#0
",
- "pinName": "
I
4"
+ "compName": "
Splitter#16
",
+ "pinName": "
O
4"
},
"name": "unnamedWire#8",
"path": []
},
"name": "unnamedWire#8",
"path": []
@@
-4851,7
+4913,7
@@
"path": [
{
"x": 450.0,
"path": [
{
"x": 450.0,
- "y": 7
5
.0
+ "y": 7
0
.0
}
]
},
}
]
},
@@
-4892,7
+4954,7
@@
"path": [
{
"x": 550.0,
"path": [
{
"x": 550.0,
- "y":
70
.0
+ "y":
65
.0
}
]
},
}
]
},
@@
-4946,8
+5008,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#3
",
- "pinName": "
I
0"
+ "compName": "
Splitter#19
",
+ "pinName": "
O
0"
},
"pin2": {
"compName": "mux1_4#0",
},
"pin2": {
"compName": "mux1_4#0",
@@
-4958,8
+5020,8
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
Merger#0
",
- "pinName": "
I
5"
+ "compName": "
Splitter#16
",
+ "pinName": "
O
5"
},
"pin2": {
"compName": "Splitter#0",
},
"pin2": {
"compName": "Splitter#0",
@@
-4974,16
+5036,16
@@
"pinName": "Y3"
},
"pin2": {
"pinName": "Y3"
},
"pin2": {
- "compName": "
Merger#3
",
- "pinName": "
I
1"
+ "compName": "
Splitter#19
",
+ "pinName": "
O
1"
},
"name": "unnamedWire#90",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#90",
"path": []
},
{
"pin1": {
- "compName": "
Merger#3
",
- "pinName": "
I
2"
+ "compName": "
Splitter#19
",
+ "pinName": "
O
2"
},
"pin2": {
"compName": "mux1_4#0",
},
"pin2": {
"compName": "mux1_4#0",
@@
-4998,8
+5060,8
@@
"pinName": "Y1"
},
"pin2": {
"pinName": "Y1"
},
"pin2": {
- "compName": "
Merger#3
",
- "pinName": "
I
3"
+ "compName": "
Splitter#19
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#92",
"path": []
},
"name": "unnamedWire#92",
"path": []
@@
-5010,8
+5072,8
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
Merger#3
",
- "pinName": "
O
"
+ "compName": "
Splitter#19
",
+ "pinName": "
I
"
},
"name": "unnamedWire#93",
"path": []
},
"name": "unnamedWire#93",
"path": []
@@
-5045,7
+5107,7
@@
},
{
"x": 420.0,
},
{
"x": 420.0,
- "y":
100
.0
+ "y":
95
.0
}
]
},
}
]
},
@@
-5062,19
+5124,19
@@
"path": [
{
"x": 455.0,
"path": [
{
"x": 455.0,
- "y": 10
5
.0
+ "y": 10
0
.0
},
{
"x": 455.0,
},
{
"x": 455.0,
- "y": 13
5
.0
+ "y": 13
0
.0
},
{
"x": 435.0,
},
{
"x": 435.0,
- "y": 13
5
.0
+ "y": 13
0
.0
},
{
"x": 435.0,
},
{
"x": 435.0,
- "y": 14
5
.0
+ "y": 14
0
.0
}
]
},
}
]
},
@@
-5141,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"
}
}
},
}
}
},