projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continued cleaning up components
[Mograsim.git]
/
plugins
/
net.mograsim.logic.model.am2900
/
components
/
net
/
mograsim
/
logic
/
model
/
am2900
/
components
/
am2901
/
Am2901ALUInclSourceDecodeInclFunctionDecode.json
diff --git
a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
index
aaa3141
..
7338de0
100644
(file)
--- a/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/
plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
@@
-1,6
+1,6
@@
{
"width": 95.0,
{
"width": 95.0,
- "height":
110
.0,
+ "height":
85
.0,
"interfacePins": [
{
"location": {
"interfacePins": [
{
"location": {
@@
-91,8
+91,8
@@
"id": "Am2901ALUInclDecode",
"name": "Am2901ALUInclDecode#0",
"pos": {
"id": "Am2901ALUInclDecode",
"name": "Am2901ALUInclDecode#0",
"pos": {
- "x": 31
5
.0,
- "y":
20
.0
+ "x": 31
0
.0,
+ "y":
15
.0
}
},
{
}
},
{
@@
-100,7
+100,7
@@
"name": "Am2901SourceDecode#0",
"pos": {
"x": 155.0,
"name": "Am2901SourceDecode#0",
"pos": {
"x": 155.0,
- "y": 1
60
.0
+ "y": 1
55
.0
}
},
{
}
},
{
@@
-120,7
+120,7
@@
"name": "Splitter#1",
"pos": {
"x": 140.0,
"name": "Splitter#1",
"pos": {
"x": 140.0,
- "y": 16
5
.0
+ "y": 16
0
.0
},
"params": {
"logicWidth": 3,
},
"params": {
"logicWidth": 3,
@@
-156,7
+156,7
@@
"name": "Splitter#4",
"pos": {
"x": 220.0,
"name": "Splitter#4",
"pos": {
"x": 220.0,
- "y": 1
10
.0
+ "y": 1
05
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-167,8
+167,8
@@
"id": "Splitter",
"name": "Splitter#5",
"pos": {
"id": "Splitter",
"name": "Splitter#5",
"pos": {
- "x":
35
5.0,
- "y":
2
5.0
+ "x":
27
5.0,
+ "y":
8
5.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-180,7
+180,7
@@
"name": "Splitter#6",
"pos": {
"x": 195.0,
"name": "Splitter#6",
"pos": {
"x": 195.0,
- "y": 22
5
.0
+ "y": 22
0
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-192,7
+192,7
@@
"name": "Splitter#7",
"pos": {
"x": 220.0,
"name": "Splitter#7",
"pos": {
"x": 220.0,
- "y": 26
5
.0
+ "y": 26
0
.0
},
"params": {
"logicWidth": 4,
},
"params": {
"logicWidth": 4,
@@
-204,19
+204,31
@@
"name": "Splitter#8",
"pos": {
"x": 220.0,
"name": "Splitter#8",
"pos": {
"x": 220.0,
- "y": 30
5
.0
+ "y": 30
0
.0
},
"params": {
"logicWidth": 4,
"orientation": "RIGHT"
}
},
},
"params": {
"logicWidth": 4,
"orientation": "RIGHT"
}
},
+ {
+ "id": "Splitter",
+ "name": "Splitter#9",
+ "pos": {
+ "x": 275.0,
+ "y": 190.0
+ },
+ "params": {
+ "logicWidth": 4,
+ "orientation": "LEFT"
+ }
+ },
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 209.0,
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 209.0,
- "y": 2
24
.0
+ "y": 2
19
.0
},
"params": 1
},
},
"params": 1
},
@@
-225,7
+237,7
@@
"name": "WireCrossPoint#1",
"pos": {
"x": 214.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 214.0,
- "y": 2
34
.0
+ "y": 2
29
.0
},
"params": 1
},
},
"params": 1
},
@@
-234,7
+246,7
@@
"name": "WireCrossPoint#2",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 219.0,
- "y": 2
44
.0
+ "y": 2
39
.0
},
"params": 1
},
},
"params": 1
},
@@
-243,7
+255,7
@@
"name": "WireCrossPoint#3",
"pos": {
"x": 224.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 224.0,
- "y": 2
54
.0
+ "y": 2
49
.0
},
"params": 1
},
},
"params": 1
},
@@
-252,7
+264,7
@@
"name": "sel2_4#0",
"pos": {
"x": 235.0,
"name": "sel2_4#0",
"pos": {
"x": 235.0,
- "y": 8
5
.0
+ "y": 8
0
.0
}
},
{
}
},
{
@@
-260,7
+272,7
@@
"name": "sel3_4#0",
"pos": {
"x": 235.0,
"name": "sel3_4#0",
"pos": {
"x": 235.0,
- "y": 1
90
.0
+ "y": 1
85
.0
}
}
],
}
}
],
@@
-290,7
+302,15
@@
"path": [
{
"x": 40.0,
"path": [
{
"x": 40.0,
- "y": 35.0
+ "y": 60.0
+ },
+ {
+ "x": 290.0,
+ "y": 60.0
+ },
+ {
+ "x": 290.0,
+ "y": 115.0
}
]
},
}
]
},
@@
-355,11
+375,11
@@
"path": [
{
"x": 205.0,
"path": [
{
"x": 205.0,
- "y": 17
5
.0
+ "y": 17
0
.0
},
{
"x": 205.0,
},
{
"x": 205.0,
- "y":
100
.0
+ "y":
95
.0
}
]
},
}
]
},
@@
-428,7
+448,7
@@
},
{
"x": 90.0,
},
{
"x": 90.0,
- "y": 2
40
.0
+ "y": 2
35
.0
}
]
},
}
]
},
@@
-481,7
+501,7
@@
"path": [
{
"x": 210.0,
"path": [
{
"x": 210.0,
- "y": 1
50
.0
+ "y": 1
45
.0
}
]
},
}
]
},
@@
-498,7
+518,7
@@
"path": [
{
"x": 215.0,
"path": [
{
"x": 215.0,
- "y": 1
60
.0
+ "y": 1
55
.0
}
]
},
}
]
},
@@
-515,7
+535,7
@@
"path": [
{
"x": 220.0,
"path": [
{
"x": 220.0,
- "y": 1
70
.0
+ "y": 1
65
.0
}
]
},
}
]
},
@@
-532,7
+552,7
@@
"path": [
{
"x": 225.0,
"path": [
{
"x": 225.0,
- "y": 1
80
.0
+ "y": 1
75
.0
}
]
},
}
]
},
@@
-657,11
+677,11
@@
"path": [
{
"x": 200.0,
"path": [
{
"x": 200.0,
- "y": 21
5
.0
+ "y": 21
0
.0
},
{
"x": 200.0,
},
{
"x": 200.0,
- "y": 16
5
.0
+ "y": 16
0
.0
}
]
},
}
]
},
@@
-678,11
+698,11
@@
"path": [
{
"x": 195.0,
"path": [
{
"x": 195.0,
- "y": 20
5
.0
+ "y": 20
0
.0
},
{
"x": 195.0,
},
{
"x": 195.0,
- "y":
90
.0
+ "y":
85
.0
}
]
},
}
]
},
@@
-699,11
+719,11
@@
"path": [
{
"x": 205.0,
"path": [
{
"x": 205.0,
- "y": 18
5
.0
+ "y": 18
0
.0
},
{
"x": 205.0,
},
{
"x": 205.0,
- "y": 20
5
.0
+ "y": 20
0
.0
}
]
},
}
]
},
@@
-721,219
+741,153
@@
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
sel2_4
#0",
- "pinName": "
Y1
"
+ "compName": "
Am2901ALUInclDecode
#0",
+ "pinName": "
F
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode#0
",
- "pinName": "
R1
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
F
"
},
"name": "unnamedWire#32",
},
"name": "unnamedWire#32",
- "path": [
- {
- "x": 275.0,
- "y": 90.0
- },
- {
- "x": 275.0,
- "y": 45.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
sel2_4#0
",
- "pinName": "
Y2
"
+ "compName": "
Splitter#5
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "Am2901ALUInclDecode#0",
},
"pin2": {
"compName": "Am2901ALUInclDecode#0",
- "pinName": "R
2
"
+ "pinName": "R"
},
"name": "unnamedWire#33",
"path": [
{
},
"name": "unnamedWire#33",
"path": [
{
- "x":
28
0.0,
+ "x":
30
0.0,
"y": 100.0
},
{
"y": 100.0
},
{
- "x":
28
0.0,
- "y": 5
5
.0
+ "x":
30
0.0,
+ "y": 5
0
.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
sel2_4#0
",
- "pinName": "
Y
3"
+ "compName": "
Splitter#5
",
+ "pinName": "
O
3"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode
#0",
- "pinName": "
R3
"
+ "compName": "
sel2_4
#0",
+ "pinName": "
Y1
"
},
"name": "unnamedWire#34",
},
"name": "unnamedWire#34",
- "path": [
- {
- "x": 285.0,
- "y": 110.0
- },
- {
- "x": 285.0,
- "y": 65.0
- }
- ]
+ "path": []
},
{
"pin1": {
"compName": "sel2_4#0",
},
{
"pin1": {
"compName": "sel2_4#0",
- "pinName": "Y
4
"
+ "pinName": "Y
2
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode#0
",
- "pinName": "
R4
"
+ "compName": "
Splitter#5
",
+ "pinName": "
O2
"
},
"name": "unnamedWire#35",
},
"name": "unnamedWire#35",
- "path": [
- {
- "x": 290.0,
- "y": 120.0
- },
- {
- "x": 290.0,
- "y": 75.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
sel3_4#0
",
- "pinName": "
Y
1"
+ "compName": "
Splitter#5
",
+ "pinName": "
O
1"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode
#0",
- "pinName": "
S1
"
+ "compName": "
sel2_4
#0",
+ "pinName": "
Y3
"
},
"name": "unnamedWire#36",
},
"name": "unnamedWire#36",
- "path": [
- {
- "x": 295.0,
- "y": 195.0
- },
- {
- "x": 295.0,
- "y": 85.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "sel
3
_4#0",
- "pinName": "Y
2
"
+ "compName": "sel
2
_4#0",
+ "pinName": "Y
4
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode#0
",
- "pinName": "
S2
"
+ "compName": "
Splitter#5
",
+ "pinName": "
O0
"
},
"name": "unnamedWire#37",
},
"name": "unnamedWire#37",
- "path": [
- {
- "x": 300.0,
- "y": 205.0
- },
- {
- "x": 300.0,
- "y": 95.0
- }
- ]
+ "path": []
},
{
"pin1": {
"compName": "sel3_4#0",
},
{
"pin1": {
"compName": "sel3_4#0",
- "pinName": "Y
3
"
+ "pinName": "Y
1
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode#0
",
- "pinName": "
S
3"
+ "compName": "
Splitter#9
",
+ "pinName": "
O
3"
},
"name": "unnamedWire#38",
},
"name": "unnamedWire#38",
- "path": [
- {
- "x": 305.0,
- "y": 215.0
- },
- {
- "x": 305.0,
- "y": 105.0
- }
- ]
+ "path": []
},
{
"pin1": {
"compName": "sel3_4#0",
},
{
"pin1": {
"compName": "sel3_4#0",
- "pinName": "Y
4
"
+ "pinName": "Y
2
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode#0
",
- "pinName": "
S4
"
+ "compName": "
Splitter#9
",
+ "pinName": "
O2
"
},
"name": "unnamedWire#39",
},
"name": "unnamedWire#39",
- "path": [
- {
- "x": 310.0,
- "y": 225.0
- },
- {
- "x": 310.0,
- "y": 115.0
- }
- ]
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "Splitter#
5
",
- "pinName": "O
3
"
+ "compName": "Splitter#
9
",
+ "pinName": "O
1
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode
#0",
- "pinName": "
F4
"
+ "compName": "
sel3_4
#0",
+ "pinName": "
Y3
"
},
"name": "unnamedWire#40",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#40",
"path": []
},
{
"pin1": {
- "compName": "
Splitter#5
",
- "pinName": "
O2
"
+ "compName": "
sel3_4#0
",
+ "pinName": "
Y4
"
},
"pin2": {
},
"pin2": {
- "compName": "
Am2901ALUInclDecode#0
",
- "pinName": "
F3
"
+ "compName": "
Splitter#9
",
+ "pinName": "
O0
"
},
"name": "unnamedWire#41",
"path": []
},
{
"pin1": {
},
"name": "unnamedWire#41",
"path": []
},
{
"pin1": {
- "compName": "Splitter#
5
",
- "pinName": "
O1
"
+ "compName": "Splitter#
9
",
+ "pinName": "
I
"
},
"pin2": {
"compName": "Am2901ALUInclDecode#0",
},
"pin2": {
"compName": "Am2901ALUInclDecode#0",
- "pinName": "
F2
"
+ "pinName": "
S
"
},
"name": "unnamedWire#42",
},
"name": "unnamedWire#42",
- "path": []
- },
- {
- "pin1": {
- "compName": "Am2901ALUInclDecode#0",
- "pinName": "F1"
- },
- "pin2": {
- "compName": "Splitter#5",
- "pinName": "O0"
- },
- "name": "unnamedWire#43",
- "path": []
+ "path": [
+ {
+ "x": 305.0,
+ "y": 205.0
+ },
+ {
+ "x": 305.0,
+ "y": 80.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-944,14
+898,14
@@
"compName": "_submodelinterface",
"pinName": "Cn+4"
},
"compName": "_submodelinterface",
"pinName": "Cn+4"
},
- "name": "unnamedWire#4
4
",
+ "name": "unnamedWire#4
3
",
"path": [
{
"path": [
{
- "x": 36
0
.0,
- "y":
65
.0
+ "x": 36
5
.0,
+ "y":
50
.0
},
{
},
{
- "x": 36
0
.0,
+ "x": 36
5
.0,
"y": 180.0
}
]
"y": 180.0
}
]
@@
-965,14
+919,14
@@
"compName": "_submodelinterface",
"pinName": "OVR"
},
"compName": "_submodelinterface",
"pinName": "OVR"
},
- "name": "unnamedWire#4
5
",
+ "name": "unnamedWire#4
4
",
"path": [
{
"path": [
{
- "x": 3
55
.0,
- "y":
75
.0
+ "x": 3
60
.0,
+ "y":
60
.0
},
{
},
{
- "x": 3
55
.0,
+ "x": 3
60
.0,
"y": 220.0
}
]
"y": 220.0
}
]
@@
-986,7
+940,7
@@
"compName": "Splitter#3",
"pinName": "O0"
},
"compName": "Splitter#3",
"pinName": "O0"
},
- "name": "unnamedWire#4
6
",
+ "name": "unnamedWire#4
5
",
"path": []
},
{
"path": []
},
{
@@
-998,7
+952,7
@@
"compName": "Am2901SourceDecode#0",
"pinName": "I0"
},
"compName": "Am2901SourceDecode#0",
"pinName": "I0"
},
- "name": "unnamedWire#4
7
",
+ "name": "unnamedWire#4
6
",
"path": []
},
{
"path": []
},
{
@@
-1010,7
+964,7
@@
"compName": "Splitter#2",
"pinName": "O1"
},
"compName": "Splitter#2",
"pinName": "O1"
},
- "name": "unnamedWire#4
8
",
+ "name": "unnamedWire#4
7
",
"path": []
},
{
"path": []
},
{
@@
-1022,7
+976,7
@@
"compName": "Splitter#2",
"pinName": "O0"
},
"compName": "Splitter#2",
"pinName": "O0"
},
- "name": "unnamedWire#4
9
",
+ "name": "unnamedWire#4
8
",
"path": []
},
{
"path": []
},
{
@@
-1034,7
+988,7
@@
"compName": "Splitter#1",
"pinName": "I"
},
"compName": "Splitter#1",
"pinName": "I"
},
- "name": "unnamedWire#
50
",
+ "name": "unnamedWire#
49
",
"path": [
{
"x": 215.0,
"path": [
{
"x": 215.0,
@@
-1046,7
+1000,7
@@
},
{
"x": 135.0,
},
{
"x": 135.0,
- "y": 17
5
.0
+ "y": 17
0
.0
}
]
},
}
]
},
@@
-1059,7
+1013,7
@@
"compName": "Am2901ALUInclDecode#0",
"pinName": "I"
},
"compName": "Am2901ALUInclDecode#0",
"pinName": "I"
},
- "name": "unnamedWire#5
1
",
+ "name": "unnamedWire#5
0
",
"path": [
{
"x": 185.0,
"path": [
{
"x": 185.0,
@@
-1071,7
+1025,7
@@
},
{
"x": 240.0,
},
{
"x": 240.0,
- "y": 2
5
.0
+ "y": 2
0
.0
}
]
},
}
]
},
@@
-1084,19
+1038,7
@@
"compName": "_submodelinterface",
"pinName": "I"
},
"compName": "_submodelinterface",
"pinName": "I"
},
- "name": "unnamedWire#52",
- "path": []
- },
- {
- "pin1": {
- "compName": "Splitter#5",
- "pinName": "I"
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "F"
- },
- "name": "unnamedWire#53",
+ "name": "unnamedWire#51",
"path": []
},
{
"path": []
},
{
@@
-1108,7
+1050,7
@@
"compName": "Splitter#4",
"pinName": "I"
},
"compName": "Splitter#4",
"pinName": "I"
},
- "name": "unnamedWire#5
4
",
+ "name": "unnamedWire#5
2
",
"path": [
{
"x": 25.0,
"path": [
{
"x": 25.0,
@@
-1116,7
+1058,7
@@
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y": 12
5
.0
+ "y": 12
0
.0
}
]
},
}
]
},
@@
-1129,7
+1071,7
@@
"compName": "Splitter#7",
"pinName": "O0"
},
"compName": "Splitter#7",
"pinName": "O0"
},
- "name": "unnamedWire#5
5
",
+ "name": "unnamedWire#5
3
",
"path": []
},
{
"path": []
},
{
@@
-1141,8
+1083,17
@@
"compName": "_submodelinterface",
"pinName": "B"
},
"compName": "_submodelinterface",
"pinName": "B"
},
- "name": "unnamedWire#56",
- "path": []
+ "name": "unnamedWire#54",
+ "path": [
+ {
+ "x": 215.0,
+ "y": 275.0
+ },
+ {
+ "x": 215.0,
+ "y": 280.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-1153,7
+1104,7
@@
"compName": "sel3_4#0",
"pinName": "C2"
},
"compName": "sel3_4#0",
"pinName": "C2"
},
- "name": "unnamedWire#5
7
",
+ "name": "unnamedWire#5
5
",
"path": []
},
{
"path": []
},
{
@@
-1165,7
+1116,7
@@
"compName": "sel3_4#0",
"pinName": "C3"
},
"compName": "sel3_4#0",
"pinName": "C3"
},
- "name": "unnamedWire#5
8
",
+ "name": "unnamedWire#5
6
",
"path": []
},
{
"path": []
},
{
@@
-1177,7
+1128,7
@@
"compName": "sel3_4#0",
"pinName": "C4"
},
"compName": "sel3_4#0",
"pinName": "C4"
},
- "name": "unnamedWire#5
9
",
+ "name": "unnamedWire#5
7
",
"path": []
},
{
"path": []
},
{
@@
-1189,8
+1140,17
@@
"compName": "_submodelinterface",
"pinName": "Q"
},
"compName": "_submodelinterface",
"pinName": "Q"
},
- "name": "unnamedWire#60",
- "path": []
+ "name": "unnamedWire#58",
+ "path": [
+ {
+ "x": 215.0,
+ "y": 315.0
+ },
+ {
+ "x": 215.0,
+ "y": 320.0
+ }
+ ]
}
],
"version": "0.1.1"
}
],
"version": "0.1.1"