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=02a4090d0db64a0508c06d9147419e4e601f9cb6;hpb=91f076c44a4f00786343beb923ab01894672416f;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 02a4090d..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 @@ -24,25 +25,21 @@ class WordAddressableMemoryTest { CoreWire rW = new CoreWire(t, 1, 2); CoreWire data = new CoreWire(t, 16, 2); CoreWire address = new CoreWire(t, 64, 2); - CoreWire clock = new CoreWire(t, 1, 2); ReadWriteEnd rWI = rW.createReadWriteEnd(); ReadWriteEnd dataI = data.createReadWriteEnd(); ReadWriteEnd addressI = address.createReadWriteEnd(); - ReadWriteEnd clockI = clock.createReadWriteEnd(); @SuppressWarnings("unused") - CoreWordAddressableMemory memory = new CoreWordAddressableMemory(t, 4, new WordAddressableMemory(MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE)), data.createReadWriteEnd(), - rW.createReadOnlyEnd(), address.createReadOnlyEnd(), clock.createReadOnlyEnd()); + CoreWordAddressableMemory memory = new CoreWordAddressableMemory(t, 4, + new WordAddressableMemory(MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE)), data.createReadWriteEnd(), + rW.createReadOnlyEnd(), address.createReadOnlyEnd()); - clockI.feedSignals(Bit.ONE); - Random r = new Random(); for (long j = 1; j > 0; j *= 2) { 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();