Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use GTable to select modules from drcov log #14

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Use GTable to select modules from drcov log #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9fdd268
Nicer theme for dark users and works for light users as well
Jun 10, 2024
cf60723
Change from DECOMPILER which no longer exists to DIAGNOSTIC
Jun 10, 2024
ef8e5f6
Adding support for different Drcov module table formats across versio…
Jun 10, 2024
9d6cabc
DRCov v2 use base address
Jun 11, 2024
835874a
Base can be larger than an int, adjust it to be a long
Jun 13, 2024
ec39a85
Replaced Swing dialog with Ghidra's implementation
v-p-b Jul 2, 2024
948be6d
Code formatting
v-p-b Jul 2, 2024
8033569
merge upstream
v-p-b Sep 11, 2024
74794d8
removed merge artifacts
v-p-b Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/main/java/cartographer/CartographerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import docking.action.DockingAction;
import docking.action.MenuData;
import docking.tool.ToolConstants;
import docking.widgets.DataToStringConverter;
import docking.widgets.ListSelectionDialog;
import ghidra.app.decompiler.ClangToken;
import ghidra.app.decompiler.DecompileResults;
import ghidra.app.decompiler.DecompilerHighlightService;
Expand Down Expand Up @@ -60,7 +62,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.swing.JOptionPane;
import cartographer.CoverageFile.*;

//@formatter:off
Expand Down Expand Up @@ -513,18 +514,16 @@ public boolean loadCoverageFile(CoverageFile file) {
}

// Ask the user which module to use
String response = (String)JOptionPane.showInputDialog(
null,
"Please select the code coverage module to use.",
"Select a Coverage Module",
JOptionPane.QUESTION_MESSAGE,
null,
modNames.toArray(),
modNames.get(0)
);
ListSelectionDialog<String> responseDialog = new ListSelectionDialog<String>(
"Select a Coverage Module",
"Module",
modNames,
DataToStringConverter.stringDataToStringConverter);

responseDialog.show(tool.getActiveWindow());
String response = responseDialog.getSelectedItem();

// Bail if no option was chosen
if (response == null) {
if (responseDialog.wasCancelled()) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/cartographer/CoverageFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private void parseDrCovFile(RandomAccessFile reader) throws IOException {
// Populate the module list
populateModules(drcovModules);
}

/**
* Parses a DRCOV module.
*
Expand Down