X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fui%2Fam2900%2FAm2901Test.java;fp=net.mograsim.logic.ui.am2900%2Ftest%2Fnet%2Fmograsim%2Flogic%2Fui%2Fam2900%2FAm2901Test.java;h=55f2b85b562e567b1a1aada57d5f85987205f5ed;hb=e4a201cb63e74fb7780dae482e2fc953bee58fa5;hp=18d60c3b899731bfc77f6a4f899191f654e63276;hpb=443acaf4a6470adf66a73cf0443852ce3843ebe2;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Test.java b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Test.java
index 18d60c3b..55f2b85b 100644
--- a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Test.java
+++ b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Test.java
@@ -1,15 +1,26 @@
 package net.mograsim.logic.ui.am2900;
 
+import static net.mograsim.logic.ui.am2900.TestUtil.*;
 import static net.mograsim.logic.ui.am2900.TestableAm2901.Am2901_Dest.*;
 import static net.mograsim.logic.ui.am2900.TestableAm2901.Am2901_Func.*;
 import static net.mograsim.logic.ui.am2900.TestableAm2901.Am2901_Src.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static net.mograsim.logic.ui.am2900.TestableAm2901.Register.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.awt.Point;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+import net.mograsim.logic.ui.am2900.TestableAm2901.Register;
 
-import net.mograsim.logic.ui.am2900.TestableAm2901.Result;
-
+@TestMethodOrder(OrderAnnotation.class)
 public class Am2901Test
 {
 	private TestableAm2901 am2901;
@@ -18,21 +29,7 @@ public class Am2901Test
 	void initialize()
 	{
 		createAndSetup();
-		setRegistersToZero();
-	}
-
-	@Test
-	void testInit()
-	{
-		assertEquals("0", am2901.getCarryOut());
-		assertEquals("0", am2901.getOverflow());
-		assertEquals("0", am2901.getSign());
-		assertEquals("1", am2901.getZero());
-		assertEquals("0000", am2901.getY());
-		assertEquals("0", am2901.getQ_0());
-		assertEquals("0", am2901.getQ_3());
-		assertEquals("0", am2901.getRAM_0());
-		assertEquals("0", am2901.getRAM_3());
+		setInputsToZero();
 	}
 
 	void createAndSetup()
@@ -44,19 +41,27 @@ public class Am2901Test
 	void setRegistersToZero()
 	{
 		setInputsToZero();
-		for (Regsiter r : Regsiter.values())
+		for (Register r : Register.values())
 		{
 			setRegisterToZero(r);
 		}
 	}
 
-	void setRegisterToZero(Regsiter r)
+	void setRegisterToZero(Register r)
 	{
 		System.out.println("Setting reg " + r + " to zero");
+
 		am2901.setD("0000");
 		am2901.setSrc(DZ);
 		am2901.setFunc(AND);
-		if (r == Regsiter.Q)
+		setRegOutput(r);
+
+		am2901.assertFullCycleSuccess();
+	}
+
+	void setRegOutput(Register r)
+	{
+		if (r == Q)
 		{
 			am2901.setDest(QREG);
 		} else
@@ -64,11 +69,6 @@ public class Am2901Test
 			am2901.setReg_B(r.toBitString());
 			am2901.setDest(RAMF);
 		}
-		assertRunSuccess();
-		am2901.toogleClock();
-		assertRunSuccess();
-		am2901.toogleClock();
-		assertRunSuccess();
 	}
 
 	void setInputsToZero()
@@ -85,23 +85,210 @@ public class Am2901Test
 		am2901.setFunc(ADD);
 		am2901.setDest(QREG);
 //		am2901.setNotOutEnable("0"); TODO
-		assertRunSuccess();
+		am2901.clockOn(true);
+		am2901.assertRunSuccess();
 	}
 
-	void assertRunSuccess()
+	@Order(1)
+	@ParameterizedTest
+	@ArgumentsSource(TestableAm2901.RegisterProvider.class)
+	void testDirectAccess(Register r)
 	{
-		assertEquals(Result.SUCCESS, am2901.run());
+		assertEquals("UUUU", am2901.getDirectly(r));
+
+		am2901.setDirectly(r, "1011");
+
+		assertEquals("1011", am2901.getDirectly(r));
 	}
 
