X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Ftables%2Fmemory%2FMemoryTableContentProvider.java;h=2197125766d4f78c400c1b21c830fedf24a251e2;hb=9719354a14003c6da81fc6237b2d940612c1dc0f;hp=983e822c493c34600acb6c13a264ed1ed1fa5829;hpb=23335a13dfcfb22119c5e0184fbcd8d9caac3551;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
index 983e822c..21971257 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/tables/memory/MemoryTableContentProvider.java
@@ -5,8 +5,8 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Display;
 
-import net.mograsim.machine.MainMemory;
-import net.mograsim.machine.MainMemoryDefinition;
+import net.mograsim.machine.BitVectorMemory;
+import net.mograsim.machine.BitVectorMemoryDefinition;
 import net.mograsim.machine.Memory.MemoryCellModifiedListener;
 
 public class MemoryTableContentProvider implements ILazyContentProvider, MemoryCellModifiedListener
@@ -14,13 +14,13 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryC
 	private long lower, upper;
 	private TableViewer viewer;
 	public final static int MAX_VISIBLE_ROWS = 1_000;
-	private MainMemory memory;
+	private BitVectorMemory memory;
 
 	public void setBounds(long lower, long upper)
 	{
 		if (memory != null)
 		{
-			MainMemoryDefinition definition = memory.getDefinition();
+			BitVectorMemoryDefinition definition = memory.getDefinition();
 			this.lower = Long.min(definition.getMaximalAddress(), Long.max(definition.getMinimalAddress(), lower));
 			this.upper = Long.max(this.lower, Long.min(definition.getMaximalAddress(), upper));
 		} else
@@ -49,7 +49,7 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryC
 
 	public int getAmount()
 	{
-		return (int) (upper - lower);
+		return (int) (upper - lower + 1);
 	}
 
 	@Override
@@ -67,9 +67,9 @@ public class MemoryTableContentProvider implements ILazyContentProvider, MemoryC
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
 	{
 		this.viewer = (TableViewer) viewer;
-		this.memory = (MainMemory) newInput;
+		this.memory = (BitVectorMemory) newInput;
 		if (oldInput != null)
-			((MainMemory) oldInput).deregisterCellModifiedListener(this);
+			((BitVectorMemory) oldInput).deregisterCellModifiedListener(this);
 		if (memory != null)
 			memory.registerCellModifiedListener(this);
 		setBounds(0, MAX_VISIBLE_ROWS);