X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FMemory.java;h=0ff9bb41fdcd80ab036ef26de56ba5d4e701623c;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=e421e470588da7c167cbf655e90786ac084e9b6b;hpb=4c9a2240352c246c76a056687a2d68208137b667;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/Memory.java b/net.mograsim.machine/src/net/mograsim/machine/Memory.java
index e421e470..0ff9bb41 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/Memory.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/Memory.java
@@ -9,21 +9,28 @@ public interface Memory<T>
 	 * @throws IndexOutOfBoundsException
 	 */
 	public T getCell(long address);
-	
+
 	/**
 	 * Sets the data at the supplied address
+	 * 
 	 * @throws IndexOutOfBoundsException
 	 */
 	public void setCell(long address, T data);
-	
-	public long size();
-	
+
+	public default long size()
+	{
+		MemoryDefinition def = getDefinition();
+		return Long.max(0, def.getMaximalAddress() - def.getMinimalAddress() + 1);
+	}
+
 	/**
 	 * Registers an observer to be notified when a memory cell is modified
 	 */
 	public void registerObserver(MemoryObserver ob);
-	
+
 	public void deregisterObserver(MemoryObserver ob);
-	
+
 	public void notifyObservers(long address);
+
+	public MemoryDefinition getDefinition();
 }