Rework API for getting at instructions

[frida/frida.git] / src / gui / widgets / BasicBlockWidget.cxx

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 128b9fb5401d0e4b3977057af4d5ffe5212e8315..37814014596b29e860a53778b9b09cfbc551ff33 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -84,6 +84,8 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                         mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
                                 }
                         });
+       instructions = block->getInstructions();
+       populateWidget();
 }
 
 void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) {
@@ -111,47 +113,48 @@ void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) {
        }
 }
 
-void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               QString line, const QString& href) {
-       QString bytestring;
+void BasicBlockWidget::populateWidget() {
        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 != "") {
-               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());
+       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>";
                }
-               line = "<a href=\"" + href + "\">" + line + "</a>";
-       }
 
-       _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+               _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+       }
 }
 
 void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem*,