Rework API for getting at instructions

[frida/frida.git] / src / core / InformationManager.cxx

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index bee2a9eef9c9cbdd6e9ec66be681160f27fda9b5..e1571892349336ab5d0cc94f1d64104d64428d68 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -1,8 +1,10 @@
 #include "InformationManager.hxx"
+#include "bindings/Interpreter.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
 #include "core/Comment.hxx"
+#include "core/events/NewFunctionEvent.hxx"
 
 #include "gui/qt.hxx"
 #include <quazip/quazip.h>
@@ -13,9 +15,15 @@
 InformationManager* current_information_manager;
 
 InformationManager::InformationManager()
-       : logger(log4cxx::Logger::getLogger("InformationManager"))
+       : logger(log4cxx::Logger::getLogger("core.InformationManager"))
 {
        current_information_manager = this;
+
+       QPluginLoader* loader = new QPluginLoader("libguilePlugin", NULL);
+       if (!loader->load())
+               LOG4CXX_ERROR(logger, "Loading plugin failed: " << loader->errorString().toStdString());
+       interpreters["GUILE"] = qobject_cast<Interpreter*>(loader->instance());
+       plugins.push_back(loader);
 }
 
 InformationManager::~InformationManager() {
@@ -24,6 +32,9 @@ InformationManager::~InformationManager() {
 
        for (auto f : functions)
                delete f.second;
+
+       for (auto i : plugins)
+               delete i;
 }
 
 void InformationManager::reset(const std::string& filename) {
@@ -109,8 +120,10 @@ void InformationManager::save(const std::string& filename) {
        zip.close();
 }
 
-void InformationManager::signal_new_function(Function* fun) {
-}
+
+/* *******************************
+ * Accessors for the Functions map
+ */
 
 Function* InformationManager::getFunction(uint64_t address) {
        auto it = functions.find(address);
@@ -120,6 +133,18 @@ Function* InformationManager::getFunction(uint64_t address) {
                return NULL;
 }
 
+std::map<uint64_t, Function*>::const_iterator InformationManager::beginFunctions() {
+       return functions.begin();
+}
+std::map<uint64_t, Function*>::const_iterator InformationManager::endFunctions() {
+       return functions.end();
+}
+
+
+/* *********************************
+ * Accessors for the BasicBlocks map
+ */
+
 BasicBlock* InformationManager::getBasicBlock(uint64_t address) {
        auto it = blocks.find(address);
        if (it != blocks.end())
@@ -128,8 +153,46 @@ BasicBlock* InformationManager::getBasicBlock(uint64_t address) {
                return NULL;
 }
 
+std::map<uint64_t, BasicBlock*>::const_iterator InformationManager::beginBasicBlocks() {
+       return blocks.begin();
+}
+std::map<uint64_t, BasicBlock*>::const_iterator InformationManager::endBasicBlocks() {
+       return blocks.end();
+}
+
+
+/* *********************************
+ * Accessors for the Interpreter map
+ */
+
+Interpreter* InformationManager::getInterpreter(const std::string& name) {
+       auto it = interpreters.find(name);
+       if (it != interpreters.end())
+               return it->second;
+       else
+               return NULL;
+}
+
+std::map<std::string, Interpreter*>::const_iterator InformationManager::beginInterpreters() {
+       return interpreters.begin();
+}
+std::map<std::string, Interpreter*>::const_iterator InformationManager::endInterpreters() {
+       return interpreters.end();
+}
+
+
+/* ********************************
+ * Factory methods for data classes
+ */
+
 Function* InformationManager::newFunction(uint64_t address) {
-       Function* fun = new Function(address, this);
+       Function* fun = new Function(address, false, this);
+       functions.insert(std::make_pair(address, fun));
+       return fun;
+}
+
+Function* InformationManager::newDynamicFunction(uint64_t address) {
+       Function* fun = new Function(address, true, this);
        functions.insert(std::make_pair(address, fun));
        return fun;
 }
@@ -141,11 +204,15 @@ BasicBlock* InformationManager::newBasicBlock(uint64_t address) {
 }
 
 Comment* InformationManager::newGlobalComment(uint64_t address) {
-       return NULL;
+       Comment* comment = new Comment(address, this);
+       comments.insert(std::make_pair(address, comment));
+       return comment;
 }
 
 Comment* InformationManager::newLocalComment(uint64_t address, Function* f) {
-       return NULL;
+       Comment* comment = new Comment(address, this);
+       comments.insert(std::make_pair(address, comment));
+       return comment;
 }
 
 void InformationManager::finishFunction(Function* fun) {
@@ -154,10 +221,11 @@ void InformationManager::finishFunction(Function* fun) {
                BasicBlock* bl = b.second;
                blocks.insert(std::make_pair(bl->getStartAddress(), bl));
        }
-       new_function_signal(fun);
+       NewFunctionEvent event(fun->getStartAddress(), fun);
+       dispatch(&event);
 }
 
-void InformationManager::finishBasicBlock(BasicBlock* b) {
+void InformationManager::finishBasicBlock(BasicBlock*) {
 }
 
 void InformationManager::finnishComment(Comment* c) {
@@ -174,5 +242,12 @@ void InformationManager::deleteBasicBlock(BasicBlock* b) {
 }
 
 void InformationManager::deleteComment(Comment* c) {
+       auto range = comments.equal_range(c->getAddress());
+       for (auto it = range.first; it != range.second; ++it) {
+               if (it->second == c) {
+                       comments.erase(it);
+                       break;
+               }
+       }
        delete c;
 }