X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=9d8e45f66e5f69749e06223d96e620e6be761bec;hp=654dc16aafd6f7ad386b7840a15f155ba0b84531;hb=adb0e762792c23674633b8513f4106b82aa38d15;hpb=11fd69cdfce58707599bf57c07c5a784905e23f6

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 654dc16..9d8e45f 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -1,9 +1,11 @@
 #include "Mainwindow.hxx"
 #include "qt.hxx"
+#include "bindings/Guile.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
 #include "core/InformationManager.hxx"
+#include "core/events/RenameFunctionEvent.hxx"
 #include "widgets/ScriptingDock.hxx"
 #include "widgets/CFGScene.hxx"
 #include "widgets/FunctionWidget.hxx"
@@ -44,9 +46,23 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	fileMenu->addSeparator();
 	fileMenu->addAction(exitAction);
 
-	scripting = new ScriptingDock(tr("Scripting"), this);
+	QMenu* interpretermenu = menuBar()->addMenu(tr("&Interpreter"));
+
+	interpreter["GUILE"] = new GuileInterpreter;
+	scripting = new ScriptingDock(interpreter["GUILE"], tr("Scripting"), this);
 	scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
 	addDockWidget(Qt::BottomDockWidgetArea, scripting);
+	QAction* guileLoad = new QAction(tr("&GUILE"), this);
+	interpretermenu->addAction(guileLoad);
+	connect(guileLoad, &QAction::triggered,
+	        [&]() {
+		        QString fileName = QFileDialog::getOpenFileName(this, tr("Open Script"), "",
+		                                                        tr("Binaries") + " (*." +
+		                                                        interpreter["GUILE"]->fileExtension().c_str() + ")");
+		        std::stringstream a, b;
+		        std::string c;
+		        interpreter["GUILE"]->loadFile(fileName.toStdString(), a, b, c);
+	        });
 
 	listWidget = new QTreeWidget();
 	listWidget->setColumnCount(1);
@@ -78,6 +94,12 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 			auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
 			item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
 		});
+	mgr->connect_rename_function_signal([&](RenameFunctionEvent* event) {
+			if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
+				return;
+			auto item = objects_list_by_address[event->address];
+			if (item) item->setText(0, event->new_name.c_str());
+		});
 	setGlobalHotkeys();
 }
 
@@ -208,7 +230,6 @@ void Mainwindow::renameFunction(Function* function) {
 		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");
 	}
@@ -245,8 +266,9 @@ void Mainwindow::addFunction(Function* fun) {
 			start_address = b.first;
 	}
 
+	std::map<uint64_t, BasicBlockWidget*> _blocks;
 	local__add_basic_block(block, this,
-	                       manager, blocks, scene, start_address, 100);
+	                       manager, _blocks, scene, start_address, 100);
 
 	QGraphicsView * view = new QGraphicsView(scene);
 	w->addTab(view, "CFG");