X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2Fstandard%2Fmemory%2FCoreWordAddressableMemory.java;h=ca557a6b923ab982713c414483a90fecd9984c57;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=dcbd25efc660242b7768cc6416c1eaa6b84c53c6;hpb=3163d767dbd691c533d3f6b15bcf6a196bfd32e0;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java
index dcbd25ef..ca557a6b 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/CoreWordAddressableMemory.java
@@ -58,13 +58,13 @@ public class CoreWordAddressableMemory extends BasicCoreComponent
 	@Override
 	protected TimelineEventHandler compute()
 	{
-		if (!address.hasNumericValue())
+		if (!address.getValues().isBinary())
 		{
 			if (read.equals(rWBit.getValue()))
 				return e -> data.feedSignals(Bit.U.toVector(data.width()));// TODO don't always feed U, but decide to feed X or U.
 			return e -> data.clearSignals();
 		}
-		long addressed = address.getUnsignedValue();
+		long addressed = address.getValues().getUnsignedValueLong();
 		if (read.equals(rWBit.getValue()))
 		{
 			BitVector storedData = memory.getCell(addressed);