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

Merge remote-tracking branch 'origin/patch'

Browse source 
Conflicts:
	Ghidra/Debug/Framework-Debugging/build.gradle
This commit is contained in:
Ryan Kurtz 2021-10-05 14:33:04 -04:00
commit 91f94b8155
17 changed files with 195 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Debug/Framework-Debugging/build.gradle
View file

@ -54,6 +54,13 @@ task testSpecimenLinux_x86_64 {
//dependsOn 'expTypesExecutable'//Linux_x86_64Executable'
dependsOn 'expRegistersLinux_x86_64Executable'
dependsOn 'expStackLinux_x86_64Executable'
doLast {
exec {
workingDir "build/os/linux_x86_64"
commandLine "strip", "-o", "expSpin.stripped", "expSpin"
}
}
}
// TODO: testSpecimenMac_x86_64 (Intel)

46
Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/test/AbstractDebuggerModelLauncherTest.java
View file

@ -35,6 +35,31 @@ import ghidra.dbg.target.TargetMethod.TargetParameterMap;
public abstract class AbstractDebuggerModelLauncherTest extends AbstractDebuggerModelTest
implements RequiresLaunchSpecimen {
protected class ProcessCreatedDebugModelListener extends AnnotatedDebuggerAttributeListener {
public final CompletableFuture<Void> observedCreated = new CompletableFuture<>();
public ProcessCreatedDebugModelListener() {
super(MethodHandles.lookup());
}
@AttributeCallback(TargetExecutionStateful.STATE_ATTRIBUTE_NAME)
public void stateChanged(TargetObject object, TargetExecutionState state) {
// We're only expecting one process, so this should be fine
TargetProcess process = DebugModelConventions.liveProcessOrNull(object);
if (process == null) {
return;
}
try {
TargetEnvironment env = findEnvironment(process.getPath());
assertEnvironment(env);
observedCreated.complete(null);
}
catch (Throwable e) {
observedCreated.completeExceptionally(e);
}
}
}
public List<String> getExpectedLauncherPath() {
return null;
}
@ -80,26 +105,7 @@ public abstract class AbstractDebuggerModelLauncherTest extends AbstractDebugger
public void testLaunch() throws Throwable {
m.build();
var listener = new AnnotatedDebuggerAttributeListener(MethodHandles.lookup()) {
CompletableFuture<Void> observedCreated = new CompletableFuture<>();
@AttributeCallback(TargetExecutionStateful.STATE_ATTRIBUTE_NAME)
public void stateChanged(TargetObject object, TargetExecutionState state) {
// We're only expecting one process, so this should be fine
TargetProcess process = DebugModelConventions.liveProcessOrNull(object);
if (process == null) {
return;
}
try {
TargetEnvironment env = findEnvironment(process.getPath());
assertEnvironment(env);
observedCreated.complete(null);
}
catch (Throwable e) {
observedCreated.completeExceptionally(e);
}
}
};
ProcessCreatedDebugModelListener listener = new ProcessCreatedDebugModelListener();
// NB. I've intentionally omitted the reorderer here. The model should get it right.
m.getModel().addModelListener(listener);