-	public enum Regsiter
+	@Order(2)
+	@ParameterizedTest
+	@ArgumentsSource(TestableAm2901.RegisterProvider.class)
+	void testSetToZero(Register r)
 	{
-		r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, rA, rB, rC, rD, rE, rF, Q;
+		assertEquals("UUUU", am2901.getDirectly(r));
+
+		setRegisterToZero(r);
 
-		public String toBitString()
+		assertEquals("0000", am2901.getDirectly(r));
+		assertEquals("0000", am2901.getY());
+		assertEquals("0", am2901.getCarryOut());
+		assertEquals("0", am2901.getOverflow());
+		assertEquals("0", am2901.getSign());
+		assertEquals("1", am2901.getZero());
+	}
+
+	@Order(3)
+	@Test
+	void testSetAllToZero()
+	{
+		setRegistersToZero();
+
+		assertEquals("0000", am2901.getY());
+		assertEquals("0", am2901.getCarryOut());
+		assertEquals("0", am2901.getOverflow());
+		assertEquals("0", am2901.getSign());
+		assertEquals("1", am2901.getZero());
+		assertEquals("0", am2901.getQ_0());
+		assertEquals("0", am2901.getQ_3());
+		assertEquals("0", am2901.getRAM_0());
+		assertEquals("0", am2901.getRAM_3());
+
+		assertAll("register values", Register.stream().map(r -> () ->
 		{
-			if (this.ordinal() > 0xF)
-				throw new UnsupportedOperationException();
-			return TestUtil.to4bitBin(this.ordinal());
-		}
+			assertEquals("0000", am2901.getDirectly(r), r.name());
+		}));
+	}
+
+	@Order(4)
+	@Test
+	void testADD()
+	{
+		am2901.setSrc(DA);
+		am2901.setFunc(ADD);
+		am2901.setDest(NOP);
+		am2901.setReg_A(r0.toBitString());
+
+		assertAll(getAll4BitPairs().map(xy -> () ->
+		{
+			am2901.setDirectly(r0, to4bitBin(xy.x));
+			am2901.setD(to4bitBin(xy.y));
+
+			am2901.assertFullCycleSuccess();
+
+			int res32Bit = xy.x + xy.y;
+			int res4Bit = res32Bit & 0b1111;
+			int res32Bit_sgn = signed4ToSigned32(xy.x) + signed4ToSigned32(xy.y);
+			int res4Bit_sgn = signed4ToSigned32(res32Bit_sgn);
+
+			String desc = xy.x + " + " + xy.y + " = " + res4Bit + ": ";
+
+			assertEquals(to4bitBin(res4Bit & 0b1111), am2901.getY(), desc + "Y");
+			assertEquals(to1bitBin(res4Bit == 0), am2901.getZero(), desc + "F=0");
+			assertEquals(to1bitBin(res4Bit & 0b1000), am2901.getSign(), desc + "F3");
+			assertEquals(to1bitBin(res32Bit & 0b1_0000), am2901.getCarryOut(), desc + "Cn+4");
+			assertEquals(to1bitBin(res4Bit_sgn != res32Bit_sgn), am2901.getOverflow(), desc + "OVR");
+		}));
+	}
+
+	@Order(4)
+	@Test
+	void testAND()
+	{
+		am2901.setSrc(DA);
+		am2901.setFunc(AND);
+		am2901.setDest(NOP);
+		am2901.setReg_A(r0.toBitString());
+
+		assertAll(getAll4BitPairs().map(xy -> () ->
+		{
+			am2901.setDirectly(r0, to4bitBin(xy.x));
+			am2901.setD(to4bitBin(xy.y));
+
+			am2901.assertFullCycleSuccess();
+
+			int res32Bit = xy.x & xy.y;
+
+			String desc = xy.x + " & " + xy.y + " = " + res32Bit + ": ";
+
+			assertEquals(to4bitBin(res32Bit), am2901.getY(), desc + "Y");
+			assertEquals(to1bitBin(res32Bit == 0), am2901.getZero(), desc + "F=0");
+			assertEquals(to1bitBin(res32Bit & 0b1000), am2901.getSign(), desc + "F3");
+//			assertEquals(to1bitBin(res32Bit), am2901.getCarryOut(), desc + "Cn+4"); // TODO
+//			assertEquals(to1bitBin(res32Bit), am2901.getOverflow(), desc + "OVR"); // TODO
+		}));
+	}
+
+	@Order(4)
+	@Test
+	void testOR()
+	{
+		am2901.setSrc(DA);
+		am2901.setFunc(OR);
+		am2901.setDest(NOP);
+		am2901.setReg_A(r0.toBitString());
+
+		assertAll(getAll4BitPairs().map(xy -> () ->
+		{
+			am2901.setDirectly(r0, to4bitBin(xy.x));
+			am2901.setD(to4bitBin(xy.y));
+
+			am2901.assertFullCycleSuccess();
+
+			int res32Bit = xy.x | xy.y;
+
+			String desc = xy.x + " | " + xy.y + " = " + res32Bit + ": ";
+
+			assertEquals(to4bitBin(res32Bit), am2901.getY(), desc + "Y");
+			assertEquals(to1bitBin(res32Bit == 0), am2901.getZero(), desc + "F=0");
+			assertEquals(to1bitBin(res32Bit & 0b1000), am2901.getSign(), desc + "F3");
+//			assertEquals(to1bitBin(res32Bit != 0b1111), am2901.getCarryOut(), desc + "Cn+4"); // TODO
+//			assertEquals(to1bitBin(res32Bit != 0b1111), am2901.getOverflow(), desc + "OVR"); // TODO
+		}));
+	}
+
+	@Order(4)
+	@Test
+	void testXOR()
+	{
+		am2901.setSrc(DA);
+		am2901.setFunc(EXOR);
+		am2901.setDest(NOP);
+		am2901.setReg_A(r0.toBitString());
+
+		assertAll(getAll4BitPairs().map(xy -> () ->
+		{
+			am2901.setDirectly(r0, to4bitBin(xy.x));
+			am2901.setD(to4bitBin(xy.y));
+
+			am2901.assertFullCycleSuccess();
+
+			int res32Bit = xy.x ^ xy.y;
+
+			String desc = xy.x + " ^ " + xy.y + " = " + res32Bit + ": ";
+
+			assertEquals(to4bitBin(res32Bit), am2901.getY(), desc + "Y");
+			assertEquals(to1bitBin(res32Bit == 0), am2901.getZero(), desc + "F=0");
+			assertEquals(to1bitBin(res32Bit & 0b1000), am2901.getSign(), desc + "F3");
+//			assertEquals(to1bitBin(res32Bit != 0b1111), am2901.getCarryOut(), desc + "Cn+4"); // TODO
+//			assertEquals(to1bitBin(res32Bit != 0b1111), am2901.getOverflow(), desc + "OVR"); // TODO
+		}));
+	}
+
+	@Order(4)
+	@Test
+	void testSUB()
+	{
+		am2901.setSrc(DA);
+		am2901.setCarryIn("1");
+		am2901.setFunc(SUBR);
+		am2901.setDest(NOP);
+		am2901.setReg_A(r0.toBitString());
+
+		assertAll(getAll4BitPairs().map(xy -> () ->
+		{
+			am2901.setDirectly(r0, to4bitBin(xy.x));
+			am2901.setD(to4bitBin(xy.y));
+
+			am2901.assertFullCycleSuccess();
+
+			int res32Bit = xy.x - xy.y;
+			int res4Bit = res32Bit & 0b1111;
+			int res32Bit_sgn = signed4ToSigned32(xy.x) - signed4ToSigned32(xy.y);
+			int res4Bit_sgn = signed4ToSigned32(res32Bit_sgn);
+
+			String desc = xy.x + " - " + xy.y + " = " + res4Bit + ": ";
+
+			assertEquals(to4bitBin(res4Bit & 0b1111), am2901.getY(), desc + "Y");
+			assertEquals(to1bitBin(res4Bit == 0), am2901.getZero(), desc + "F=0");
+			assertEquals(to1bitBin(res4Bit & 0b1000), am2901.getSign(), desc + "F3");
+			assertEquals(to1bitBin(xy.x >= xy.y), am2901.getCarryOut(), desc + "Cn+4");
+			assertEquals(to1bitBin(res4Bit_sgn != res32Bit_sgn), am2901.getOverflow(), desc + "OVR");
+		}));
+	}
+
+	static Stream<Point> getAll4BitPairs()
+	{
+		return IntStream.range(0, 16).boxed().flatMap(x -> IntStream.range(0, 16).mapToObj(y -> new Point(x, y)));
 	}
 }