X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=tests%2Fnet.mograsim.logic.model.am2900.tests%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2FTestGCD.java;h=df4c92a8eb62f1f4f6c61bee440f8102e284665d;hp=a616c114eb66f3a388d14df75d8c029a054eb7ca;hb=b5d55c59d7069171bd928e4a945d9185ee4bc2b0;hpb=f098cd47d06be0cc654532a5fad0e5e89f0ef93c 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 a616c114..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.Am2900ExpertMachineDefinition; 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 @@ -54,7 +54,7 @@ public class TestGCD 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)