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

Merge remote-tracking branch

Browse Source 
'origin/GP-4667_emteere_PartialValueConstantReferenceDisplay' into
Ghidra_11.2 (Closes #1564)
This commit is contained in:
ghidra1 2024-09-18 13:39:59 -04:00
commit 093f6115b6
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -45,12 +45,12 @@ public class CodeUnitFormat {
/** /**
* Supported memory address shift cases (bits) * 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) * 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 * Default code unit format
@ -834,29 +834,31 @@ 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
list.add("offset "); if (options.includeScalarReferenceAdjustment) {
list.add("offset ");
// Check for shift cases
for (int element : SHIFT_CASES) { // Check for shift cases
if ((addrOffset >>> element) == originalValue && originalValue != 0x0) { for (int element : SHIFT_CASES) {
list.add(opObj); if ((addrOffset >>> element) == originalValue && originalValue != 0x0) {
if (options.includeScalarReferenceAdjustment) { list.add(opObj);
list.add(" >>"); if (options.includeScalarReferenceAdjustment) {
list.add(Integer.toString(element)); list.add(" >>");
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;
} }
} }