mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-3216 Fixed CParser creation of Enums from define's with upper and

Browse Source 
lower case u,l,ul when value surrounded by parentheses
This commit is contained in:
emteere
2023-03-19 19:17:58 +00:00
parent cc6abb596d
commit b10d01a2cb
4 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/AddressEvaluator.java
View File

@@ -257,7 +257,7 @@ public class AddressEvaluator {
if (globalSymbols.size() == 1) {
return globalSymbols.get(0).getAddress();
}
return null;
return getValueObject(tok);
}
private static Object getValueObject(String strValue) {
@@ -268,10 +268,11 @@ public class AddressEvaluator {
start = 2;
radix = 16;
}
if (strValue.endsWith("UL")) {
strValue = strValue.toLowerCase();
if (strValue.endsWith("ul")) {
strValue = strValue.substring(start, strValue.length() - 2);
}
else if (strValue.endsWith("L") || strValue.endsWith("l") || strValue.endsWith("U")) {
else if (strValue.endsWith("l") || strValue.endsWith("u")) {
strValue = strValue.substring(start, strValue.length() - 1);
}
else {