Adaptations done, but remain to be fixed at some points. Dyninst is c…

…ompiling.
dyninst · Feb 24, 2017 · cd27406 · cd27406
1 parent 0e8585e
commit cd27406
Show file tree

Hide file tree

Showing 16 changed files with 291 additions and 229 deletions.
diff --git a/dwarf/h/dwarfExprParser.h b/dwarf/h/dwarfExprParser.h
@@ -42,7 +42,7 @@ namespace Dyninst {
 class VariableLocation;
 class ProcessReader;
 
-namespace Dwarf {
+namespace DwarfDyninst{
 
 class DwarfResult;
 

diff --git a/dwarf/h/dwarfFrameParser.h b/dwarf/h/dwarfFrameParser.h
@@ -43,7 +43,7 @@ namespace Dyninst {
 
 class VariableLocation;
 
-namespace Dwarf {
+namespace DwarfDyninst {
 
 class DwarfResult;
 

diff --git a/dwarf/h/dwarfHandle.h b/dwarf/h/dwarfHandle.h
@@ -39,7 +39,7 @@
 namespace Dyninst {
 class Elf_X;
 
-namespace Dwarf {
+namespace DwarfDyninst {
 class DwarfFrameParser;
 
 typedef boost::shared_ptr<DwarfFrameParser> DwarfFrameParserPtr;

diff --git a/dwarf/h/dwarfResult.h b/dwarf/h/dwarfResult.h
@@ -41,7 +41,7 @@ namespace Dyninst {
 class VariableLocation;
 class ProcessReader;
 
-namespace Dwarf {
+namespace DwarfDyninst {
 
 class DYNDWARF_EXPORT DwarfResult {
     // An interface for building representations of Dwarf expressions.

diff --git a/dwarf/src/dwarfExprParser.C b/dwarf/src/dwarfExprParser.C
@@ -41,7 +41,7 @@
 using namespace std;
 
 namespace Dyninst {
-namespace Dwarf {
+namespace DwarfDyninst {
 
 bool decodeDwarfExpression(Dwarf_Op * expr,
         Dwarf_Sword listlen,

diff --git a/dwarf/src/dwarfFrameParser.C b/dwarf/src/dwarfFrameParser.C
@@ -41,7 +41,7 @@
 #define DW_FRAME_CFA_COL3 ((Dwarf_Half) -1)
 
 using namespace Dyninst;
-using namespace Dwarf;
+using namespace DwarfDyninst;
 using namespace std;
 
 struct frameParser_key

diff --git a/dwarf/src/dwarfHandle.C b/dwarf/src/dwarfHandle.C
@@ -36,7 +36,7 @@
 #include <cstring>
 
 using namespace Dyninst;
-using namespace Dwarf;
+using namespace DwarfDyninst;
 using namespace std;
 
 // Add definitions that may not be in all elf.h files
@@ -162,7 +162,7 @@ bool DwarfHandle::init_dbg()
             assert(0 && "Unsupported archiecture in ELF file.");
             return false;
     }
-    sw = Dwarf::DwarfFrameParser::create(*frame_data, arch);
+    sw = DwarfDyninst::DwarfFrameParser::create(*frame_data, arch);
 
     init_dwarf_status = dwarf_status_ok;
     return true;

diff --git a/dwarf/src/dwarfResult.C b/dwarf/src/dwarfResult.C
@@ -40,7 +40,7 @@
 #include "debug_common.h"
 
 using namespace Dyninst;
-using namespace Dwarf;
+using namespace DwarfDyninst;
 using namespace std;
 
 #define CHECK_OPER(n) if (operands.size() < n) { error = true; break; }

diff --git a/stackwalk/src/dbginfo-stepper.C b/stackwalk/src/dbginfo-stepper.C
@@ -49,7 +49,7 @@
 
 using namespace Dyninst;
 using namespace Stackwalker;
-using namespace Dwarf;
+using namespace DwarfDyninst;
 
 static std::map<std::string, DwarfFrameParser::Ptr> dwarf_info;
 

diff --git a/stackwalk/src/dbgstepper-impl.h b/stackwalk/src/dbgstepper-impl.h
@@ -36,7 +36,7 @@
 
 namespace Dyninst {
 
-namespace Dwarf {
+namespace DwarfDyninst {
 class DwarfFrameParser;
 typedef boost::shared_ptr<DwarfFrameParser> DwarfFrameParserPtr;
 };
@@ -81,7 +81,7 @@ class DebugStepperImpl : public FrameStepper, public Dyninst::ProcessReader {
   virtual const char *getName() const;
  protected:
   gcframe_ret_t getCallerFrameArch(Address pc, const Frame &in, Frame &out, 
-                                   Dwarf::DwarfFrameParserPtr dinfo, bool isVsyscallPage);
+                                   DwarfDyninst::DwarfFrameParserPtr dinfo, bool isVsyscallPage);
   bool isFrameRegister(MachRegister reg);
   bool isStackRegister(MachRegister reg);
 };

diff --git a/symtabAPI/src/Function.C b/symtabAPI/src/Function.C
@@ -231,12 +231,12 @@ void FunctionBase::expandLocation(const VariableLocation &loc,
       return;
    }
 
-   Dyninst::Dwarf::DwarfFrameParser::Ptr frameParser =
-   Dyninst::Dwarf::DwarfFrameParser::create(*getModule()->exec()->getObject()->dwarf->frame_dbg(),
+   Dyninst::DwarfDyninst::DwarfFrameParser::Ptr frameParser =
+   Dyninst::DwarfDyninst::DwarfFrameParser::create(*getModule()->exec()->getObject()->dwarf->frame_dbg(),
 					    getModule()->exec()->getObject()->getArch());
 
    std::vector<VariableLocation> FDEs;
-   Dyninst::Dwarf::FrameErrors_t err;
+   Dyninst::DwarfDyninst::FrameErrors_t err;
    frameParser->getRegsForFunction(getOffset(),
                                    Dyninst::CFA,
                                    FDEs,

diff --git a/symtabAPI/src/Object-elf.C b/symtabAPI/src/Object-elf.C
@@ -47,7 +47,7 @@
 
 using namespace Dyninst;
 using namespace Dyninst::SymtabAPI;
-using namespace Dyninst::Dwarf;
+using namespace Dyninst::DwarfDyninst;
 using namespace std;
 
 #if !defined(_Object_elf_h_)

diff --git a/symtabAPI/src/Object-elf.h b/symtabAPI/src/Object-elf.h
@@ -66,7 +66,7 @@
 
 namespace Dyninst{
 
-namespace Dwarf {
+namespace DwarfDyninst {
    class DwarfFrameParser;
    typedef boost::shared_ptr<DwarfFrameParser> DwarfFrameParserPtr;
 }
@@ -474,7 +474,7 @@ class Object;
   std::map<Offset, Offset> TOC_table_;
 
   public:
-  Dyninst::Dwarf::DwarfHandle::ptr dwarf;
+  Dyninst::DwarfDyninst::DwarfHandle::ptr dwarf;
   private:
 
   bool      EEL;                 // true if EEL rewritten