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

Merge remote-tracking branch 'origin/Ghidra_12.0'

Browse source
This commit is contained in:
Ryan Kurtz 2025-09-25 05:26:54 -04:00
commit 9ad9d0d3db
1 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/ForceUnionAction.java
View file

@ -128,10 +128,7 @@ public class ForceUnionAction extends AbstractDecompilerAction {
int opcode = accessOp.getOpcode();
if (opcode == PcodeOp.PTRSUB) {
parentDt = typeIsUnionRelated(accessOp.getInput(0));
if (parentDt == null) {
accessOp = null;
return;
}
if (parentDt != null) {
accessVn = accessOp.getInput(0);
accessSlot = 0;
if (accessOp.getInput(1).getOffset() == 0) { // Artificial op
@ -148,8 +145,11 @@ public class ForceUnionAction extends AbstractDecompilerAction {
while (accessOp.getOpcode() == PcodeOp.PTRSUB &&
accessOp.getInput(1).getOffset() == 0);
}
return;
}
}
else {
parentDt = null;
for (accessSlot = 0; accessSlot < accessOp.getNumInputs(); ++accessSlot) {
accessVn = accessOp.getInput(accessSlot);
parentDt = typeIsUnionRelated(accessVn);
@ -157,23 +157,27 @@ public class ForceUnionAction extends AbstractDecompilerAction {
break;
}
}
if (accessSlot >= accessOp.getNumInputs()) {
accessSlot = -1;
accessVn = accessOp.getOutput();
parentDt = typeIsUnionRelated(accessVn);
if (parentDt == null) {
accessOp = null;
return; // Give up, could not find type associated with field
}
}
if (opcode == PcodeOp.SUBPIECE && accessSlot == 0 && !(parentDt instanceof Pointer)) {
if (parentDt != null) {
if (opcode == PcodeOp.SUBPIECE && accessSlot == 0 &&
!(parentDt instanceof Pointer)) {
// SUBPIECE acts directly as resolution operator
// Choose field based on output varnode, even though it isn't the union data-type
accessSlot = -1;
accessVn = accessOp.getOutput();
}
return;
}
}
accessSlot = -1;
accessVn = accessOp.getOutput();
if (accessVn != null) {
parentDt = typeIsUnionRelated(accessVn);
if (parentDt != null) {
return;
}
}
accessOp = null; // Give up, could not find type associated with field
}
/**
* Build a list of all the union field names for the user to select from, when determining