Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-01 07:55:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1875-dragonmacher-decompiler-reference-finder-address-fix'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-04-01 01:52:51 -04:00
parent 08dacc34da 83017f87d4
commit 188ac888ee
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/DecompilerDependent/src/main/java/ghidra/app/extension/datatype/finder/DecompilerVariable.java
+23 -2
View File
@@ -15,8 +15,7 @@
*/
package ghidra.app.extension.datatype.finder;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
import ghidra.app.decompiler.*;
import ghidra.program.model.address.Address;
@@ -173,6 +172,10 @@ public abstract class DecompilerVariable {
return entry;
}
if (parent instanceof ClangTokenGroup) {
return getAddressFromParent((ClangTokenGroup) parent, variable);
}
Address parentAddress = parent.getMinAddress();
if (parentAddress != null) {
return parentAddress;
@@ -183,6 +186,24 @@ public abstract class DecompilerVariable {
return null;
}
private Address getAddressFromParent(ClangTokenGroup parent, ClangToken child) {
// get as close as possible to the given token without going over
Address bestAddress = parent.getMinAddress();
Iterator<ClangNode> iterator = parent.iterator();
while (iterator.hasNext()) {
ClangNode node = iterator.next();
if (child.equals(node)) {
break;
}
Address nextAddress = node.getMinAddress();
if (nextAddress != null) {
bestAddress = nextAddress;
}
}
return bestAddress;
}
public String getName() {
String text = variable.getText();
return text;