Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-5865 Add reference dialog fix for address spaces that have a wordsize greater than one byte

emteere0744141b15d6
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());