Introduce DWARFDataExtractor for 64-Bit DWARF parsing

Review: http://llvm-reviews.chandlerc.com/D2007
llvm-svn: 193368

1 files changed, 3 insertions, 14 deletions

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
index 7dc32127313..d083f8a615c 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
@@ -162,7 +162,7 @@ DWARFDebugArangeSet::AddDescriptor(const DWARFDebugArangeSet::Descriptor& range)
 }
 
 bool
-DWARFDebugArangeSet::Extract(const DataExtractor &data, lldb::offset_t *offset_ptr)
+DWARFDebugArangeSet::Extract(const DWARFDataExtractor &data, lldb::offset_t *offset_ptr)
 {
     if (data.ValidOffset(*offset_ptr))
     {
@@ -183,20 +183,9 @@ DWARFDebugArangeSet::Extract(const DataExtractor &data, lldb::offset_t *offset_p
         // descriptor on the target system. This header is followed by a series
         // of tuples. Each tuple consists of an address and a length, each in
         // the size appropriate for an address on the target architecture.
-        size_t dwarf_offset_size = 4;
-        m_header.length     = data.GetU32(offset_ptr);
-        if (m_header.length == 0xffffffff)
-        {
-            dwarf_offset_size = 8;
-            m_header.length = data.GetU64(offset_ptr);
-        }
-        else if (m_header.length >= 0xffffff00)
-        {
-            // Reserved.
-            return false;
-        }
+        m_header.length     = data.GetDWARFInitialLength(offset_ptr);
         m_header.version    = data.GetU16(offset_ptr);
-        m_header.cu_offset  = data.GetMaxU64(offset_ptr, dwarf_offset_size);
+        m_header.cu_offset  = data.GetDWARFOffset(offset_ptr);
         m_header.addr_size  = data.GetU8(offset_ptr);
         m_header.seg_size   = data.GetU8(offset_ptr);