Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-7213: fix for UPDATEs GP-7213: as falls lldb, so falls...

d-millar05dc3ca100a0
diff --git a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
index 8c27a40740..38064c7448 100644
--- a/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
+++ b/Ghidra/Debug/Debugger/src/test/java/ghidra/app/plugin/core/debug/gui/AbstractGhidraHeadedDebuggerTest.java
@@ -716,8 +716,8 @@ public abstract class AbstractGhidraHeadedDebuggerTest
tb.close();
}
+ programManager.closeAllPrograms(true);
if (program != null) {
- programManager.closeAllPrograms(true);
program.release(this);
}
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngStackUnwindTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngStackUnwindTest.java
index b8852503b7..9d0c1916d2 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngStackUnwindTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngStackUnwindTest.java
@@ -59,15 +59,18 @@ import ghidra.app.util.viewer.listingpanel.ListingPanel;
import ghidra.debug.api.tracemgr.DebuggerCoordinates;
import ghidra.framework.model.DomainFile;
import ghidra.framework.model.DomainFolder;
+import ghidra.program.database.ProgramDB;
import ghidra.program.model.address.Address;
import ghidra.program.model.listing.*;
import ghidra.program.util.*;
+import ghidra.test.TestProgramManager;
import ghidra.trace.database.ToyDBTraceBuilder;
import ghidra.trace.database.module.DBTraceStaticMappingManager;
import ghidra.trace.model.Trace;
import ghidra.trace.model.modules.TraceStaticMapping;
import ghidra.util.*;
import ghidra.util.exception.CancelledException;
+import ghidra.util.exception.VersionException;
import junit.framework.AssertionFailedError;
@Category(NightlyCategory.class) // this may actually be an @PortSensitive test
@@ -136,19 +139,10 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Test
public void testBasicUnwind() throws Throwable {
- List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe", "ntdll.dll");
-
addPlugins();
- DomainFile[] dfs = getDomainFiles(files);
- tool.acceptDomainFiles(dfs);
-
- DomainFile traceDF = getDomainFile("expSpin_dbgeng");
- ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
- resyncMappings(mdo.get());
- tool.acceptDomainFiles(new DomainFile[] { traceDF });
-
- programs = openPrograms(dfs);
+ List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe", "ntdll.dll");
+ ManagedDomainObject<Trace> mdo = initPrograms("expSpin_dbgeng", files);
try (PythonAndTrace conn = startAndSyncPython(mdo)) {
traceManager.activateSnap(2);
@@ -164,19 +158,10 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Test
public void testUnwindActivateMidStack() throws Throwable {
- List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe", "ntdll.dll");
-
addPlugins();
- DomainFile[] dfs = getDomainFiles(files);
- tool.acceptDomainFiles(dfs);
-
- DomainFile traceDF = getDomainFile("expSpin_dbgeng");
- ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
- resyncMappings(mdo.get());
- tool.acceptDomainFiles(new DomainFile[] { traceDF });
-
- programs = openPrograms(dfs);
+ List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe", "ntdll.dll");
+ ManagedDomainObject<Trace> mdo = initPrograms("expSpin_dbgeng", files);
try (PythonAndTrace conn = startAndSyncPython(mdo)) {
traceManager.activateSnap(2);
@@ -194,19 +179,10 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Test
public void testUnwindActivateHighFrame() throws Throwable {
- List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe", "ntdll.dll");
-
addPlugins();
- DomainFile[] dfs = getDomainFiles(files);
- tool.acceptDomainFiles(dfs);
-
- DomainFile traceDF = getDomainFile("expSpin_dbgeng");
- ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
- resyncMappings(mdo.get());
- tool.acceptDomainFiles(new DomainFile[] { traceDF });
-
- programs = openPrograms(dfs);
+ List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe", "ntdll.dll");
+ ManagedDomainObject<Trace> mdo = initPrograms("expSpin_dbgeng", files);
try (PythonAndTrace conn = startAndSyncPython(mdo)) {
traceManager.activateSnap(2);
@@ -224,19 +200,10 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Test
public void testBasicUnwindMissingLowFrame() throws Throwable {
- List<String> files = Arrays.asList("expSpin.exe", "ntdll.dll");
-
addPlugins();
- DomainFile[] dfs = getDomainFiles(files);
- tool.acceptDomainFiles(dfs);
-
- DomainFile traceDF = getDomainFile("expSpin_dbgeng");
- ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
- resyncMappings(mdo.get());
- tool.acceptDomainFiles(new DomainFile[] { traceDF });
-
- programs = openPrograms(dfs);
+ List<String> files = Arrays.asList("expSpin.exe", "ntdll.dll");
+ ManagedDomainObject<Trace> mdo = initPrograms("expSpin_dbgeng", files);
try (PythonAndTrace conn = startAndSyncPython(mdo)) {
traceManager.activateSnap(2);
@@ -251,19 +218,10 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Test
public void testBasicUnwindMissingMedFrame() throws Throwable {
- List<String> files = Arrays.asList("kernel32.dll", "ntdll.dll");
-
addPlugins();
- DomainFile[] dfs = getDomainFiles(files);
- tool.acceptDomainFiles(dfs);
-
- DomainFile traceDF = getDomainFile("expSpin_dbgeng");
- ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
- resyncMappings(mdo.get());
- tool.acceptDomainFiles(new DomainFile[] { traceDF });
-
- programs = openPrograms(dfs);
+ List<String> files = Arrays.asList("kernel32.dll", "ntdll.dll");
+ ManagedDomainObject<Trace> mdo = initPrograms("expSpin_dbgeng", files);
try (PythonAndTrace conn = startAndSyncPython(mdo)) {
traceManager.activateSnap(2);
@@ -278,19 +236,10 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Test
public void testBasicUnwindMissingHighFrame() throws Throwable {
- List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe");
-
addPlugins();
- DomainFile[] dfs = getDomainFiles(files);
- tool.acceptDomainFiles(dfs);
-
- DomainFile traceDF = getDomainFile("expSpin_dbgeng");
- ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
- resyncMappings(mdo.get());
- tool.acceptDomainFiles(new DomainFile[] { traceDF });
-
- programs = openPrograms(dfs);
+ List<String> files = Arrays.asList("kernel32.dll", "expSpin.exe");
+ ManagedDomainObject<Trace> mdo = initPrograms("expSpin_dbgeng", files);
try (PythonAndTrace conn = startAndSyncPython(mdo)) {
traceManager.activateSnap(2);
@@ -379,31 +328,47 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
return getVariableValueTable(loc.pLoc, traceManager.getCurrent(), loc.fLoc, loc.field);
}
- private DomainFile[] getDomainFiles(List<String> files)
- throws InvalidNameException, CancelledException, IOException {
- DomainFile[] dfs = new DomainFile[files.size()];
- int i = 0;
- for (String fname : files) {
- dfs[i++] = getDomainFile(fname);
- }
- return dfs;
+ protected void addPlugins() throws Throwable {
+ codeBrowserPlugin = addPlugin(tool, CodeBrowserPlugin.class);
+ staticListing = codeBrowserPlugin.getProvider().getListingPanel();
+ listingPlugin = addPlugin(tool, DebuggerListingPlugin.class);
+ valuesPlugin = addPlugin(tool, VariableValueHoverPlugin.class);
+ mappingService = addPlugin(tool, DebuggerStaticMappingServicePlugin.class);
+ dynamicListing = listingPlugin.getProvider().getListingPanel();
+ //addPlugin(tool, DebuggerControlPlugin.class);
+ //addPlugin(tool, DebuggerStaticMappingPlugin.class);
+ //addPlugin(tool, DebuggerModelPlugin.class);
+ addPlugin(tool, DisassemblerPlugin.class);
+ addPlugin(tool, DecompilePlugin.class);
+ valuesService = valuesPlugin.getHoverService();
+
+ decompilerProvider = waitForComponentProvider(DecompilerProvider.class);
+ decompilerPanel = decompilerProvider.getDecompilerPanel();
+ tool.showComponentProvider(decompilerProvider, true);
}
- private DomainFile getDomainFile(String fname)
- throws InvalidNameException, CancelledException, IOException {
+ private ManagedDomainObject<Trace> initPrograms(String trace, List<String> files)
+ throws InvalidNameException, IOException, CancelledException, VersionException,
+ MalformedURLException, URISyntaxException {
+ TestProgramManager manager = new TestProgramManager();
DomainFolder rootFolder = tool.getProject()
.getProjectData()
.getRootFolder();
- File f = getTestDataFile(fname + ".gzf");
- return rootFolder.createFile(fname, f, monitor);
- }
- private List<Program> openPrograms(DomainFile[] files) {
- List<Program> progs = new ArrayList<>();
- for (int i = 0; i < files.length; i++) {
- progs.add(programManager.openProgram(files[i]));
+ programs = new ArrayList<>();
+ for (String fname : files) {
+ ProgramDB pgm = manager.getProgram(fname);
+ DomainFile df = rootFolder.createFile(fname, pgm, monitor);
+ programs.add(programManager.openProgram(df));
+ manager.release(pgm);
}
- return progs;
+
+ File f = getTestDataFile(trace + ".gzt");
+ DomainFile traceDF = rootFolder.createFile(trace, f, monitor);
+ ManagedDomainObject<Trace> mdo = new ManagedDomainObject<>(traceDF, Trace.class, monitor);
+ resyncMappings(mdo.get());
+ tool.acceptDomainFiles(new DomainFile[] { traceDF });
+ return mdo;
}
private void resyncMappings(Trace trace)
@@ -419,7 +384,7 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
for (TraceStaticMapping mapping : allEntries) {
newEntries.add(mapping);
}
- try (Transaction tx = trace.openTransaction("Remove .text mapping")) {
+ try (Transaction _ = trace.openTransaction("Remove .text mapping")) {
for (TraceStaticMapping mapping : newEntries) {
mapping.delete();
}
@@ -429,32 +394,13 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
String fileName = previousRoot.substring(previousRoot.lastIndexOf("?/") + 2);
URL localProjectURL = rootFolder.getLocalProjectURL();
URL url = new URI(localProjectURL + fileName).toURL();
- try (Transaction tx = trace.openTransaction("Remove .text mapping")) {
+ try (Transaction _ = trace.openTransaction("Remove .text mapping")) {
staticMappingManager.add(mapping.getTraceAddressRange(), mapping.getLifespan(),
url, mapping.getStaticAddress());
}
}
}
- protected void addPlugins() throws Throwable {
- codeBrowserPlugin = addPlugin(tool, CodeBrowserPlugin.class);
- staticListing = codeBrowserPlugin.getProvider().getListingPanel();
- listingPlugin = addPlugin(tool, DebuggerListingPlugin.class);
- valuesPlugin = addPlugin(tool, VariableValueHoverPlugin.class);
- mappingService = addPlugin(tool, DebuggerStaticMappingServicePlugin.class);
- dynamicListing = listingPlugin.getProvider().getListingPanel();
- //addPlugin(tool, DebuggerControlPlugin.class);
- //addPlugin(tool, DebuggerStaticMappingPlugin.class);
- //addPlugin(tool, DebuggerModelPlugin.class);
- addPlugin(tool, DisassemblerPlugin.class);
- addPlugin(tool, DecompilePlugin.class);
- valuesService = valuesPlugin.getHoverService();
-
- decompilerProvider = waitForComponentProvider(DecompilerProvider.class);
- decompilerPanel = decompilerProvider.getDecompilerPanel();
- tool.showComponentProvider(decompilerProvider, true);
- }
-
public record HoverLocation(ProgramLocation pLoc, FieldLocation fLoc, Field field,
ClangToken token) {}
@@ -587,6 +533,7 @@ public class DbgEngStackUnwindTest extends AbstractDbgEngTraceRmiTest {
@Override
public void dataChanged(BigInteger start, BigInteger end) {
+ // IGNORE
}
});
tool.showComponentProvider(decompilerProvider, true);