Added Clock input to CoreWordAddressableMemory

[Mograsim.git] / net.mograsim.machine / src / net / mograsim / machine / standard / memory / WordAddressableMemoryComponent.java

diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryComponent.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryComponent.java
deleted file mode 100644 (file)
index 3c135ec..0000000
--- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryComponent.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package net.mograsim.machine.standard.memory;
-
-import java.util.List;
-
-import net.mograsim.logic.core.components.BasicCoreComponent;
-import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.types.Bit;
-import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
-import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd;
-import net.mograsim.machine.MainMemoryDefinition;
-
-/**
- * A memory component that only allows access to words of a specific width
- */
-public class WordAddressableMemoryComponent extends BasicCoreComponent
-{
-       private final WordAddressableMemory memory;
-       private final static Bit read = Bit.ONE;
-
-       private ReadWriteEnd data;
-       private ReadEnd rWBit, address;
-
-       /**
-        * @param data    The bits of this ReadEnd are the value that is written to/read from memory; The bit width of this wire is the width of
-        *                a memory word
-        * @param rWBit   The value of the 0th bit dictates the mode: 0: Write, 1: Read
-        * @param address The bits of this ReadEnd address the memory cell to read/write
-        */
-       public WordAddressableMemoryComponent(Timeline timeline, int processTime, MainMemoryDefinition definition, ReadWriteEnd data,
-                       ReadEnd rWBit, ReadEnd address)
-       {
-               super(timeline, processTime);
-               if(data.width() != definition.getCellWidth())
-                       throw new IllegalArgumentException(String.format("Bit width of data wire does not match main memory definition. Expected: %d Actual: %d", definition.getCellWidth(), data.width()));
-               if(rWBit.width() != 1)
-                       throw new IllegalArgumentException(String.format("Bit width of read/write mode select wire is unexpected. Expected: 1 Actual: %d", rWBit.width()));
-               if(address.width() != definition.getMemoryAddressBits())
-                       throw new IllegalArgumentException(String.format("Bit width of address wire does not match main memory definition. Expected: %d Actual: %d", definition.getMemoryAddressBits(), address.width()));
-               this.data = data;
-               this.rWBit = rWBit;
-               this.address = address;
-               data.registerObserver(this);
-               rWBit.registerObserver(this);
-               address.registerObserver(this);
-
-               memory = new WordAddressableMemory(definition);
-       }
-
-       @Override
-       protected void compute()
-       {
-               if (!address.hasNumericValue())
-               {
-                       if (read.equals(rWBit.getValue()))
-                               data.feedSignals(Bit.U.toVector(data.width()));
-                       else
-                               data.clearSignals();
-                       return;
-               }
-               long addressed = address.getUnsignedValue();
-               if (read.equals(rWBit.getValue()))
-                       data.feedSignals(memory.getCell(addressed));
-               else
-               {
-                       data.clearSignals();
-                       memory.setCell(addressed, data.getValues());
-               }
-       }
-
-       @Override
-       public List<ReadEnd> getAllInputs()
-       {
-               return List.of(data, rWBit, address);
-       }
-
-       @Override
-       public List<ReadWriteEnd> getAllOutputs()
-       {
-               return List.of(data);
-       }
-}
\ No newline at end of file