Name functions in BasicBlock view

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

diff --git a/src/core/InformationManager.hxx b/src/core/InformationManager.hxx
index a43b1181281cd1deea73b4d8cb595a1128bd108b..dc781285f049de01b2200f6a2e852ee3f21d9353 100644 (file)
--- a/src/core/InformationManager.hxx
+++ b/src/core/InformationManager.hxx
@@ -4,7 +4,7 @@
 #include <boost/signals2.hpp>
 #include <functional>
 #include <string>
-#include <set>
+#include <map>
 
 class Disassembler;
 class Function;
@@ -12,6 +12,8 @@ class BasicBlock;
 
 class QString;
 
+class RenameFunctionEvent;
+
 class InformationManager {
 public:
        ~InformationManager();
@@ -20,33 +22,45 @@ public:
        void save(const QString& filename);
 
        void signal_new_function(Function* f);
+       void signal_new_dyn_symbol(const std::string& f)
+               { new_dyn_symbol_signal(f);     }
 
        boost::signals2::connection
        connect_new_function_signal(std::function<void(Function*)> f)
                { return new_function_signal.connect(f); }
 
-
-
        boost::signals2::connection
        connect_new_dyn_symbol_signal(std::function<void(const std::string& name)> f)
                { return new_dyn_symbol_signal.connect(f); }
 
-       void signal_new_dyn_symbol(const std::string& f)
-               { new_dyn_symbol_signal(f);     }
-
        boost::signals2::connection
        connect_reset_signal(std::function<void ()> f)
                { return reset_signal.connect(f); }
 
+       boost::signals2::connection
+       connect_rename_function_signal(std::function<void (RenameFunctionEvent*)> f)
+               { return rename_function_signal.connect(f); }
+
        Disassembler* getDisassembler()
                { return disassembler.get(); }
+
+       void dispatch(RenameFunctionEvent* event)
+               { rename_function_signal(event); }
+
+       Function* getFunction(uint64_t address)
+       { return functions[address]; }
+
+       BasicBlock* getBlock(uint64_t address)
+       { return blocks[address]; }
+
 private:
        boost::signals2::signal<void ()> reset_signal;
        boost::signals2::signal<void (Function*)> new_function_signal;
        boost::signals2::signal<void (const std::string& name)> new_dyn_symbol_signal;
+       boost::signals2::signal<void (RenameFunctionEvent*)> rename_function_signal;
        std::unique_ptr<Disassembler> disassembler;
-       std::set<Function*> functions;
-       std::set<BasicBlock*> blocks;
+       std::map<uint64_t, Function*> functions;
+       std::map<uint64_t, BasicBlock*> blocks;
 };
 
 #endif /* INCLUDE__InformationManager_hxx */