From 6d6205f1dbef21feeaf9eadc921eabf05ec996fb Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:22:17 -0400
Subject: [PATCH] GP-0 partially reverted change from GP-4667

---
 .../program/model/listing/CodeUnitFormat.java | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java b/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
index 2843b0ec4a..8b4d231d18 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
@@ -834,31 +834,29 @@ public class CodeUnitFormat {
 		if (addr.isMemoryAddress()) {
 
 			// Include "offset" prefix since addrOffset does not match originalValue
-			if (options.includeScalarReferenceAdjustment) {
-				list.add("offset ");
-				
-				// Check for shift cases
-				for (int element : SHIFT_CASES) {
-					if ((addrOffset >>> element) == originalValue && originalValue != 0x0) {
-						list.add(opObj);
-						if (options.includeScalarReferenceAdjustment) {
-							list.add(" >>");
-							list.add(Integer.toString(element));
-						}
-						return list;
+			list.add("offset ");
+
+			// Check for shift cases
+			for (int element : SHIFT_CASES) {
+				if ((addrOffset >>> element) == originalValue && originalValue != 0x0) {
+					list.add(opObj);
+					if (options.includeScalarReferenceAdjustment) {
+						list.add(" >>");
+						list.add(Integer.toString(element));
 					}
+					return list;
 				}
-	
-				// Check for mask cases
-				for (long element : MASK_CASES) {
-					if ((addrOffset & element) == originalValue) {
-						list.add(opObj);
-						if (options.includeScalarReferenceAdjustment) {
-							list.add(" &");
-							list.add("0x" + Long.toHexString(element));
-						}
-						return list;
+			}
+
+			// Check for mask cases
+			for (long element : MASK_CASES) {
+				if ((addrOffset & element) == originalValue) {
+					list.add(opObj);
+					if (options.includeScalarReferenceAdjustment) {
+						list.add(" &");
+						list.add("0x" + Long.toHexString(element));
 					}
+					return list;
 				}
 			}