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=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..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
@@ -10,24 +10,28 @@ 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
+{
 
-class WordAddressableMemoryTest {
-	
 	private Timeline t = new Timeline(10);
 
 	@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);
 		ReadWriteEnd rWI = rW.createReadWriteEnd();
 		ReadWriteEnd dataI = data.createReadWriteEnd();
 		ReadWriteEnd addressI = address.createReadWriteEnd();
 
-		WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, 4096L, Long.MAX_VALUE, data.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());
 
 		Random r = new Random();
@@ -36,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();