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 causing CoreMemories using their own memories
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
Am2904Testbench.json
diff --git
a/net.mograsim.logic.model.am2900/Am2904Testbench.json
b/net.mograsim.logic.model.am2900/Am2904Testbench.json
index
eddb94b
..
c7bec19
100644
(file)
--- a/
net.mograsim.logic.model.am2900/Am2904Testbench.json
+++ b/
net.mograsim.logic.model.am2900/Am2904Testbench.json
@@
-455,13
+455,16
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
Merg
er",
+ "id": "
Splitt
er",
"name": "Merger#0",
"pos": {
"x": 85.0,
"y": 130.0
},
"name": "Merger#0",
"pos": {
"x": 85.0,
"y": 130.0
},
- "params": 13
+ "params": {
+ "logicWidth": 13,
+ "orientation": "LEFT"
+ }
},
{
"id": "TextComponent",
},
{
"id": "TextComponent",
@@
-1004,8
+1007,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
- "x": 18
5
.0,
- "y": 36
5
.0
+ "x": 18
4
.0,
+ "y": 36
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-1013,8
+1016,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
- "x": 18
5
.0,
- "y": 3
10
.0
+ "x": 18
4
.0,
+ "y": 3
09
.0
},
"params": 1
},
},
"params": 1
},
@@
-1022,8
+1025,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
- "x": 3
70
.0,
- "y": 17
5
.0
+ "x": 3
69
.0,
+ "y": 17
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-1031,8
+1034,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
- "x": 37
5
.0,
- "y": 1
90
.0
+ "x": 37
4
.0,
+ "y": 1
89
.0
},
"params": 1
},
},
"params": 1
},
@@
-1040,8
+1043,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
- "x": 3
80
.0,
- "y":
200
.0
+ "x": 3
79
.0,
+ "y":
199
.0
},
"params": 1
},
},
"params": 1
},
@@
-1049,8
+1052,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
- "x": 2
10
.0,
- "y": 32
5
.0
+ "x": 2
09
.0,
+ "y": 32
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-1058,8
+1061,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
- "x": 21
5
.0,
- "y": 3
40
.0
+ "x": 21
4
.0,
+ "y": 3
39
.0
},
"params": 1
},
},
"params": 1
},
@@
-1067,8
+1070,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
- "x": 35
5
.0,
- "y": 3
80
.0
+ "x": 35
4
.0,
+ "y": 3
79
.0
},
"params": 1
},
},
"params": 1
},
@@
-1076,8
+1079,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
- "x": 3
60
.0,
- "y": 3
90
.0
+ "x": 3
59
.0,
+ "y": 3
89
.0
},
"params": 1
},
},
"params": 1
},
@@
-1085,8
+1088,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
- "x": 34
5
.0,
- "y": 8
5
.0
+ "x": 34
4
.0,
+ "y": 8
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-1094,8
+1097,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
- "x": 3
60
.0,
- "y": 1
10
.0
+ "x": 3
59
.0,
+ "y": 1
09
.0
},
"params": 1
},
},
"params": 1
},
@@
-1103,8
+1106,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
- "x": 3
60
.0,
- "y": 12
5
.0
+ "x": 3
59
.0,
+ "y": 12
4
.0
},
"params": 1
},
},
"params": 1
},
@@
-1112,8
+1115,8
@@
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
- "x": 36
5
.0,
- "y": 1
60
.0
+ "x": 36
4
.0,
+ "y": 1
59
.0
},
"params": 1
}
},
"params": 1
}
@@
-1202,7
+1205,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
O
"
+ "pinName": "
I
"
},
"pin2": {
"compName": "Am2904#0",
},
"pin2": {
"compName": "Am2904#0",
@@
-1765,7
+1768,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
12"
+ "pinName": "
O
12"
},
"name": "unnamedWire#42",
"path": []
},
"name": "unnamedWire#42",
"path": []
@@
-1773,7
+1776,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
11"
+ "pinName": "
O
11"
},
"pin2": {
"compName": "ManualSwitch#13",
},
"pin2": {
"compName": "ManualSwitch#13",
@@
-1789,7
+1792,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
10"
+ "pinName": "
O
10"
},
"name": "unnamedWire#44",
"path": []
},
"name": "unnamedWire#44",
"path": []
@@
-1797,7
+1800,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
9"
+ "pinName": "
O
9"
},
"pin2": {
"compName": "ManualSwitch#22",
},
"pin2": {
"compName": "ManualSwitch#22",
@@
-1813,7
+1816,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
8"
+ "pinName": "
O
8"
},
"name": "unnamedWire#46",
"path": []
},
"name": "unnamedWire#46",
"path": []
@@
-1821,7
+1824,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
7"
+ "pinName": "
O
7"
},
"pin2": {
"compName": "ManualSwitch#23",
},
"pin2": {
"compName": "ManualSwitch#23",
@@
-1837,7
+1840,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
6"
+ "pinName": "
O
6"
},
"name": "unnamedWire#48",
"path": []
},
"name": "unnamedWire#48",
"path": []
@@
-1845,7
+1848,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
5"
+ "pinName": "
O
5"
},
"pin2": {
"compName": "ManualSwitch#26",
},
"pin2": {
"compName": "ManualSwitch#26",
@@
-1882,7
+1885,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
4"
+ "pinName": "
O
4"
},
"name": "unnamedWire#50",
"path": []
},
"name": "unnamedWire#50",
"path": []
@@
-1890,7
+1893,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
3"
+ "pinName": "
O
3"
},
"pin2": {
"compName": "ManualSwitch#30",
},
"pin2": {
"compName": "ManualSwitch#30",
@@
-1906,7
+1909,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
2"
+ "pinName": "
O
2"
},
"name": "unnamedWire#52",
"path": []
},
"name": "unnamedWire#52",
"path": []
@@
-1914,7
+1917,7
@@
{
"pin1": {
"compName": "Merger#0",
{
"pin1": {
"compName": "Merger#0",
- "pinName": "
I
1"
+ "pinName": "
O
1"
},
"pin2": {
"compName": "ManualSwitch#27",
},
"pin2": {
"compName": "ManualSwitch#27",
@@
-1930,7
+1933,7
@@
},
"pin2": {
"compName": "Merger#0",
},
"pin2": {
"compName": "Merger#0",
- "pinName": "
I
0"
+ "pinName": "
O
0"
},
"name": "unnamedWire#54",
"path": []
},
"name": "unnamedWire#54",
"path": []