Skip to content

Commit b93aaac

Browse files
committed
Merge remote-tracking branch
'origin/GP-5180_Dan_fixAutoReadInFFV--SQUASHED' (NationalSecurityAgency#7176)
2 parents 473c16f + 71548dd commit b93aaac

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiTarget.java

+9
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,15 @@ protected SchemaContext getSchemaContext() {
976976
}
977977

978978
protected TraceObject getProcessForSpace(AddressSpace space) {
979+
List<TraceObjectProcess> processes = trace.getObjectManager()
980+
.queryAllInterface(Lifespan.at(getSnap()), TraceObjectProcess.class)
981+
.toList();
982+
if (processes.size() == 1) {
983+
return processes.get(0).getObject();
984+
}
985+
if (processes.isEmpty()) {
986+
return null;
987+
}
979988
for (TraceMemoryRegion region : trace.getMemoryManager()
980989
.getRegionsIntersecting(
981990
Lifespan.at(getSnap()),

Ghidra/Test/DebuggerIntegrationTest/src/test/java/ghidra/app/plugin/core/debug/gui/listing/DebuggerListingProviderTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
import java.nio.ByteBuffer;
2626
import java.util.Set;
2727

28-
import org.junit.*;
28+
import org.junit.Before;
29+
import org.junit.Test;
2930
import org.junit.experimental.categories.Category;
3031

3132
import db.Transaction;
@@ -731,7 +732,7 @@ public void runTestAutoReadMemoryReadsWithForceFullView(AutoReadMemorySpec spec)
731732

732733
runSwing(() -> tb.trace.getProgramView().getMemory().setForceFullView(true));
733734

734-
goToDyn(tb.addr(0x55550000));
735+
goToDyn(tb.addr(0x55550800));
735736
runSwing(() -> listingProvider.setAutoReadMemorySpec(spec));
736737

737738
handleReadMemInvocation(process, tb.range(0x55550000, 0x55550fff));
@@ -742,13 +743,11 @@ public void runTestAutoReadMemoryReadsWithForceFullView(AutoReadMemorySpec spec)
742743
}
743744

744745
@Test
745-
@Ignore("Until GP-5180")
746746
public void testAutoReadMemoryVisROOnceReadsWithForceFullView() throws Throwable {
747747
runTestAutoReadMemoryReadsWithForceFullView(readVisROOnce);
748748
}
749749

750750
@Test
751-
@Ignore("Until GP-5180")
752751
public void testAutoReadMemoryVisibleReadsWithForceFullView() throws Throwable {
753752
runTestAutoReadMemoryReadsWithForceFullView(readVisible);
754753
}

0 commit comments

Comments
 (0)