From: Christian Femers Date: Mon, 2 Sep 2019 01:22:50 +0000 (+0200) Subject: made the test enums package private to avoid confusion and mistakes X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=25b455d400c8f7e5c7ece19e3c64cf80c106ac3d made the test enums package private to avoid confusion and mistakes --- 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 34c179da..ba915b30 100644 --- 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); - public enum Am2901_Dest + enum Am2901_Dest { 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; } - public enum Am2901_Src + enum Am2901_Src { 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; 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 c10672d2..d9c92339 100644 --- 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(); - public enum Am2904_ShiftDir + enum Am2904_ShiftDir { RIGHT, LEFT; } - public enum Am2904_Carry + enum Am2904_Carry { CI0, CI1, CX, USE_SR; } @@ -104,7 +104,7 @@ public interface TestableAm2904 extends TestableCircuit *
  • condCode = the boolean term defining the CT output
  • * */ - public enum Am2904_Inst + enum Am2904_Inst { // @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 fa347606..115f9cb5 100644 --- 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(); - public enum Am2910_Inst + enum Am2910_Inst { JZ, CJS, JMAP, CJP, PUSH, JSRP, CJV, JRP, RFCT, RPCT, CRTN, CJPP, LDCT, LOOP, CONT, TWB; }