X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Ftest%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FWordAddressableMemoryTest.java;h=9d38b89402d9f82eb6514117d001109b5cd0646f;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=e3566e3109070c6ae749eeeeda78492e1e98f809;hpb=b32414f8406634aca730d724a011023c0da8bf22;p=Mograsim.git diff --git a/net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java b/net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java index e3566e31..9d38b894 100644 --- a/net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java +++ b/net.mograsim.machine/test/net/mograsim/machine/standard/memory/WordAddressableMemoryTest.java @@ -14,8 +14,9 @@ import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.machine.MainMemoryDefinition; -class WordAddressableMemoryTest { - +class WordAddressableMemoryTest +{ + private Timeline t = new Timeline(10); @Test @@ -29,7 +30,8 @@ class WordAddressableMemoryTest { ReadWriteEnd addressI = address.createReadWriteEnd(); @SuppressWarnings("unused") - WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE), data.createReadWriteEnd(), + CoreWordAddressableMemory memory = new CoreWordAddressableMemory(t, 4, + new WordAddressableMemory(MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE)), data.createReadWriteEnd(), rW.createReadOnlyEnd(), address.createReadOnlyEnd()); Random r = new Random(); @@ -38,7 +40,6 @@ class WordAddressableMemoryTest { for (int i = 0; i < 50; i++) { String sAddress = String.format("%64s", BigInteger.valueOf(4096 + i + j).toString(2)).replace(' ', '0'); - sAddress = new StringBuilder(sAddress).reverse().toString(); BitVector bAddress = BitVector.parse(sAddress); addressI.feedSignals(bAddress); t.executeAll();