Remove old leftovers

[frida/frida.git] / src / Binary.hxx

diff --git a/src/Binary.hxx b/src/Binary.hxx
index 180d8eefe04948d73455a9edafe7051fee14fa35..1a865783f850633d6fbb4e8c80e0542168ddd3c1 100644 (file)
--- a/src/Binary.hxx
+++ b/src/Binary.hxx
@@ -1,7 +1,7 @@
 #ifndef INCLUDE__Binary_hxx
 #define INCLUDE__Binary_hxx
 
-#include "include.hxx"
+#include "include_llvm.hxx"
 #include "Section.hxx"
 
 #include <string>
@@ -10,43 +10,41 @@
 
 using llvm::OwningPtr;
 
-namespace qtlldb {
-    class Binary {
-    public:
-        Binary(const std::string& filename);
-
-        void disassemble();
-
-        void disassemble_functions();
-
-        void disassemble_cfg();
-
-        std::vector<std::string> getSymbols();
-
-        std::vector<std::string> getFunctions();
-        void for_each_instruction(const std::string& function, std::function<void (long, std::string, std::string)> callback);
-
-    private:
-        llvm::Triple triple;
-        const llvm::Target * target;
-        llvm::object::ObjectFile * o;
-
-        OwningPtr<llvm::object::Binary> binary;
-        OwningPtr<const llvm::MCRegisterInfo> MRI;
-        OwningPtr<const llvm::MCAsmInfo> AsmInfo;
-        OwningPtr<llvm::MCModule> Mod;
-        OwningPtr<llvm::MCInstPrinter> IP;
-        OwningPtr<llvm::MCDisassembler> DisAsm;
-        OwningPtr<const llvm::MCObjectFileInfo> MOFI;
-        OwningPtr<llvm::MCContext> Ctx;
-        OwningPtr<const llvm::MCInstrAnalysis> MIA;
-        OwningPtr<const llvm::MCSubtargetInfo> STI;
-        OwningPtr<const llvm::MCInstrInfo> MII;
-        OwningPtr<llvm::MCRelocationInfo> RelInfo;
-        OwningPtr<llvm::MCSymbolizer> Symzer;
-
-        std::map<std::string, llvm::object::SectionRef> sections;
-        std::map<std::string, llvm::object::SymbolRef> symbols;
-    };
-}
+class Binary {
+public:
+    Binary(const std::string& filename);
+
+    void disassemble();
+
+    void disassemble_functions();
+
+    void disassemble_cfg();
+
+    std::vector<std::string> getSymbols();
+
+    std::vector<std::string> getFunctions();
+    void for_each_instruction(const std::string& function, std::function<void (long, std::string, std::string)> callback);
+
+private:
+    llvm::Triple triple;
+    const llvm::Target * target;
+    llvm::object::ObjectFile * o;
+
+    llvm::object::Binary* binary;
+    OwningPtr<const llvm::MCRegisterInfo> MRI;
+    OwningPtr<const llvm::MCAsmInfo> AsmInfo;
+    OwningPtr<llvm::MCModule> Mod;
+    OwningPtr<llvm::MCInstPrinter> IP;
+    OwningPtr<llvm::MCDisassembler> DisAsm;
+    OwningPtr<const llvm::MCObjectFileInfo> MOFI;
+    OwningPtr<llvm::MCContext> Ctx;
+    OwningPtr<const llvm::MCInstrAnalysis> MIA;
+    OwningPtr<const llvm::MCSubtargetInfo> STI;
+    OwningPtr<const llvm::MCInstrInfo> MII;
+    OwningPtr<llvm::MCRelocationInfo> RelInfo;
+    OwningPtr<llvm::MCSymbolizer> Symzer;
+
+    std::map<std::string, llvm::object::SectionRef> sections;
+    std::map<std::string, llvm::object::SymbolRef> symbols;
+};
 #endif