#include "Mainwindow.hxx"
#include "qt.hxx"
#include "disassembler/llvm/LLVMDisassembler.hxx"
-
+#include "core/Function.hxx"
+#include "core/BasicBlock.hxx"
+#include "core/InformationManager.hxx"
+#include "widgets/ScriptingDock.hxx"
#include "widgets/CFGScene.hxx"
+#include "widgets/FunctionWidget.hxx"
#include "dialogs/NewFunctionDialog.hxx"
-#include "dialogs/RenameFunctionDialog.hxx"
+#include "dialogs/SimpleStringDialog.hxx"
#include <sstream>
namespace {
BasicBlockWidget *
- local__add_basic_block(BasicBlock * block, Disassembler * dis,
- Mainwindow * mainwindow,
+ local__add_basic_block(BasicBlock * block,
+ Mainwindow * mainwindow, InformationManager * manager,
std::map<uint64_t, BasicBlockWidget*>& known_blocks,
CFGScene * scene, uint64_t starty, uint64_t startx);
}
: manager(mgr)
, logger(log4cxx::Logger::getLogger("Mainwindow")) {
openAction = new QAction(tr("&Open"), this);
- // saveAction = new QAction(tr("&Save"), this);
+ loadAction = new QAction(tr("&Load"), this);
+ saveAction = new QAction(tr("&Save"), this);
exitAction = new QAction(tr("E&xit"), this);
- connect(openAction, SIGNAL(triggered()),
- this, SLOT(open()));
- // connect(saveAction, SIGNAL(triggered()), this, SLOT(save()));
- connect(exitAction, SIGNAL(triggered()),
- qApp, SLOT(quit()));
+ connect(openAction, &QAction::triggered,
+ this, &Mainwindow::open);
+ connect(loadAction, &QAction::triggered,
+ this, &Mainwindow::load);
+ connect(saveAction, &QAction::triggered,
+ this, &Mainwindow::save);
+ connect(exitAction, &QAction::triggered,
+ qApp, &QApplication::quit);
fileMenu = menuBar()->addMenu(tr("&File"));
fileMenu->addAction(openAction);
- // fileMenu->addAction(saveAction);
+ fileMenu->addAction(loadAction);
+ fileMenu->addAction(saveAction);
fileMenu->addSeparator();
fileMenu->addAction(exitAction);
scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
addDockWidget(Qt::BottomDockWidgetArea, scripting);
- listWidget = new QListWidget();
+ listWidget = new QTreeWidget();
+ listWidget->setColumnCount(1);
+ listWidget->setDragDropMode(QAbstractItemView::InternalMove);
listWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(listWidget, SIGNAL(customContextMenuRequested(const QPoint&)),
this, SLOT(showListContextMenu(const QPoint&)));
addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
setCentralWidget(stackedWidget);
- connect(listWidget, SIGNAL(currentRowChanged(int)),
- this, SLOT(switchMainPlane(int)));
+ connect(listWidget, &QTreeWidget::currentItemChanged,
+ [=] (QTreeWidgetItem* current, QTreeWidgetItem*) {
+ switchMainPlane(current);
+ });
setWindowTitle(tr("FRIDA"));
+ QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList("External Functions"));
+ external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
+ external->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
mgr->connect_new_function_signal([&] (Function* fun) {addFunction(fun);});
- mgr->connect_new_dyn_symbol_signal([&] (const std::string& name) {
- auto item = new QListWidgetItem(name.c_str(), listWidget);
- item->setBackground(QBrush(QColor(0xff, 0xdd, 0xdd)));
+ mgr->connect_new_dyn_symbol_signal([=] (const std::string& name) {
+ auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
+ item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
});
setGlobalHotkeys();
}
shortcut = new QShortcut(QKeySequence("r"), listWidget);
connect(shortcut, &QShortcut::activated, [=]() {
- QListWidgetItem * item = listWidget->currentItem();
- if (item) renameFunction(item);
+ QTreeWidgetItem * item = listWidget->currentItem();
+ if (item) renameFunction(objects_list[item]->getFunction());
});
}
void Mainwindow::open() {
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "",
tr("Binaries (*)"));
-
manager->reset(fileName.toStdString());
}
+void Mainwindow::load() {
+ QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "",
+ tr("Frida Archives (*.frida)"));
+ manager->load(fileName.toStdString());
+}
+
+void Mainwindow::save() {
+ QString filename = QFileDialog::getSaveFileName(this, tr("Save File"), "", tr("Frida Archives (*.frida)"));
+ manager->save(filename.toStdString());
+}
+
void Mainwindow::switchMainPlaneToAddress(uint64_t address) {
if (objects_list_by_address.find(address) != objects_list_by_address.end()) {
LOG4CXX_DEBUG(logger, "Switching to function " << std::hex << address);
- QListWidgetItem * item = objects_list_by_address[address];
+ QTreeWidgetItem * item = objects_list_by_address[address];
listWidget->setCurrentItem(item);
stackedWidget->setCurrentWidget(objects_list[item]);
} else {
}
}
-void Mainwindow::switchMainPlane(int index) {
- stackedWidget->setCurrentWidget(objects_list[listWidget->currentItem()]);
+void Mainwindow::switchMainPlane(QTreeWidgetItem* to) {
+ if (objects_list.end() != objects_list.find(to))
+ stackedWidget->setCurrentWidget(objects_list[to]);
}
void Mainwindow::showListContextMenu(const QPoint& point) {
- QListWidgetItem * item = listWidget->itemAt(point);
+ QAction * act;
+ QTreeWidgetItem * item = listWidget->itemAt(point);
QMenu menu(this);
+
+ act = menu.addAction("Add Function");
+ connect(act, &QAction::triggered, this, &Mainwindow::requestNewFunction);
+
+ act = menu.addAction("Add Group");
+ connect(act, &QAction::triggered, this, &Mainwindow::requestNewGroup);
+
if (item) {
- QAction * act = menu.addAction("Rename Function");
- connect(act, &QAction::triggered, [=]() {this->renameFunction(item);});
- } else {
- QAction * act = menu.addAction("AddFunction");
- connect(act, SIGNAL(triggered()), this, SLOT(requestNewFunction()));
+ if (objects_list.find(item) != objects_list.end()) {
+ act = menu.addAction("Rename Function");
+ connect(act, &QAction::triggered, [=]() {this->renameFunction(objects_list[item]->getFunction());});
+ } else {
+ act = menu.addAction("Rename Group");
+ connect(act, &QAction::triggered, [=]() {renameGroup(item);});
+ }
+
+
+ QMenu* submenu = menu.addMenu("Move to group");
+
+ for (QTreeWidgetItem* groupitem : group_list) {
+ act = submenu->addAction(groupitem->text(0));
+ connect(act, &QAction::triggered,
+ [=] () {
+ listWidget->invisibleRootItem()->removeChild(item);
+ groupitem->addChild(item);
+ });
+ }
}
+
menu.exec(listWidget->mapToGlobal(point));
}
NewFunctionDialog dialog;
int result = dialog.exec();
if (QDialog::Accepted == result) {
- LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << dialog.result());
- manager->getDisassembler()->disassembleFunctionAt(dialog.result());
+ requestNewFunctionByAddress(dialog.result());
} else {
LOG4CXX_DEBUG(logger, "requestNewFunction aborted");
}
}
-void Mainwindow::renameFunction(QListWidgetItem * item) {
- RenameFunctionDialog dialog;
+void Mainwindow::requestNewGroup() {
+ SimpleStringDialog dialog("New Group");
+ int result = dialog.exec();
+ if (QDialog::Accepted == result) {
+ QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList(dialog.result()));
+ external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
+ group_list.push_back(external);
+ } else {
+ LOG4CXX_DEBUG(logger, "requestNewGroup aborted");
+ }
+}
+
+void Mainwindow::requestNewFunctionByAddress(uint64_t address) {
+ LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << address);
+ manager->getDisassembler()->disassembleFunctionAt(address);
+ switchMainPlaneToAddress(address);
+}
+
+void Mainwindow::renameFunction(Function* function) {
+ SimpleStringDialog dialog("New name");
+ int result = dialog.exec();
+ if (QDialog::Accepted == result) {
+ LOG4CXX_DEBUG(logger, "renaming Function " << function->getName()
+ << " to " << dialog.result().toStdString());
+ function->setName(dialog.result().toStdString());
+ objects_list_by_address[function->getStartAddress()]->setText(0, dialog.result());
+ } else {
+ LOG4CXX_DEBUG(logger, "renameFunction aborted");
+ }
+}
+
+void Mainwindow::renameGroup(QTreeWidgetItem* item) {
+ SimpleStringDialog dialog("New name");
int result = dialog.exec();
if (QDialog::Accepted == result) {
- LOG4CXX_DEBUG(logger, "renaming Function" << item->text().toStdString()
+ LOG4CXX_DEBUG(logger, "renaming group " << item->text(0).toStdString()
<< " to " << dialog.result().toStdString());
- item->setText(dialog.result());
+ item->setText(0, dialog.result());
} else {
LOG4CXX_DEBUG(logger, "renameFunction aborted");
}
}
void Mainwindow::addFunction(Function* fun) {
- if (functions.find(fun) != functions.end())
+ if (functions.find(fun->getStartAddress()) != functions.end())
return;
- functions.insert(fun);
+ functions.insert(std::make_pair(fun->getStartAddress(), fun));
- QTabWidget * w = new QTabWidget();
+ FunctionWidget * w = new FunctionWidget(fun);
// CFG
CFGScene * scene = new CFGScene;
- Disassembler * dis = manager->getDisassembler();
- BasicBlock * block = dis->getBasicBlock(fun->getStartAddress());
+ BasicBlock * block = manager->getBasicBlock(fun->getStartAddress());
uint64_t start_address(std::numeric_limits<uint64_t>::max());
for (auto b : fun->blocks()) {
start_address = b.first;
}
- local__add_basic_block(block, manager->getDisassembler(), this,
- blocks, scene, start_address, 100);
+ local__add_basic_block(block, this,
+ manager, blocks, scene, start_address, 100);
QGraphicsView * view = new QGraphicsView(scene);
w->addTab(view, "CFG");
w->addTab(t, "Listing");
- QListWidgetItem * item = new QListWidgetItem(fun->getName().c_str(), listWidget);
+ QTreeWidgetItem * item = new QTreeWidgetItem(listWidget, QStringList(fun->getName().c_str()));
stackedWidget->addWidget(w);
objects_list.insert(std::make_pair(item, w));
LOG4CXX_DEBUG(logger, "Adding function widget at " << std::hex
namespace {
BasicBlockWidget *
- local__add_basic_block(BasicBlock * block, Disassembler * dis,
- Mainwindow * mainwindow,
+ local__add_basic_block(BasicBlock * block,
+ Mainwindow * mainwindow, InformationManager * manager,
std::map<uint64_t, BasicBlockWidget*>& known_blocks,
CFGScene * scene, uint64_t starty, uint64_t startx) {
widget->setFlag(QGraphicsItem::ItemIsMovable, true);
widget->moveBy(100*startx, block->getStartAddress() - starty);
- dis->printEachInstruction(block->getStartAddress(),
- block->getEndAddress(),
- [&](uint8_t* bytes,
- size_t byte_count,
- const std::string& line,
- const std::string& ref) {
- widget->addItem(bytes, byte_count,
- line.c_str() + 1, // remove \t
- ref.c_str());
- });
+ manager->getDisassembler()
+ ->printEachInstruction(block->getStartAddress(),
+ block->getEndAddress(),
+ [&](uint8_t* bytes,
+ size_t byte_count,
+ const std::string& line,
+ const std::string& ref) {
+ widget->addItem(bytes, byte_count,
+ line.c_str() + 1, // remove \t
+ ref.c_str());
+ });
BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL);
BasicBlock * tmpblock;
int xshift = 0;
if (block->getNextBlock(1) != 0)
xshift = 1;
- tmpblock = dis->getBasicBlock(block->getNextBlock(0));
- tmp = local__add_basic_block(tmpblock, dis,
- mainwindow,
+ tmpblock = manager->getBasicBlock(block->getNextBlock(0));
+ tmp = local__add_basic_block(tmpblock, mainwindow, manager,
known_blocks,
scene, starty, startx+xshift);
nextl = tmp;
tmp->addPrevious(widget);
}
if (block->getNextBlock(1) != 0) {
- tmpblock = dis->getBasicBlock(block->getNextBlock(1));
- tmp = local__add_basic_block(tmpblock, dis,
- mainwindow,
+ tmpblock = manager->getBasicBlock(block->getNextBlock(1));
+ tmp = local__add_basic_block(tmpblock, mainwindow, manager,
known_blocks,
scene, starty, startx-1);
nextr = tmp;
projects / frida / frida.git / blobdiff