X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Ftest%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FWordAddressableMemoryTest.java;h=e3566e3109070c6ae749eeeeda78492e1e98f809;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=1fb59d0e0785fb57282c9307e256cc5d53d2f3f9;hpb=7afd6ddbce7efbded4c37f8abd69e0fb7e5f2983;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 1fb59d0e..e3566e31 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,9 +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.machine.DefaultMainMemoryDefinition;
+import net.mograsim.logic.core.wires.CoreWire;
+import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd;
+import net.mograsim.machine.MainMemoryDefinition;
 
 class WordAddressableMemoryTest {
 	
@@ -21,14 +21,15 @@ 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);
 		ReadWriteEnd rWI = rW.createReadWriteEnd();
 		ReadWriteEnd dataI = data.createReadWriteEnd();
 		ReadWriteEnd addressI = address.createReadWriteEnd();
 
-		WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, new DefaultMainMemoryDefinition(64, 16, 4096L, Long.MAX_VALUE), data.createReadWriteEnd(),
+		@SuppressWarnings("unused")
+		WordAddressableMemoryComponent memory = new WordAddressableMemoryComponent(t, 4, MainMemoryDefinition.create(64, 16, 4096L, Long.MAX_VALUE), data.createReadWriteEnd(),
 				rW.createReadOnlyEnd(), address.createReadOnlyEnd());
 
 		Random r = new Random();