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

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
Ryan Kurtz 2022-03-29 18:18:59 -04:00
commit 48b98fe517
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/platform/dbgeng/DbgengX64DebuggerMappingOpinion.java
View file

@ -35,6 +35,12 @@ public class DbgengX64DebuggerMappingOpinion implements DebuggerMappingOpinion {
@Override
protected String normalizeName(String name) {
name = super.normalizeName(name);
if ("efl".equals(name)) {
return "eflags";
}
if ("rfl".equals(name)) {
return "eflags";
}
if ("rflags".equals(name)) {
return "eflags";
}

3
Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/target/DebuggerTargetsProviderTest.java
View file

@ -91,7 +91,8 @@ public class DebuggerTargetsProviderTest extends AbstractGhidraHeadedDebuggerGUI
createTestModel();
waitForSwing();
assertFalse(targetsProvider.actionDisconnect.isEnabled());
// The first model is now selected automatically.
//assertFalse(targetsProvider.actionDisconnect.isEnabled());
selectNodeForObject(targetsProvider, mb.testModel);
waitForSwing();