yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-4305: Return failed futures instead of throwing.

Browse source
This commit is contained in:
Dan 2024-02-07 14:04:14 -05:00
parent 19812a1ecb
commit 5c316929b8
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DefaultThreadRecorder.java
View file

@ -20,7 +20,7 @@ import java.util.Map.Entry;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import ghidra.app.plugin.core.debug.mapping.*;
import ghidra.app.plugin.core.debug.mapping.DefaultDebuggerTargetTraceMapper;
import ghidra.app.plugin.core.debug.service.model.interfaces.*;
import ghidra.async.AsyncFence;
import ghidra.async.AsyncUtils;
@ -164,7 +164,8 @@ public class DefaultThreadRecorder implements ManagedThreadRecorder {
public CompletableFuture<Map<Register, RegisterValue>> captureThreadRegisters(
TraceThread thread, int frameLevel, Set<Register> registers) {
if (regMapper == null) {
throw new IllegalStateException("Have not found register descriptions for " + thread);
return CompletableFuture.failedFuture(
new IllegalStateException("Have not found register descriptions for " + thread));
}
List<TargetRegister> tRegs = registers.stream()
.map(regMapper::traceToTarget)
@ -180,20 +181,25 @@ public class DefaultThreadRecorder implements ManagedThreadRecorder {
Set<TargetRegisterBank> banks = getTargetRegisterBank(thread, frameLevel);
if (banks == null) {
throw new IllegalArgumentException(
"Given thread and frame level does not have a live register bank");
return CompletableFuture.failedFuture(new IllegalArgumentException(
"Given thread and frame level does not have a live register bank"));
}
// NOTE: Cache update, if applicable, will cause recorder to write values to trace
AsyncFence fence = new AsyncFence();
Map<Register, RegisterValue> result = new HashMap<>();
for (TargetRegisterBank bank : banks) {
fence.include(bank.readRegisters(tRegs)
.thenApply(regMapper::targetToTrace)
.thenAccept(br -> {
synchronized (result) {
result.putAll(br);
}
}));
try {
fence.include(bank.readRegisters(tRegs)
.thenApply(regMapper::targetToTrace)
.thenAccept(br -> {
synchronized (result) {
result.putAll(br);
}
}));
}
catch (Exception e) {
fence.include(CompletableFuture.failedFuture(e));
}
}
return fence.ready().thenApply(__ -> result);
}