X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FWordAddressableMemory.java;h=3dddc2edaabc704bdb17f769224187d7dade2b0b;hb=fef6208422d970ce5929750595a8b52f01d91be7;hp=037b17a9afe7f77643ba4529d5d5bc885743548f;hpb=9aeb97636520d2226d3d9919ddf38c0e6d0171b7;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemory.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemory.java
index 037b17a9..3dddc2ed 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemory.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemory.java
@@ -1,87 +1,43 @@
 package net.mograsim.machine.standard.memory;
 
-import java.util.Arrays;
-import java.util.HashMap;
+import java.math.BigInteger;
 
 import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
+import net.mograsim.machine.GenericMemory;
 import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.MainMemoryDefinition;
 
-public class WordAddressableMemory implements MainMemory
+public class WordAddressableMemory extends GenericMemory<BitVector> implements MainMemory
 {
 	private final int cellWidth;
-	private final long minimalAddress, maximalAddress;
 	private final MainMemoryDefinition definition;
-	private final int pageSize = 64;
-
-	private HashMap<Long, Page> pages;
 
 	public WordAddressableMemory(MainMemoryDefinition definition)
 	{
-		super();
+		super(definition);
 		this.cellWidth = definition.getCellWidth();
-		this.minimalAddress = definition.getMinimalAddress();
-		this.maximalAddress = definition.getMaximalAddress();
 		this.definition = definition;
-		this.pages = new HashMap<>();
 	}
 
 	@Override
-	public void setCell(long address, BitVector b)
+	public BitVector getCell(long address)
 	{
-		if (address < minimalAddress || address > maximalAddress)
-			throw new IndexOutOfBoundsException(String.format("Memory address out of bounds! Minimum: %d Maximum: %d Actual: %d",
-					minimalAddress, maximalAddress, address));
-		long page = address / pageSize;
-		int offset = (int) (address % pageSize);
-		Page p = pages.get(Long.valueOf(page));
-		if (p == null)
-			pages.put(page, p = new Page());
-		p.setCell(offset, b);
+		BitVector data = super.getCell(address);
+		return data == null ? BitVector.of(Bit.ZERO, cellWidth) : data;
 	}
-
+	
 	@Override
-	public BitVector getCell(long address)
+	public BigInteger getCellAsBigInteger(long address)
 	{
-		long page = address / pageSize;
-		int offset = (int) (address % pageSize);
-		Page p = pages.get(Long.valueOf(page));
-		if (p == null)
-			return BitVector.of(Bit.U, cellWidth);
-		return p.getCell(offset);
+		BitVector data = getCell(address);
+		return data == null ? BigInteger.valueOf(0) : data.getUnsignedValue();
 	}
 
-	private class Page
+	@Override
+	public void setCellAsBigInteger(long address, BigInteger data)
 	{
-		private BitVector[] memory;
-
-		public Page()
-		{
-			memory = new BitVector[pageSize];
-		}
-
-		public BitVector getCell(int index)
-		{
-			BitVector b = memory[index];
-			if (b == null)
-				return BitVector.of(Bit.U, cellWidth);
-			return memory[index];
-		}
-
-		public void setCell(int index, BitVector bits)
-		{
-			if (bits.length() != cellWidth)
-				throw new IllegalArgumentException(String.format(
-						"BitVector to be saved in memory cell has unexpected length. Expected: %d Actual: %d", cellWidth, bits.length()));
-			memory[index] = bits;
-		}
-
-		@Override
-		public String toString()
-		{
-			return Arrays.deepToString(memory);
-		}
+		setCell(address, BitVector.from(data, cellWidth));
 	}
 
 	@Override