X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2FTestGCD.java;h=df4c92a8eb62f1f4f6c61bee440f8102e284665d;hb=76a3b85c9f04a12244f3a9384b41017680bc9e2d;hp=080e6f331e7db237a314f2fb39750bbb1b0acfe4;hpb=590c4809a069b0d30529735bf58f0db5382f8a88;p=Mograsim.git

diff --git a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/TestGCD.java b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/TestGCD.java
index 080e6f33..df4c92a8 100644
--- a/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/TestGCD.java
+++ b/tests/net.mograsim.logic.model.am2900.tests/src/net/mograsim/logic/model/am2900/TestGCD.java
@@ -18,14 +18,15 @@ import org.junit.jupiter.params.provider.MethodSource;
 
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.model.LogicUIStandaloneGUI;
+import net.mograsim.logic.model.am2900.machine.Am2900ExpertMachineDefinition;
 import net.mograsim.logic.model.am2900.machine.Am2900Machine;
 import net.mograsim.logic.model.am2900.machine.Am2900MainMemoryDefinition;
 import net.mograsim.logic.model.am2900.machine.Am2900MicroInstructionDefinition;
 import net.mograsim.logic.model.am2900.machine.Am2900MicroInstructionMemoryDefinition;
-import net.mograsim.logic.model.am2900.machine.StrictAm2900MachineDefinition;
 import net.mograsim.logic.model.am2900.machine.registers.am2901.NumberedRegister;
 import net.mograsim.logic.model.preferences.DefaultRenderPreferences;
 import net.mograsim.machine.MainMemory;
+import net.mograsim.machine.StandardMainMemory;
 import net.mograsim.machine.mi.MicroInstruction;
 import net.mograsim.machine.mi.MicroInstructionDefinition;
 import net.mograsim.machine.mi.MicroInstructionMemory;
@@ -33,7 +34,6 @@ import net.mograsim.machine.mi.MicroInstructionMemoryParser;
 import net.mograsim.machine.mi.StandardMicroInstructionMemory;
 import net.mograsim.machine.mi.parameters.MicroInstructionParameter;
 import net.mograsim.machine.mi.parameters.ParameterClassification;
-import net.mograsim.machine.standard.memory.WordAddressableMemory;
 
 @TestInstance(Lifecycle.PER_CLASS)
 public class TestGCD
@@ -51,10 +51,10 @@ public class TestGCD
 	public void setupMachine() throws IOException
 	{
 		Am2900Loader.setup();
-		mach = new StrictAm2900MachineDefinition().createNew();
+		mach = new Am2900ExpertMachineDefinition().createNew();
 		mpm = MicroInstructionMemoryParser.parseMemory(Am2900MicroInstructionMemoryDefinition.instance,
 				TestGCD.class.getResourceAsStream("gcd.mpm"));
-		ram = new WordAddressableMemory(Am2900MainMemoryDefinition.instance);
+		ram = new StandardMainMemory(Am2900MainMemoryDefinition.instance);
 		mach.getMainMemory().bind(ram);
 
 		if (startGUI)
@@ -114,6 +114,7 @@ public class TestGCD
 		checkGCD(48820, 8480);
 		checkGCD(21420, 11288);
 		checkGCD(15862, 21219);
+		checkGCD(15525, 57040);
 	}
 
 	@ParameterizedTest
@@ -133,7 +134,7 @@ public class TestGCD
 	private void checkGCD(int euclidA, int euclidB) throws InterruptedException
 	{
 		int exp = gcd(euclidA, euclidB);
-		System.out.println("Checking gcd(" + euclidA + ", " + euclidB + ") + (expected " + exp + ")");
+		System.out.println("Checking gcd(" + euclidA + ", " + euclidB + "); expected " + exp);
 		int act = executeGCD(euclidA, euclidB);
 		assertEquals(exp, act);
 	}