More logging in LLVMDisassembler

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

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index fd0715b851adfe927601fe50aa0bc5ef9e552485..5a70dee6a54041951a4461723a85f40714caf518 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -1,4 +1,5 @@
 #include "InformationManager.hxx"
+#include "bindings/Interpreter.hxx"
 #include "disassembler/llvm/LLVMDisassembler.hxx"
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
@@ -10,9 +11,19 @@
 
 #include <QTemporaryFile>
 
+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() {
        for (auto b : blocks)
@@ -20,6 +31,9 @@ InformationManager::~InformationManager() {
 
        for (auto f : functions)
                delete f.second;
+
+       for (auto i : plugins)
+               delete i;
 }
 
 void InformationManager::reset(const std::string& filename) {
@@ -108,6 +122,12 @@ void InformationManager::save(const std::string& filename) {
 void InformationManager::signal_new_function(Function* fun) {
 }
 
+
+
+/* *******************************
+ * Accessors for the Functions map
+ */
+
 Function* InformationManager::getFunction(uint64_t address) {
        auto it = functions.find(address);
        if (it != functions.end())
@@ -116,6 +136,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())
@@ -124,6 +156,38 @@ 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);
        functions.insert(std::make_pair(address, fun));