projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6d3f589
)
made the test enums package private to avoid confusion and mistakes
author
Christian Femers
<femers@in.tum.de>
Mon, 2 Sep 2019 01:22:50 +0000
(
03:22
+0200)
committer
Christian Femers
<femers@in.tum.de>
Mon, 2 Sep 2019 01:22:50 +0000
(
03:22
+0200)
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java
patch
|
blob
|
history
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java
patch
|
blob
|
history
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java
b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java
index
34c179d
..
ba915b3
100644
(file)
--- a/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java
+++ b/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901.java
@@
-59,7
+59,7
@@
public interface TestableAm2901 extends TestableCircuit
String getDirectly(Register r);
String getDirectly(Register r);
-
public
enum Am2901_Dest
+ enum Am2901_Dest
{
QREG, NOP, RAMA, RAMF, RAMQD, RAMD, RAMQU, RAMU;
{
QREG, NOP, RAMA, RAMF, RAMQD, RAMD, RAMQU, RAMU;
@@
-79,17
+79,17
@@
public interface TestableAm2901 extends TestableCircuit
}
}
}
}
-
public
enum Am2901_Func
+ enum Am2901_Func
{
ADD, SUBR, SUBS, OR, AND, NOTRS, EXOR, EXNOR;
}
{
ADD, SUBR, SUBS, OR, AND, NOTRS, EXOR, EXNOR;
}
-
public
enum Am2901_Src
+ enum Am2901_Src
{
AQ, AB, ZQ, ZB, ZA, DA, DQ, DZ;
}
{
AQ, AB, ZQ, ZB, ZA, DA, DQ, DZ;
}
-
public
enum Register
+ enum Register
{
r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, rA, rB, rC, rD, rE, rF, Q;
{
r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, rA, rB, rC, rD, rE, rF, Q;
diff --git
a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java
b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java
index
c10672d
..
d9c9233
100644
(file)
--- a/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java
+++ b/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904.java
@@
-85,12
+85,12
@@
public interface TestableAm2904 extends TestableCircuit
String getQIO3();
String getQIO3();
-
public
enum Am2904_ShiftDir
+ enum Am2904_ShiftDir
{
RIGHT, LEFT;
}
{
RIGHT, LEFT;
}
-
public
enum Am2904_Carry
+ enum Am2904_Carry
{
CI0, CI1, CX, USE_SR;
}
{
CI0, CI1, CX, USE_SR;
}
@@
-104,7
+104,7
@@
public interface TestableAm2904 extends TestableCircuit
* <li>condCode = the boolean term defining the CT output</li>
* </ul>
*/
* <li>condCode = the boolean term defining the CT output</li>
* </ul>
*/
-
public
enum Am2904_Inst
+ enum Am2904_Inst
{
// @formatter:off
LoadM_LoadY_µ_NxorOVRorZ(0_00),
{
// @formatter:off
LoadM_LoadY_µ_NxorOVRorZ(0_00),
diff --git
a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java
b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java
index
fa34760
..
115f9cb
100644
(file)
--- a/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java
+++ b/
net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910.java
@@
-29,7
+29,7
@@
public interface TestableAm2910 extends TestableCircuit
String get_VECT();
String get_VECT();
-
public
enum Am2910_Inst
+ enum Am2910_Inst
{
JZ, CJS, JMAP, CJP, PUSH, JSRP, CJV, JRP, RFCT, RPCT, CRTN, CJPP, LDCT, LOOP, CONT, TWB;
}
{
JZ, CJS, JMAP, CJP, PUSH, JSRP, CJV, JRP, RFCT, RPCT, CRTN, CJPP, LDCT, LOOP, CONT, TWB;
}