development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-08-28 05:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2586_Dan_fixPcodeStepperGuestPlatform'

Browse source
This commit is contained in:
Ryan Kurtz 2022-09-24 01:54:39 -04:00
parent 5b0d0d396b dfadbf299f
commit 433547a826
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/pcode/DebuggerPcodeStepperProvider.java
View file

@ -899,7 +899,7 @@ public class DebuggerPcodeStepperProvider extends ComponentProviderAdapter {
}
protected void populatePcode(PcodeFrame frame) {
Language language = current.getTrace().getBaseLanguage();
Language language = current.getPlatform().getLanguage();
PcodeRowHtmlFormatter formatter = new PcodeRowHtmlFormatter(language, frame);
List<PcodeRow> toAdd = formatter.getRows();
@ -920,7 +920,7 @@ public class DebuggerPcodeStepperProvider extends ComponentProviderAdapter {
protected <T> void populateUnique(PcodeFrame frame, PcodeExecutorState<T> state,
PcodeArithmetic<T> arithmetic) {
Language language = current.getTrace().getBaseLanguage();
Language language = current.getPlatform().getLanguage();
// NOTE: They may overlap. I don't think I care.
Set<Varnode> uniques = new TreeSet<>(UNIQUE_COMPARATOR);
for (PcodeOp op : frame.getCode()) {