From 0744141b15d696db09bbd576e4f35086e0d50701 Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Wed, 23 Jul 2025 20:03:01 +0000
Subject: [PATCH] GP-5865 Add reference dialog fix for address spaces that have
 a wordsize greater than one byte

---
 .../src/main/java/ghidra/program/util/AddressEvaluator.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java
index d85879999e..0663a1acb2 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java
@@ -148,7 +148,7 @@ public class AddressEvaluator extends ExpressionEvaluator {
 			long offset = longValue.getLongValue();
 			AddressSpace space = getAddressSpace();
 			try {
-				return space.getAddressInThisSpaceOnly(offset);
+				return space.getAddressInThisSpaceOnly(offset*space.getAddressableUnitSize());
 			}
 			catch (AddressOutOfBoundsException e) {
 				throw new ExpressionException(e.getMessage());