X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=754d5b2b0f1ab244b7932e77f571b14f1abc4d85;hp=196db38a18b838923a3cc3403b2b6b7d6c8768d0;hb=26ff0a6f5b4ea19657f851a82a8d679f10d19edb;hpb=f6f7e517e577a67f01256ca0b0edea83729849f4 diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx index 196db38..754d5b2 100644 --- a/src/gui/Mainwindow.cxx +++ b/src/gui/Mainwindow.cxx @@ -3,22 +3,22 @@ #include "disassembler/llvm/LLVMDisassembler.hxx" #include "widgets/CFGScene.hxx" +#include "dialogs/NewFunctionDialog.hxx" +#include "dialogs/RenameFunctionDialog.hxx" -#include #include -#include - -#include namespace { BasicBlockWidget * local__add_basic_block(BasicBlock * block, Disassembler * dis, + Mainwindow * mainwindow, std::map& known_blocks, CFGScene * scene, uint64_t starty, uint64_t startx); } Mainwindow::Mainwindow(InformationManager* mgr) - : manager(mgr) { + : manager(mgr) + , logger(log4cxx::Logger::getLogger("Mainwindow")) { openAction = new QAction(tr("&Open"), this); // saveAction = new QAction(tr("&Save"), this); exitAction = new QAction(tr("E&xit"), this); @@ -40,6 +40,10 @@ Mainwindow::Mainwindow(InformationManager* mgr) addDockWidget(Qt::BottomDockWidgetArea, scripting); listWidget = new QListWidget(); + listWidget->setContextMenuPolicy(Qt::CustomContextMenu); + connect(listWidget, SIGNAL(customContextMenuRequested(const QPoint&)), + this, SLOT(showListContextMenu(const QPoint&))); + stackedWidget = new QStackedWidget(); dockWidget = new QDockWidget(tr("Functions"), this); dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | @@ -49,17 +53,33 @@ Mainwindow::Mainwindow(InformationManager* mgr) setCentralWidget(stackedWidget); connect(listWidget, SIGNAL(currentRowChanged(int)), - stackedWidget, SLOT(setCurrentIndex(int))); + this, SLOT(switchMainPlane(int))); setWindowTitle(tr("FRIDA")); 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))); + }); + setGlobalHotkeys(); +} + +void Mainwindow::setGlobalHotkeys() { + QShortcut *shortcut = new QShortcut(QKeySequence("f"), this); + connect(shortcut, &QShortcut::activated, this, &Mainwindow::requestNewFunction); + + shortcut = new QShortcut(QKeySequence("r"), listWidget); + connect(shortcut, &QShortcut::activated, [=]() { + QListWidgetItem * item = listWidget->currentItem(); + if (item) renameFunction(item); + }); } void Mainwindow::quit() { QMessageBox messageBox; - messageBox.setWindowTitle(tr("Notepad")); + messageBox.setWindowTitle(tr("Frida")); messageBox.setText(tr("Do you really want to quit?")); messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); messageBox.setDefaultButton(QMessageBox::No); @@ -74,6 +94,58 @@ void Mainwindow::open() { manager->reset(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]; + listWidget->setCurrentItem(item); + stackedWidget->setCurrentWidget(objects_list[item]); + } else { + LOG4CXX_DEBUG(logger, "No function at " << std::hex << address + << " -- it's probably an imported Symbol"); + } +} + +void Mainwindow::switchMainPlane(int index) { + stackedWidget->setCurrentWidget(objects_list[listWidget->currentItem()]); +} + +void Mainwindow::showListContextMenu(const QPoint& point) { + QListWidgetItem * item = listWidget->itemAt(point); + QMenu menu(this); + 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())); + } + menu.exec(listWidget->mapToGlobal(point)); +} + +void Mainwindow::requestNewFunction() { + 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()); + } else { + LOG4CXX_DEBUG(logger, "requestNewFunction aborted"); + } +} + +void Mainwindow::renameFunction(QListWidgetItem * item) { + RenameFunctionDialog dialog; + int result = dialog.exec(); + if (QDialog::Accepted == result) { + LOG4CXX_DEBUG(logger, "renaming Function" << item->text().toStdString() + << " to " << dialog.result().toStdString()); + item->setText(dialog.result()); + } else { + LOG4CXX_DEBUG(logger, "renameFunction aborted"); + } +} + void Mainwindow::addFunction(Function* fun) { if (functions.find(fun) != functions.end()) return; @@ -94,8 +166,8 @@ void Mainwindow::addFunction(Function* fun) { start_address = b.first; } - local__add_basic_block(block, manager->getDisassembler(), blocks, scene, - start_address, 100); + local__add_basic_block(block, manager->getDisassembler(), this, + blocks, scene, start_address, 100); QGraphicsView * view = new QGraphicsView(scene); w->addTab(view, "CFG"); @@ -107,13 +179,18 @@ void Mainwindow::addFunction(Function* fun) { w->addTab(t, "Listing"); - listWidget->addItem(fun->getName().c_str()); + QListWidgetItem * item = new QListWidgetItem(fun->getName().c_str(), listWidget); stackedWidget->addWidget(w); + objects_list.insert(std::make_pair(item, w)); + LOG4CXX_DEBUG(logger, "Adding function widget at " << std::hex + << fun->getStartAddress()); + objects_list_by_address.insert(std::make_pair(fun->getStartAddress(), item)); } namespace { BasicBlockWidget * local__add_basic_block(BasicBlock * block, Disassembler * dis, + Mainwindow * mainwindow, std::map& known_blocks, CFGScene * scene, uint64_t starty, uint64_t startx) { @@ -124,7 +201,8 @@ namespace { std::stringstream s; s << "BLOCK_" << std::hex << block->getStartAddress() << "_" << block->getEndAddress(); - BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(), block); + BasicBlockWidget * widget = new BasicBlockWidget(s.str().c_str(), + block, mainwindow); known_blocks.insert(std::make_pair(block->getStartAddress(), widget)); @@ -136,8 +214,11 @@ namespace { block->getEndAddress(), [&](uint8_t* bytes, size_t byte_count, - const std::string& line) { - widget->addItem(bytes, byte_count, line.c_str() + 1); + 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); @@ -148,6 +229,7 @@ namespace { xshift = 1; tmpblock = dis->getBasicBlock(block->getNextBlock(0)); tmp = local__add_basic_block(tmpblock, dis, + mainwindow, known_blocks, scene, starty, startx+xshift); nextl = tmp; @@ -156,6 +238,7 @@ namespace { if (block->getNextBlock(1) != 0) { tmpblock = dis->getBasicBlock(block->getNextBlock(1)); tmp = local__add_basic_block(tmpblock, dis, + mainwindow, known_blocks, scene, starty, startx-1); nextr = tmp;