Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-10 14:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_fixTests-2024-08-21-1'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-08-21 14:13:57 -04:00
commit 6a94f1f7ab
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DebuggerStaticMappingServicePlugin.java
View File

@ -377,6 +377,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
result.add(me.program); result.add(me.program);
} }
outbound.values().removeAll(toClean); outbound.values().removeAll(toClean);
mappingsAffected(toClean);
return result; return result;
} }
@ -393,11 +394,13 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
} }
if (me.isStaticProgramOpen()) { if (me.isStaticProgramOpen()) {
outbound.values().removeAll(toClean); outbound.values().removeAll(toClean);
mappingsAffected(toClean);
return me.mapTraceAddressToProgramLocation(address); return me.mapTraceAddressToProgramLocation(address);
} }
} }
} }
outbound.values().removeAll(toClean); outbound.values().removeAll(toClean);
mappingsAffected(toClean);
return null; return null;
} }
@ -424,6 +427,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
.add(new MappedAddressRange(srcRng, dstRng)); .add(new MappedAddressRange(srcRng, dstRng));
} }
outbound.values().removeAll(toClean); outbound.values().removeAll(toClean);
mappingsAffected(toClean);
} }
public Map<Program, Collection<MappedAddressRange>> getOpenMappedViews(AddressSetView set, public Map<Program, Collection<MappedAddressRange>> getOpenMappedViews(AddressSetView set,
@ -452,6 +456,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
result.add(me.getStaticProgramURL()); result.add(me.getStaticProgramURL());
} }
outbound.values().removeAll(toClean); outbound.values().removeAll(toClean);
mappingsAffected(toClean);
} }
public Set<URL> getMappedProgramURLsInView(AddressSetView set, Lifespan span) { public Set<URL> getMappedProgramURLsInView(AddressSetView set, Lifespan span) {
@ -506,10 +511,12 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
} }
if (Objects.equals(trace, me.getTrace())) { if (Objects.equals(trace, me.getTrace())) {
inbound.keySet().removeAll(toClean); inbound.keySet().removeAll(toClean);
mappingsAffected(toClean);
return true; return true;
} }
} }
inbound.keySet().removeAll(toClean); inbound.keySet().removeAll(toClean);
mappingsAffected(toClean);
return false; return false;
} }
@ -545,6 +552,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
result.add(me.mapProgramAddressToTraceLocation(address)); result.add(me.mapProgramAddressToTraceLocation(address));
} }
inbound.keySet().removeAll(toClean); inbound.keySet().removeAll(toClean);
mappingsAffected(toClean);
return result; return result;
} }
@ -573,9 +581,11 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
continue; continue;
} }
inbound.keySet().removeAll(toClean); inbound.keySet().removeAll(toClean);
mappingsAffected(toClean);
return me.mapProgramAddressToTraceLocation(address); return me.mapProgramAddressToTraceLocation(address);
} }
inbound.keySet().removeAll(toClean); inbound.keySet().removeAll(toClean);
mappingsAffected(toClean);
return null; return null;
} }
@ -605,6 +615,7 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
.add(new MappedAddressRange(srcRange, dstRange)); .add(new MappedAddressRange(srcRange, dstRange));
} }
inbound.keySet().removeAll(toClean); inbound.keySet().removeAll(toClean);
mappingsAffected(toClean);
} }
public Map<TraceSpan, Collection<MappedAddressRange>> getOpenMappedViews( public Map<TraceSpan, Collection<MappedAddressRange>> getOpenMappedViews(
@ -688,6 +699,16 @@ public class DebuggerStaticMappingServicePlugin extends Plugin
} }
} }
private void mappingsAffected(Collection<MappingEntry> entries) {
Set<Trace> traces = entries.stream().map(e -> e.getTrace()).collect(Collectors.toSet());
Set<Program> programs = entries.stream().map(e -> e.program).collect(Collectors.toSet());
synchronized (affectedTraces) {
affectedTraces.addAll(traces);
affectedPrograms.addAll(programs);
changeDebouncer.contact(null);
}
}
@Override @Override
public void addChangeListener(DebuggerStaticMappingChangeListener l) { public void addChangeListener(DebuggerStaticMappingChangeListener l) {
changeListeners.add(l); changeListeners.add(l);