projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed dff4_finewe HLS bit order
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
am2910
/
Am2910.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
index
4ad69a1
..
0519d7f
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json
@@
-127,7
+127,7
@@
"id": "Am2910SP",
"name": "Am2910SP#0",
"pos": {
"id": "Am2910SP",
"name": "Am2910SP#0",
"pos": {
- "x": 24
0
.0,
+ "x": 24
5
.0,
"y": 10.0
}
},
"y": 10.0
}
},
@@
-143,7
+143,7
@@
"id": "Am2910InstrPLA",
"name": "Am2910InstrPLA#0",
"pos": {
"id": "Am2910InstrPLA",
"name": "Am2910InstrPLA#0",
"pos": {
- "x":
7
0.0,
+ "x":
3
0.0,
"y": 90.0
}
},
"y": 90.0
}
},
@@
-170,7
+170,7
@@
"name": "NandGate#2",
"pos": {
"x": 205.0,
"name": "NandGate#2",
"pos": {
"x": 205.0,
- "y":
195
.0
+ "y":
200
.0
},
"params": 1
},
},
"params": 1
},
@@
-179,7
+179,7
@@
"name": "TriStateBuffer#0",
"pos": {
"x": 165.0,
"name": "TriStateBuffer#0",
"pos": {
"x": 165.0,
- "y": 18
0
.0
+ "y": 18
5
.0
},
"params": {
"logicWidth": 12,
},
"params": {
"logicWidth": 12,
@@
-190,7
+190,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x": 2
59
.0,
+ "x": 2
64
.0,
"y": 99.0
},
"params": 12
"y": 99.0
},
"params": 12
@@
-199,7
+199,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
- "x": 22
4
.0,
+ "x": 22
9
.0,
"y": 59.0
},
"params": 1
"y": 59.0
},
"params": 1
@@
-209,7
+209,7
@@
"name": "WireCrossPoint#2",
"pos": {
"x": 174.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 174.0,
- "y": 17
4
.0
+ "y": 17
9
.0
},
"params": 12
},
},
"params": 12
},
@@
-244,7
+244,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
- "x": 23
4
.0,
+ "x": 23
9
.0,
"y": 34.0
},
"params": 1
"y": 34.0
},
"params": 1
@@
-262,7
+262,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
- "x": 23
4
.0,
+ "x": 23
9
.0,
"y": 69.0
},
"params": 1
"y": 69.0
},
"params": 1
@@
-272,7
+272,7
@@
"name": "WireCrossPoint#9",
"pos": {
"x": 199.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 199.0,
- "y": 2
09
.0
+ "y": 2
14
.0
},
"params": 1
},
},
"params": 1
},
@@
-280,32
+280,31
@@
"id": "dff12",
"name": "dff12#0",
"pos": {
"id": "dff12",
"name": "dff12#0",
"pos": {
- "x": 24
0
.0,
+ "x": 24
5
.0,
"y": 105.0
}
},
{
"y": 105.0
}
},
{
- "id": "inc",
- "name": "inc#0",
+ "id": "inc
12
",
+ "name": "inc
12
#0",
"pos": {
"pos": {
- "x": 240.0,
- "y": 140.0
- },
- "params": 12
+ "x": 255.0,
+ "y": 165.0
+ }
},
{
"id": "nor12",
"name": "nor12#0",
"pos": {
"x": 175.0,
},
{
"id": "nor12",
"name": "nor12#0",
"pos": {
"x": 175.0,
- "y":
50
.0
+ "y":
45
.0
}
},
{
"id": "ram5_12",
"name": "ram5_12#0",
"pos": {
}
},
{
"id": "ram5_12",
"name": "ram5_12#0",
"pos": {
- "x": 24
0
.0,
+ "x": 24
5
.0,
"y": 55.0
}
},
"y": 55.0
}
},
@@
-369,7
+368,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
12
#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
@@
-377,19
+376,45
@@
"pinName": "D"
},
"name": "unnamedWire#4",
"pinName": "D"
},
"name": "unnamedWire#4",
- "path": []
+ "path": [
+ {
+ "x": 280.0,
+ "y": 180.0
+ },
+ {
+ "x": 280.0,
+ "y": 150.0
+ },
+ {
+ "x": 240.0,
+ "y": 150.0
+ },
+ {
+ "x": 240.0,
+ "y": 125.0
+ }
+ ]
},
{
"pin1": {
"compName": "dff12#0",
},
{
"pin1": {
"compName": "dff12#0",
- "pinName": "
Y
"
+ "pinName": "
Q
"
},
"pin2": {
"compName": "WireCrossPoint#0",
"pinName": ""
},
"name": "unnamedWire#5",
},
"pin2": {
"compName": "WireCrossPoint#0",
"pinName": ""
},
"name": "unnamedWire#5",
- "path": []
+ "path": [
+ {
+ "x": 290.0,
+ "y": 125.0
+ },
+ {
+ "x": 290.0,
+ "y": 100.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-456,16
+481,16
@@
"name": "unnamedWire#10",
"path": [
{
"name": "unnamedWire#10",
"path": [
{
- "x": 2
1
5.0,
+ "x": 2
2
5.0,
"y": 60.0
},
{
"y": 60.0
},
{
- "x": 2
1
5.0,
- "y":
75
.0
+ "x": 2
2
5.0,
+ "y":
80
.0
},
{
},
{
- "x":
85
.0,
- "y":
75
.0
+ "x":
70
.0,
+ "y":
80
.0
}
]
},
}
]
},
@@
-481,11
+506,11
@@
"name": "unnamedWire#11",
"path": [
{
"name": "unnamedWire#11",
"path": [
{
- "x": 1
0
5.0,
+ "x": 1
1
5.0,
"y": 95.0
},
{
"y": 95.0
},
{
- "x": 1
0
5.0,
+ "x": 1
1
5.0,
"y": 35.0
}
]
"y": 35.0
}
]
@@
-502,11
+527,11
@@
"name": "unnamedWire#12",
"path": [
{
"name": "unnamedWire#12",
"path": [
{
- "x": 1
1
0.0,
+ "x": 1
2
0.0,
"y": 105.0
},
{
"y": 105.0
},
{
- "x": 1
1
0.0,
+ "x": 1
2
0.0,
"y": 45.0
}
]
"y": 45.0
}
]
@@
-523,7
+548,7
@@
"name": "unnamedWire#13",
"path": [
{
"name": "unnamedWire#13",
"path": [
{
- "x": 2
25
.0,
+ "x": 2
30
.0,
"y": 155.0
}
]
"y": 155.0
}
]
@@
-540,11
+565,11
@@
"name": "unnamedWire#14",
"path": [
{
"name": "unnamedWire#14",
"path": [
{
- "x": 23
0
.0,
+ "x": 23
5
.0,
"y": 165.0
},
{
"y": 165.0
},
{
- "x": 23
0
.0,
+ "x": 23
5
.0,
"y": 25.0
}
]
"y": 25.0
}
]
@@
-561,7
+586,7
@@
"name": "unnamedWire#15",
"path": [
{
"name": "unnamedWire#15",
"path": [
{
- "x": 2
25
.0,
+ "x": 2
30
.0,
"y": 15.0
}
]
"y": 15.0
}
]
@@
-596,16
+621,11
@@
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "inc#0",
+ "compName": "inc
12
#0",
"pinName": "A"
},
"name": "unnamedWire#18",
"pinName": "A"
},
"name": "unnamedWire#18",
- "path": [
- {
- "x": 260.0,
- "y": 175.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-764,6
+784,14
@@
},
{
"x": 65.0,
},
{
"x": 65.0,
+ "y": 85.0
+ },
+ {
+ "x": 25.0,
+ "y": 85.0
+ },
+ {
+ "x": 25.0,
"y": 95.0
}
]
"y": 95.0
}
]
@@
-866,8
+894,8
@@
"name": "unnamedWire#35",
"path": [
{
"name": "unnamedWire#35",
"path": [
{
- "x": 2
35
.0,
- "y": 11
5
.0
+ "x": 2
40
.0,
+ "y": 11
0
.0
}
]
},
}
]
},
@@
-933,7
+961,7
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "inc#0",
+ "compName": "inc
12
#0",
"pinName": "CI"
},
"pin2": {
"pinName": "CI"
},
"pin2": {
@@
-941,7
+969,24
@@
"pinName": "CI"
},
"name": "unnamedWire#41",
"pinName": "CI"
},
"name": "unnamedWire#41",
- "path": []
+ "path": [
+ {
+ "x": 250.0,
+ "y": 170.0
+ },
+ {
+ "x": 250.0,
+ "y": 160.0
+ },
+ {
+ "x": 290.0,
+ "y": 160.0
+ },
+ {
+ "x": 290.0,
+ "y": 150.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-955,7
+1000,7
@@
"name": "unnamedWire#42",
"path": [
{
"name": "unnamedWire#42",
"path": [
{
- "x":
7
5.0,
+ "x":
4
5.0,
"y": 180.0
},
{
"y": 180.0
},
{
@@
-976,7
+1021,7
@@
"name": "unnamedWire#43",
"path": [
{
"name": "unnamedWire#43",
"path": [
{
- "x":
8
5.0,
+ "x":
5
5.0,
"y": 185.0
},
{
"y": 185.0
},
{
@@
-997,12
+1042,12
@@
"name": "unnamedWire#44",
"path": [
{
"name": "unnamedWire#44",
"path": [
{
- "x":
9
5.0,
- "y": 1
9
0.0
+ "x":
6
5.0,
+ "y": 1
8
0.0
},
{
"x": 100.0,
},
{
"x": 100.0,
- "y": 1
9
0.0
+ "y": 1
8
0.0
}
]
},
}
]
},
@@
-1018,11
+1063,11
@@
"name": "unnamedWire#45",
"path": [
{
"name": "unnamedWire#45",
"path": [
{
- "x":
3
5.0,
+ "x":
2
5.0,
"y": 125.0
},
{
"y": 125.0
},
{
- "x":
3
5.0,
+ "x":
2
5.0,
"y": 110.0
}
]
"y": 110.0
}
]
@@
-1088,7
+1133,7
@@
"path": [
{
"x": 200.0,
"path": [
{
"x": 200.0,
- "y": 20
0
.0
+ "y": 20
5
.0
}
]
},
}
]
},
@@
-1105,11
+1150,11
@@
"path": [
{
"x": 230.0,
"path": [
{
"x": 230.0,
- "y": 19
0
.0
+ "y": 19
5
.0
},
{
"x": 230.0,
},
{
"x": 230.0,
- "y": 2
05
.0
+ "y": 2
10
.0
}
]
}
}
]
}