Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 06:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-4667 Removed problematic scalar adjustment values for low byte mask

Browse Source 
and high byte shift.  Also included mask and shift as part of the field
option "Include Scalar Reference Adjustment"
This commit is contained in:
emteere 2024-09-18 10:26:47 -04:00
parent 2b4036d314
commit 5b8c5644a7
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
View File

@ -45,12 +45,12 @@ public class CodeUnitFormat {
/**
* Supported memory address shift cases (bits)
*/
private static final int[] SHIFT_CASES = new int[] { 1, 2, 8, 16, 32 };
private static final int[] SHIFT_CASES = new int[] { 1, 2, 8, 16 };
/**
* Supported memory address mask cases (mask value)
*/
private static final long[] MASK_CASES = new long[] { 0x0ff, 0x0ffff, 0x0ffffffff };
private static final long[] MASK_CASES = new long[] { 0x0ffff, 0x0ffffffff };
/**
* Default code unit format
@ -834,29 +834,31 @@ public class CodeUnitFormat {
if (addr.isMemoryAddress()) {
// Include "offset" prefix since addrOffset does not match originalValue
list.add("offset ");
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));
// 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;
}
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));
// 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;
}
return list;
}
}