X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=37814014596b29e860a53778b9b09cfbc551ff33;hp=454119e25d11623738996f3f81dff2d504302877;hb=4443ad3e38327c776dcc68538591456d37c9ed6f;hpb=7d4bf581b5f2885d00a86f8a6235bc12fca10731

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 454119e..3781401 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,29 +1,32 @@
 #include "BasicBlockWidget.hxx"
-#include "CustomQGraphicsTextItem.hxx"
 #include "gui/Mainwindow.hxx"
 #include "gui/dialogs/SimpleStringDialog.hxx"
+#include "core/BasicBlock.hxx"
+#include "core/Function.hxx"
+#include "core/InformationManager.hxx"
+#include "core/events/RenameFunctionEvent.hxx"
+#include <iostream>
 
 class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
 public:
-	CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent, Mainwindow* mainwindow)
-		: QGraphicsTextItem(text, parent), parent(parent), mainwindow(mainwindow) {}
+	CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent)
+		: QGraphicsTextItem(text, parent), parent(parent) {}
 	void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
 private:
+	void addComment(QTextTableCell cell, const QString& title);
+
 	BasicBlockWidget* parent;
-	Mainwindow* mainwindow;
 };
 
-namespace {
-	void addComment(QTextTableCell cell, const QString& title) {
-		SimpleStringDialog dialog(title);
-		int result = dialog.exec();
-		if (QDialog::Accepted == result) {
-			// LOG4CXX_DEBUG(logger, "adding comment " << dialog.result().toStdString()
-			//               << " at row " << cell.row());
-			cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
-		} else {
-			// LOG4CXX_DEBUG(logger, "addComment aborted");
-		}
+void CustomQGraphicsTextItem::addComment(QTextTableCell cell, const QString& title) {
+	SimpleStringDialog dialog(title);
+	int result = dialog.exec();
+	if (QDialog::Accepted == result) {
+		LOG4CXX_DEBUG(parent->logger, "adding comment " << dialog.result().toStdString()
+		              << " at row " << cell.row());
+		cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
+	} else {
+		LOG4CXX_DEBUG(parent->logger, "addComment aborted");
 	}
 }
 
@@ -38,7 +41,7 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e
 	if (ok) {
 		QAction* act = menu.addAction(c.selectedText() + " is a Function");
 		QObject::connect(act, &QAction::triggered,
-		                 [=]() {mainwindow->requestNewFunctionByAddress(address);});
+		                 [=]() {parent->mainwindow->requestNewFunctionByAddress(address);});
 	}
 
 	QTextTable* table = c.currentTable();
@@ -61,47 +64,18 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                    Mainwindow * mainwindow)
 	: width(270), height(45), name(name)
 	, _table(NULL)
-	, block(block), mainwindow(mainwindow) {
+	, block(block), mainwindow(mainwindow)
+	, logger(log4cxx::Logger::getLogger("gui.BasicBlockWidget." + name.toStdString())) {
 	next[0] = NULL;	next[1] = NULL;
-	_widget.reset(new CustomQGraphicsTextItem("", this, mainwindow));
+
+	block->getManager()->registerRenameFunctionEvent([=](RenameFunctionEvent* event) {updateFunctionName(event);});
+
+	_widget.reset(new CustomQGraphicsTextItem("", this));
 	_widget->setPos(5, 20);
 	_widget->setTextInteractionFlags(Qt::TextSelectableByMouse|
 	                                Qt::LinksAccessibleByMouse);
 
 	if (width < 250) width = 250;
-}
-
-void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               QString line, const QString& href) {
-	QString bytestring;
-	int row;
-
-	if (_table) {
-		row = _table->rows();
-		_table->appendRows(1);
-	} else {
-		row = 0;
-		QTextTableFormat format;
-		format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
-		format.setBorder(0);
-		_table = _widget->textCursor().insertTable(1, 3, format);
-	}
-
-	for (size_t i(0); i < num_bytes; ++i) {
-		const char * hexdigits = "0123456789ABCDEF";
-		bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
-		bytestring += hexdigits[bytes[i] & 0xF];
-		bytestring += ' ';
-	}
-
-	_table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
-
-	line = line.replace('\t', ' ').toHtmlEscaped();
-	if (href != "") {
-		line = "<a href=\"" + href + "\">" + line + "</a>";
-	}
-
-	_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
 
 	QObject::connect(_widget.get(), &QGraphicsTextItem::linkActivated,
 	                 [=](QString str) {
@@ -110,10 +84,82 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 			                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
 		                 }
 	                 });
+	instructions = block->getInstructions();
+	populateWidget();
+}
+
+void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) {
+	QString search = QString("function:") + QString::number(event->address, 16);
+	QTextDocument *document = _widget->document();
+	QTextBlock b = document->begin();
+	while (b.isValid()) {
+		for (QTextBlock::iterator i = b.begin(); !i.atEnd(); ++i) {
+			QTextCharFormat format = i.fragment().charFormat();
+			bool isLink = format.isAnchor();
+			if (isLink)
+			{
+				if (search == format.anchorHref()) {
+					LOG4CXX_DEBUG(logger, i.fragment().text().toStdString() << " ---> " << format.anchorHref().toStdString());
+					QTextCursor c(b);
+					c.setPosition(i.fragment().position());
+					c.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, i.fragment().length());
+					c.movePosition(QTextCursor::Left,  QTextCursor::KeepAnchor, i.fragment().length());
+					c.movePosition(QTextCursor::WordRight,  QTextCursor::KeepAnchor);
+					c.insertText(event->new_name.c_str());
+				}
+			}
+		}
+		b = b.next();
+	}
+}
+
+void BasicBlockWidget::populateWidget() {
+	int row;
+	QTextTableFormat format;
+	format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
+	format.setBorder(0);
+
+	for (Instruction& inst : instructions) {
+		if (_table) {
+			row = _table->rows();
+			_table->appendRows(1);
+		} else {
+			row = 0;
+			_table = _widget->textCursor().insertTable(1, 3, format);
+		}
+		QString bytestring;
+		for (uint8_t byte : inst.getBytes()) {
+			const char * hexdigits = "0123456789ABCDEF";
+			bytestring += hexdigits[(byte >> 4) & 0xF];
+			bytestring += hexdigits[byte & 0xF];
+			bytestring += ' ';
+		}
+		_table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
+
+		QString line = inst.getText().c_str();
+		line = line.replace('\t', ' ').toHtmlEscaped();
+		if (inst.getReference() != "") {
+			QString href = inst.getReference().c_str();
+			QStringList list = href.split(":");
+			if (list[0] == "function") {
+				uint64_t address = href.split(":")[1].toLongLong(NULL, 16);
+				Function* fun = block->getManager()->getFunction(address);
+
+				if (fun) {
+					line = line.split(" ")[0] + " " + QString(fun->getName().c_str()).toHtmlEscaped();
+					LOG4CXX_DEBUG(logger, "Naming function at " << address << " " << fun->getName());
+				}
+			}
+			line = "<a href=\"" + href + "\">" + line + "</a>";
+		}
+
+		_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+	}
 }
 
-void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-	           QWidget *widget) {
+void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem*,
+	           QWidget*) {
+	_widget->adjustSize();
 	width = 10 + _widget->boundingRect().width();
 	height = 25 + _widget->boundingRect().height();
 	if (width < 250) width = 250;