yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

GP-0 partially reverted change from GP-4667

Browse source
This commit is contained in:
ghidra1 2024-09-19 17:22:17 -04:00
parent f24015d79d
commit 6d6205f1db
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
View file

@ -834,31 +834,29 @@ public class CodeUnitFormat {
if (addr.isMemoryAddress()) { if (addr.isMemoryAddress()) {
// Include "offset" prefix since addrOffset does not match originalValue // Include "offset" prefix since addrOffset does not match originalValue
if (options.includeScalarReferenceAdjustment) { list.add("offset ");
list.add("offset ");
// Check for shift cases // Check for shift cases
for (int element : SHIFT_CASES) { for (int element : SHIFT_CASES) {
if ((addrOffset >>> element) == originalValue && originalValue != 0x0) { if ((addrOffset >>> element) == originalValue && originalValue != 0x0) {
list.add(opObj); list.add(opObj);
if (options.includeScalarReferenceAdjustment) { if (options.includeScalarReferenceAdjustment) {
list.add(" >>"); list.add(" >>");
list.add(Integer.toString(element)); list.add(Integer.toString(element));
}
return list;
} }
return list;
} }
}
// Check for mask cases // Check for mask cases
for (long element : MASK_CASES) { for (long element : MASK_CASES) {
if ((addrOffset & element) == originalValue) { if ((addrOffset & element) == originalValue) {
list.add(opObj); list.add(opObj);
if (options.includeScalarReferenceAdjustment) { if (options.includeScalarReferenceAdjustment) {
list.add(" &"); list.add(" &");
list.add("0x" + Long.toHexString(element)); list.add("0x" + Long.toHexString(element));
}
return list;
} }
return list;
} }
} }