X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Ftest%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FWordAddressableMemoryTest.java;h=e23ec2d053aa960f2683c7312696ada6bd2e0f3e;hb=52db0db90ba1361e96c0313b6e51817ef4891c49;hp=74aeb3e294794488c932fe7f46ebdc73904ace46;hpb=de4ce44622b2a40c2ff4030467de8f56db917329;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 74aeb3e2..e23ec2d0 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 @@ -10,8 +10,9 @@ import org.junit.jupiter.api.Test; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; -import net.mograsim.logic.core.wires.Wire; -import net.mograsim.logic.core.wires.Wire.ReadWriteEnd; +import net.mograsim.logic.core.wires.CoreWire; +import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; +import net.mograsim.machine.MainMemoryDefinition; class WordAddressableMemoryTest { @@ -20,16 +21,21 @@ class WordAddressableMemoryTest { @Test public void wordAddressableMemoryLargeTest() { - Wire rW = new Wire(t, 1, 2); - Wire data = new Wire(t, 16, 2); - Wire address = new Wire(t, 64, 2); + 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(); - WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, 4096L, Long.MAX_VALUE, data.createReadWriteEnd(), - rW.createReadOnlyEnd(), address.createReadOnlyEnd()); + @SuppressWarnings("unused") + CoreWordAddressableMemory memory = new CoreWordAddressableMemory(t, 4, MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE), data.createReadWriteEnd(), + rW.createReadOnlyEnd(), address.createReadOnlyEnd(), clock.createReadOnlyEnd()); + clockI.feedSignals(Bit.ONE); + Random r = new Random(); for (long j = 1; j > 0; j *= 2) {