Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[Mograsim.git] / net.mograsim.machine / test / net / mograsim / machine / standard / memory / WordAddressableMemoryTest.java

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 e23ec2d..9d38b89 100644 (file)
--- 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, 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();