From 78e3696663ed2cf3fbba21b17b58cce0ee374f14 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Wed, 14 May 2025 17:09:12 +0200
Subject: [PATCH] Improve nullptr check for addresses of placed linker objects

---
 oscar64/NativeCodeGenerator.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index 303ce50..cc9f5d3 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -3486,7 +3486,13 @@ bool NativeCodeInstruction::ValueForwarding(NativeRegisterDataSet& data, AsmInsT
 				data.mRegs[CPU_REG_A].mValue = mAddress;
 				data.mRegs[CPU_REG_A].mLinkerObject = mLinkerObject;
 				data.mRegs[CPU_REG_A].mFlags = mFlags;
-				data.mRegs[CPU_REG_Z].Reset();
+				if (mLinkerObject)
+				{
+					data.mRegs[CPU_REG_Z].mMode = NRDM_IMMEDIATE;
+					data.mRegs[CPU_REG_Z].mValue = 1;
+				}
+				else
+					data.mRegs[CPU_REG_Z].Reset();
 			}
 		}
 		else