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

GP-0: Fix Friday's fix. Some additonal timing fixes.

Browse Source
This commit is contained in:
Dan
2023-01-30 12:41:15 -05:00
parent c78a9c35e1
commit 325f443775
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/DebuggerCoordinates.java
+1 -1
View File
@@ -400,7 +400,7 @@ public class DebuggerCoordinates {
* @return exactly these same coordinates with the snap/time changed
*/
public DebuggerCoordinates snapNoResolve(long snap) {
if (time.isSnapOnly() && time.getSnap() == snap) {
if (time != null && time.isSnapOnly() && time.getSnap() == snap) {
return this;
}
TraceSchedule newTime = TraceSchedule.snap(snap);
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceTest.java
+6 -3
View File
@@ -361,15 +361,18 @@ public class DebuggerModelServiceTest extends AbstractGhidraHeadedDebuggerGUITes
}
@Test
public void testGetTraceThreadWithTarget() throws Exception {
public void testGetTraceThreadWithTarget() throws Throwable {
createTestModel();
mb.createTestProcessesAndThreads();
modelService.recordTarget(mb.testProcess1, createTargetTraceMapper(mb.testProcess1),
ActionSource.AUTOMATIC);
TraceRecorder recorder =
modelService.recordTarget(mb.testProcess1, createTargetTraceMapper(mb.testProcess1),
ActionSource.AUTOMATIC);
waitRecorder(recorder);
// The most complicated case, lest I want another dimension in a cross product
mb.createTestThreadStacksAndFramesHaveRegisterBanks();
waitRecorder(recorder);
waitForPass(() -> {
TraceThread traceThread = modelService.getTraceThread(mb.testProcess1, mb.testThread1);