projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a9a490a
)
Changed BitVectorSplittingAtomicHighLevelStateHandler's part order
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 11 Sep 2019 16:46:50 +0000
(18:46 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 11 Sep 2019 16:46:50 +0000
(18:46 +0200)
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
patch
|
blob
|
history
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
index
fe18cf1
..
99b9a91
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json
@@
-680,10
+680,10
@@
"id": "bitVectorSplitting",
"params": {
"vectorPartTargets": [
"id": "bitVectorSplitting",
"params": {
"vectorPartTargets": [
- "q1",
- "q2",
+ "q4",
"q3",
"q3",
- "q4"
+ "q2",
+ "q1"
],
"vectorPartLengthes": [
1,
],
"vectorPartLengthes": [
1,
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
index
7615dc7
..
9a18841
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json
@@
-689,10
+689,10
@@
"id": "bitVectorSplitting",
"params": {
"vectorPartTargets": [
"id": "bitVectorSplitting",
"params": {
"vectorPartTargets": [
- "q1",
- "q2",
+ "q4",
"q3",
"q3",
- "q4"
+ "q2",
+ "q1"
],
"vectorPartLengthes": [
1,
],
"vectorPartLengthes": [
1,
diff --git
a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
index
c85ca3c
..
87f5370
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
+++ b/
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
@@
-358,10
+358,10
@@
"id": "bitVectorSplitting",
"params": {
"vectorPartTargets": [
"id": "bitVectorSplitting",
"params": {
"vectorPartTargets": [
- "q1",
- "q2",
+ "q4",
"q3",
"q3",
- "q4"
+ "q2",
+ "q1"
],
"vectorPartLengthes": [
1,
],
"vectorPartLengthes": [
1,
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
index
4b9e2d6
..
443f847
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/BitVectorSplittingAtomicHighLevelStateHandler.java
@@
-92,7
+92,7
@@
public class BitVectorSplittingAtomicHighLevelStateHandler implements AtomicHigh
if (vectorPart.length() != vectorPartLengthes.get(partIndex))
throw new IllegalArgumentException(
"Incorrect vector part length: " + vectorPart.length() + "; expected " + vectorPartLengthes.get(partIndex));
if (vectorPart.length() != vectorPartLengthes.get(partIndex))
throw new IllegalArgumentException(
"Incorrect vector part length: " + vectorPart.length() + "; expected " + vectorPartLengthes.get(partIndex));
- result =
vectorPart.concat(resul
t);
+ result =
result.concat(vectorPar
t);
}
return result;
}
}
return result;
}
@@
-103,7
+103,7
@@
public class BitVectorSplittingAtomicHighLevelStateHandler implements AtomicHigh
BitVector newStateCasted = (BitVector) newState;
if (newStateCasted.length() != length)
throw new IllegalArgumentException("Incorrect vector length: " + newStateCasted.length() + "; expected " + length);
BitVector newStateCasted = (BitVector) newState;
if (newStateCasted.length() != length)
throw new IllegalArgumentException("Incorrect vector length: " + newStateCasted.length() + "; expected " + length);
- for (int partIndex =
vectorPartTargets.size() - 1, bitIndex = 0; partIndex >= 0; partIndex--
)
+ for (int partIndex =
0, bitIndex = 0; partIndex < vectorPartTargets.size(); partIndex++
)
{
int vectorPartLength = vectorPartLengthes.get(partIndex);
BitVector vectorPart = newStateCasted.subVector(bitIndex, bitIndex + vectorPartLength);
{
int vectorPartLength = vectorPartLengthes.get(partIndex);
BitVector vectorPart = newStateCasted.subVector(bitIndex, bitIndex + vectorPartLength);