projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
62ee1cb
)
Fixed crooked Wires and swapped I3 and I4 in Am901ALUInclSource...
author
Fabian Stemmler
<stemmler@in.tum.de>
Tue, 10 Sep 2019 15:41:55 +0000
(17:41 +0200)
committer
Fabian Stemmler
<stemmler@in.tum.de>
Tue, 10 Sep 2019 15:41:55 +0000
(17:41 +0200)
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index
794cf08
..
1374a06
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@
-407,8
+407,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x": 1
5
.0,
- "y": 71
5
.0
+ "x": 1
4
.0,
+ "y": 71
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-605,8
+605,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
- "x": 25
5
.0,
- "y": 7
50
.0
+ "x": 25
4
.0,
+ "y": 7
49
.0
},
"params": 1
},
},
"params": 1
},
@@
-713,7
+713,7
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#40",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#40",
"pos": {
- "x": 41
5
.0,
+ "x": 41
4
.0,
"y": 449.0
},
"params": 1
"y": 449.0
},
"params": 1
@@
-722,8
+722,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#41",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#41",
"pos": {
- "x": 10
5
.0,
- "y": 96
5
.0
+ "x": 10
4
.0,
+ "y": 96
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-2803,11
+2803,11
@@
},
{
"x": 800.0,
},
{
"x": 800.0,
- "y": 6
05
.0
+ "y": 6
10
.0
},
{
},
{
- "x": 5
6
5.0,
- "y": 6
05
.0
+ "x": 5
7
5.0,
+ "y": 6
10
.0
}
]
},
}
]
},
@@
-3122,11
+3122,11
@@
},
{
"x": 795.0,
},
{
"x": 795.0,
- "y": 6
10
.0
+ "y": 6
05
.0
},
{
},
{
- "x": 5
7
5.0,
- "y": 6
10
.0
+ "x": 5
6
5.0,
+ "y": 6
05
.0
}
]
},
}
]
},
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
index
3531aae
..
e20344e
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json
@@
-193,7
+193,7
@@
},
{
"location": {
},
{
"location": {
- "x":
6
5.0,
+ "x":
5
5.0,
"y": 0.0
},
"name": "I3",
"y": 0.0
},
"name": "I3",
@@
-202,7
+202,7
@@
},
{
"location": {
},
{
"location": {
- "x":
5
5.0,
+ "x":
6
5.0,
"y": 0.0
},
"name": "I4",
"y": 0.0
},
"name": "I4",
@@
-287,8
+287,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x": 21
5
.0,
- "y": 22
5
.0
+ "x": 21
4
.0,
+ "y": 22
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-296,8
+296,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
- "x": 2
20
.0,
- "y": 23
5
.0
+ "x": 2
19
.0,
+ "y": 23
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-305,8
+305,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
- "x": 22
5
.0,
- "y": 24
5
.0
+ "x": 22
4
.0,
+ "y": 24
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-314,8
+314,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
- "x": 2
30
.0,
- "y": 25
5
.0
+ "x": 2
29
.0,
+ "y": 25
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-576,7
+576,7
@@
"name": "unnamedWire#2",
"path": [
{
"name": "unnamedWire#2",
"path": [
{
- "x": 2
6
0.0,
+ "x": 2
2
0.0,
"y": 40.0
}
]
"y": 40.0
}
]
@@
-1216,7
+1216,7
@@
"name": "unnamedWire#50",
"path": [
{
"name": "unnamedWire#50",
"path": [
{
- "x": 2
2
0.0,
+ "x": 2
6
0.0,
"y": 30.0
}
]
"y": 30.0
}
]