Save dynamic attribute of functions

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

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 5a70dee6a54041951a4461723a85f40714caf518..6179f5f1ff2d83c5287ed07f629674907da15139 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -4,6 +4,8 @@
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
 #include "core/Comment.hxx"
+#include "core/events/NewFunctionEvent.hxx"
+#include "core/events/ChangeCommentEvent.hxx"
 
 #include "gui/qt.hxx"
 #include <quazip/quazip.h>
@@ -74,7 +76,7 @@ void InformationManager::load(const std::string& filename) {
                        QXmlStreamReader reader(&file);
                        assert(QXmlStreamReader::StartDocument == reader.readNext());
                        assert(QXmlStreamReader::StartElement == reader.readNext());
-                       Function * fun = Function::deserialize(reader, this);
+                       Function::deserialize(reader, this);
                }
                file.close();
        }
@@ -119,10 +121,6 @@ void InformationManager::save(const std::string& filename) {
        zip.close();
 }
 
-void InformationManager::signal_new_function(Function* fun) {
-}
-
-
 
 /* *******************************
  * Accessors for the Functions map
@@ -163,6 +161,22 @@ std::map<uint64_t, BasicBlock*>::const_iterator InformationManager::endBasicBloc
        return blocks.end();
 }
 
+/* *********************************
+ * Accessors for the Comments map
+ */
+std::pair<
+       std::multimap<uint64_t, Comment*>::const_iterator,
+       std::multimap<uint64_t, Comment*>::const_iterator>
+InformationManager::getComments(uint64_t address) {
+       return comments.equal_range(address);
+}
+
+std::multimap<uint64_t, Comment*>::const_iterator InformationManager::beginComments() {
+       return comments.begin();
+}
+std::multimap<uint64_t, Comment*>::const_iterator InformationManager::endComments() {
+       return comments.end();
+}
 
 /* *********************************
  * Accessors for the Interpreter map
@@ -189,7 +203,13 @@ std::map<std::string, Interpreter*>::const_iterator InformationManager::endInter
  */
 
 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;
 }
@@ -201,11 +221,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, f, this);
+       comments.insert(std::make_pair(address, comment));
+       return comment;
 }
 
 void InformationManager::finishFunction(Function* fun) {
@@ -214,13 +238,17 @@ 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) {
+void InformationManager::finishComment(Comment* c) {
+       LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
+       ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);
+       dispatch(&event);
 }
 
 void InformationManager::deleteFunction(Function* f) {
@@ -234,5 +262,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;
 }