projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed GUI to Model:
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
test
/
net
/
mograsim
/
logic
/
model
/
am2900
/
am2901
/
TestableAm2901.java
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
..
d889908
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
@@
-3,8
+3,8
@@
package net.mograsim.logic.model.am2900.am2901;
import java.util.Arrays;
import java.util.stream.Stream;
import java.util.Arrays;
import java.util.stream.Stream;
-import net.mograsim.logic.model.am2900.TestUtil;
import net.mograsim.logic.model.am2900.TestableCircuit;
import net.mograsim.logic.model.am2900.TestableCircuit;
+import net.mograsim.logic.model.am2900.util.TestUtil;
public interface TestableAm2901 extends TestableCircuit
{
public interface TestableAm2901 extends TestableCircuit
{
@@
-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;