mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-06 03:50:02 +02:00
Merge remote-tracking branch
'origin/GP-5453-dragonmacher-decompiler-locations--SQUASHED' (Closes #7518)
This commit is contained in:
commit
4aa78ae6d0
25 changed files with 880 additions and 322 deletions
|
@ -36,6 +36,7 @@ import docking.widgets.fieldpanel.support.FieldLocation;
|
|||
import generic.Unique;
|
||||
import ghidra.app.decompiler.*;
|
||||
import ghidra.app.decompiler.component.*;
|
||||
import ghidra.app.decompiler.location.DefaultDecompilerLocation;
|
||||
import ghidra.app.plugin.assembler.*;
|
||||
import ghidra.app.plugin.assembler.sleigh.sem.*;
|
||||
import ghidra.app.plugin.core.analysis.*;
|
||||
|
@ -1610,10 +1611,14 @@ public class StackUnwinderTest extends AbstractGhidraHeadedDebuggerTest {
|
|||
FieldLocation fLoc = new FieldLocation(i, j, r, c);
|
||||
ClangToken token = clangField.getToken(fLoc);
|
||||
if (token != null && tokText.equals(token.getText())) {
|
||||
DecompilerLocation loc = token.getMinAddress() == null ? null
|
||||
: new DecompilerLocation(program, token.getMinAddress(),
|
||||
function.getEntryPoint(), results, token, i.intValue(),
|
||||
0);
|
||||
|
||||
Address entryPoint = function.getEntryPoint();
|
||||
DecompilerLocationInfo info =
|
||||
new DecompilerLocationInfo(entryPoint, results, token,
|
||||
i.intValue(), 0);
|
||||
DefaultDecompilerLocation loc = token.getMinAddress() == null ? null
|
||||
: new DefaultDecompilerLocation(program,
|
||||
token.getMinAddress(), info);
|
||||
return new HoverLocation(loc, fLoc, field, token);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue