diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/AbstractReadsTargetPcodeExecutorState.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/AbstractReadsTargetPcodeExecutorState.java
index 811e1c65b8..dbe9adcda2 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/AbstractReadsTargetPcodeExecutorState.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/AbstractReadsTargetPcodeExecutorState.java
@@ -24,6 +24,7 @@ import ghidra.pcode.exec.trace.TraceCachedWriteBytesPcodeExecutorState;
 import ghidra.pcode.exec.trace.TraceSleighUtils;
 import ghidra.program.model.address.AddressSet;
 import ghidra.program.model.address.AddressSpace;
+import ghidra.program.model.lang.Language;
 import ghidra.trace.model.Trace;
 import ghidra.trace.model.memory.TraceMemorySpace;
 import ghidra.trace.model.memory.TraceMemoryState;
@@ -34,9 +35,9 @@ public abstract class AbstractReadsTargetPcodeExecutorState
 		extends TraceCachedWriteBytesPcodeExecutorState {
 
 	abstract class AbstractReadsTargetCachedSpace extends CachedSpace {
-		public AbstractReadsTargetCachedSpace(AddressSpace space,
+		public AbstractReadsTargetCachedSpace(Language language, AddressSpace space,
 				TraceMemorySpace source, long snap) {
-			super(space, source, snap);
+			super(language, space, source, snap);
 		}
 
 		protected abstract void fillUninitialized(AddressSet uninitialized);
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetMemoryPcodeExecutorState.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetMemoryPcodeExecutorState.java
index 75ea77a7ba..9f7d769c5a 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetMemoryPcodeExecutorState.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetMemoryPcodeExecutorState.java
@@ -23,6 +23,7 @@ import ghidra.app.services.DebuggerStaticMappingService.MappedAddressRange;
 import ghidra.app.services.TraceRecorder;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.program.model.address.*;
+import ghidra.program.model.lang.Language;
 import ghidra.program.model.listing.Program;
 import ghidra.program.model.mem.Memory;
 import ghidra.program.model.mem.MemoryAccessException;
@@ -38,9 +39,9 @@ public class ReadsTargetMemoryPcodeExecutorState
 
 	protected class ReadsTargetMemoryCachedSpace extends AbstractReadsTargetCachedSpace {
 
-		public ReadsTargetMemoryCachedSpace(AddressSpace space, TraceMemorySpace source,
-				long snap) {
-			super(space, source, snap);
+		public ReadsTargetMemoryCachedSpace(Language language, AddressSpace space,
+				TraceMemorySpace source, long snap) {
+			super(language, space, source, snap);
 		}
 
 		@Override
@@ -131,6 +132,6 @@ public class ReadsTargetMemoryPcodeExecutorState
 	@Override
 	protected AbstractReadsTargetCachedSpace createCachedSpace(AddressSpace s,
 			TraceMemorySpace tms) {
-		return new ReadsTargetMemoryCachedSpace(s, tms, snap);
+		return new ReadsTargetMemoryCachedSpace(language, s, tms, snap);
 	}
 }
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetRegistersPcodeExecutorState.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetRegistersPcodeExecutorState.java
index 9f47369783..a7d0d0cc1b 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetRegistersPcodeExecutorState.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/emulation/ReadsTargetRegistersPcodeExecutorState.java
@@ -21,6 +21,7 @@ import java.util.Set;
 import ghidra.app.services.TraceRecorder;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.program.model.address.*;
+import ghidra.program.model.lang.Language;
 import ghidra.program.model.lang.Register;
 import ghidra.trace.model.Trace;
 import ghidra.trace.model.memory.TraceMemorySpace;
@@ -32,9 +33,9 @@ public class ReadsTargetRegistersPcodeExecutorState
 
 	protected class ReadsTargetRegistersCachedSpace extends AbstractReadsTargetCachedSpace {
 
-		public ReadsTargetRegistersCachedSpace(AddressSpace space, TraceMemorySpace source,
-				long snap) {
-			super(space, source, snap);
+		public ReadsTargetRegistersCachedSpace(Language language, AddressSpace space,
+				TraceMemorySpace source, long snap) {
+			super(language, space, source, snap);
 		}
 
 		@Override
@@ -71,6 +72,6 @@ public class ReadsTargetRegistersPcodeExecutorState
 	@Override
 	protected AbstractReadsTargetCachedSpace createCachedSpace(AddressSpace s,
 			TraceMemorySpace tms) {
-		return new ReadsTargetRegistersCachedSpace(s, tms, snap);
+		return new ReadsTargetRegistersCachedSpace(language, s, tms, snap);
 	}
 }