mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-10-22 21:21:02 +00:00
Merge remote-tracking branch 'origin/Ghidra_11.2'
This commit is contained in:
commit
57dbd2d37e
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user