diff options
Diffstat (limited to 'lldb/source/API/SBSection.cpp')
| -rw-r--r-- | lldb/source/API/SBSection.cpp | 262 |
1 files changed, 88 insertions, 174 deletions
diff --git a/lldb/source/API/SBSection.cpp b/lldb/source/API/SBSection.cpp index dedcc7a2850..24b94a7a53a 100644 --- a/lldb/source/API/SBSection.cpp +++ b/lldb/source/API/SBSection.cpp @@ -16,106 +16,34 @@ #include "lldb/Core/Section.h" #include "lldb/Core/StreamString.h" -namespace lldb_private -{ - // We need a section implementation to hold onto a reference to the module - // since if the module goes away and we have anyone still holding onto a - // SBSection object, we could crash. - class SectionImpl - { - public: - SectionImpl (const lldb_private::Section *section = NULL) : - m_module_sp (), - m_section (section) - { - if (section) - m_module_sp = section->GetModule()->shared_from_this(); - } - - SectionImpl (const SectionImpl &rhs) : - m_module_sp (rhs.m_module_sp), - m_section (rhs.m_section) - { - } - - bool - IsValid () const - { - return m_section != NULL; - } - - void - operator = (const SectionImpl &rhs) - { - m_module_sp = rhs.m_module_sp; - m_section = rhs.m_section; - } - - void - operator =(const lldb_private::Section *section) - { - m_section = section; - if (section) - m_module_sp.reset(section->GetModule()); - else - m_module_sp.reset(); - } - - const lldb_private::Section * - GetSection () const - { - return m_section; - } - - Module * - GetModule() - { - return m_module_sp.get(); - } - - const lldb::ModuleSP & - GetModuleSP() const - { - return m_module_sp; - } - protected: - lldb::ModuleSP m_module_sp; - const lldb_private::Section *m_section; - }; -} using namespace lldb; using namespace lldb_private; SBSection::SBSection () : - m_opaque_ap () + m_opaque_wp () { } SBSection::SBSection (const SBSection &rhs) : - m_opaque_ap () + m_opaque_wp (rhs.m_opaque_wp) { - if (rhs.IsValid()) - m_opaque_ap.reset (new SectionImpl (*rhs.m_opaque_ap)); } -SBSection::SBSection (const lldb_private::Section *section) : - m_opaque_ap () +SBSection::SBSection (const lldb::SectionSP §ion_sp) : + m_opaque_wp () // Don't init with section_sp otherwise this will throw if section_sp doesn't contain a valid Section * { - if (section) - m_opaque_ap.reset (new SectionImpl(section)); + if (section_sp) + m_opaque_wp = section_sp; } const SBSection & SBSection::operator = (const SBSection &rhs) { - if (this != &rhs && rhs.IsValid()) - m_opaque_ap.reset (new SectionImpl(*rhs.m_opaque_ap)); - else - m_opaque_ap.reset (); + m_opaque_wp = rhs.m_opaque_wp; return *this; } @@ -126,14 +54,16 @@ SBSection::~SBSection () bool SBSection::IsValid () const { - return m_opaque_ap.get() != NULL && m_opaque_ap->IsValid(); + SectionSP section_sp (GetSP()); + return section_sp && section_sp->GetModule().get() != NULL; } const char * SBSection::GetName () { - if (IsValid()) - return m_opaque_ap->GetSection()->GetName().GetCString(); + SectionSP section_sp (GetSP()); + if (section_sp) + return section_sp->GetName().GetCString(); return NULL; } @@ -142,10 +72,14 @@ lldb::SBSection SBSection::FindSubSection (const char *sect_name) { lldb::SBSection sb_section; - if (sect_name && IsValid()) + if (sect_name) { - ConstString const_sect_name(sect_name); - sb_section.SetSection(m_opaque_ap->GetSection()->GetChildren ().FindSectionByName(const_sect_name).get()); + SectionSP section_sp (GetSP()); + if (section_sp) + { + ConstString const_sect_name(sect_name); + sb_section.SetSP(section_sp->GetChildren ().FindSectionByName(const_sect_name)); + } } return sb_section; } @@ -153,8 +87,9 @@ SBSection::FindSubSection (const char *sect_name) size_t SBSection::GetNumSubSections () { - if (IsValid()) - return m_opaque_ap->GetSection()->GetChildren ().GetSize(); + SectionSP section_sp (GetSP()); + if (section_sp) + return section_sp->GetChildren ().GetSize(); return 0; } @@ -162,79 +97,66 @@ lldb::SBSection SBSection::GetSubSectionAtIndex (size_t idx) { lldb::SBSection sb_section; - if (IsValid()) - sb_section.SetSection(m_opaque_ap->GetSection()->GetChildren ().GetSectionAtIndex(idx).get()); + SectionSP section_sp (GetSP()); + if (section_sp) + sb_section.SetSP (section_sp->GetChildren ().GetSectionAtIndex(idx)); return sb_section; } -const lldb_private::Section * -SBSection::GetSection() +lldb::SectionSP +SBSection::GetSP() const { - if (m_opaque_ap.get()) - return m_opaque_ap->GetSection(); - return NULL; + return m_opaque_wp.lock(); } void -SBSection::SetSection (const lldb_private::Section *section) +SBSection::SetSP(const lldb::SectionSP §ion_sp) { - m_opaque_ap.reset (new SectionImpl(section)); + m_opaque_wp = section_sp; } - - - lldb::addr_t SBSection::GetFileAddress () { lldb::addr_t file_addr = LLDB_INVALID_ADDRESS; - if (IsValid()) - return m_opaque_ap->GetSection()->GetFileAddress(); + SectionSP section_sp (GetSP()); + if (section_sp) + return section_sp->GetFileAddress(); return file_addr; } lldb::addr_t SBSection::GetByteSize () { - if (IsValid()) - { - const Section *section = m_opaque_ap->GetSection(); - if (section) - return section->GetByteSize(); - } + SectionSP section_sp (GetSP()); + if (section_sp) + return section_sp->GetByteSize(); return 0; } uint64_t SBSection::GetFileOffset () { - if (IsValid()) + SectionSP section_sp (GetSP()); + if (section_sp) { - const Section *section = m_opaque_ap->GetSection(); - if (section) + ModuleSP module_sp (section_sp->GetModule()); + if (module_sp) { - Module *module = m_opaque_ap->GetModule(); - if (module) - { - ObjectFile *objfile = module->GetObjectFile(); - if (objfile) - return objfile->GetOffset() + section->GetFileOffset(); - } - return section->GetFileOffset(); + ObjectFile *objfile = module_sp->GetObjectFile(); + if (objfile) + return objfile->GetOffset() + section_sp->GetFileOffset(); } } - return 0; + return UINT64_MAX; } uint64_t SBSection::GetFileByteSize () { - if (IsValid()) - { - const Section *section = m_opaque_ap->GetSection(); - if (section) - return section->GetFileSize(); - } + SectionSP section_sp (GetSP()); + if (section_sp) + return section_sp->GetFileSize(); return 0; } @@ -248,40 +170,37 @@ SBData SBSection::GetSectionData (uint64_t offset, uint64_t size) { SBData sb_data; - if (IsValid()) + SectionSP section_sp (GetSP()); + if (section_sp) { - const Section *section = m_opaque_ap->GetSection(); - if (section) + const uint64_t sect_file_size = section_sp->GetFileSize(); + if (sect_file_size > 0) { - const uint64_t sect_file_size = section->GetFileSize(); - if (sect_file_size > 0) + ModuleSP module_sp (section_sp->GetModule()); + if (module_sp) { - Module *module = m_opaque_ap->GetModule(); - if (module) + ObjectFile *objfile = module_sp->GetObjectFile(); + if (objfile) { - ObjectFile *objfile = module->GetObjectFile(); - if (objfile) + const uint64_t sect_file_offset = objfile->GetOffset() + section_sp->GetFileOffset(); + const uint64_t file_offset = sect_file_offset + offset; + uint64_t file_size = size; + if (file_size == UINT64_MAX) { - const uint64_t sect_file_offset = objfile->GetOffset() + section->GetFileOffset(); - const uint64_t file_offset = sect_file_offset + offset; - uint64_t file_size = size; - if (file_size == UINT64_MAX) - { - file_size = section->GetByteSize(); - if (file_size > offset) - file_size -= offset; - else - file_size = 0; - } - DataBufferSP data_buffer_sp (objfile->GetFileSpec().ReadFileContents (file_offset, file_size)); - if (data_buffer_sp && data_buffer_sp->GetByteSize() > 0) - { - DataExtractorSP data_extractor_sp (new DataExtractor (data_buffer_sp, - objfile->GetByteOrder(), - objfile->GetAddressByteSize())); - - sb_data.SetOpaque (data_extractor_sp); - } + file_size = section_sp->GetByteSize(); + if (file_size > offset) + file_size -= offset; + else + file_size = 0; + } + DataBufferSP data_buffer_sp (objfile->GetFileSpec().ReadFileContents (file_offset, file_size)); + if (data_buffer_sp && data_buffer_sp->GetByteSize() > 0) + { + DataExtractorSP data_extractor_sp (new DataExtractor (data_buffer_sp, + objfile->GetByteOrder(), + objfile->GetAddressByteSize())); + + sb_data.SetOpaque (data_extractor_sp); } } } @@ -293,12 +212,9 @@ SBSection::GetSectionData (uint64_t offset, uint64_t size) SectionType SBSection::GetSectionType () { - if (m_opaque_ap.get()) - { - const Section *section = m_opaque_ap->GetSection(); - if (section) - return section->GetType(); - } + SectionSP section_sp (GetSP()); + if (section_sp.get()) + return section_sp->GetType(); return eSectionTypeInvalid; } @@ -306,21 +222,19 @@ SBSection::GetSectionType () bool SBSection::operator == (const SBSection &rhs) { - SectionImpl *lhs_ptr = m_opaque_ap.get(); - SectionImpl *rhs_ptr = rhs.m_opaque_ap.get(); - if (lhs_ptr && rhs_ptr) - return lhs_ptr->GetSection() == rhs_ptr->GetSection(); + SectionSP lhs_section_sp (GetSP()); + SectionSP rhs_section_sp (rhs.GetSP()); + if (lhs_section_sp && rhs_section_sp) + return lhs_section_sp == rhs_section_sp; return false; } bool SBSection::operator != (const SBSection &rhs) { - SectionImpl *lhs_ptr = m_opaque_ap.get(); - SectionImpl *rhs_ptr = rhs.m_opaque_ap.get(); - if (lhs_ptr && rhs_ptr) - return lhs_ptr->GetSection() != rhs_ptr->GetSection(); - return false; + SectionSP lhs_section_sp (GetSP()); + SectionSP rhs_section_sp (rhs.GetSP()); + return lhs_section_sp != rhs_section_sp; } bool @@ -328,12 +242,12 @@ SBSection::GetDescription (SBStream &description) { Stream &strm = description.ref(); - if (IsValid()) + SectionSP section_sp (GetSP()); + if (section_sp) { - const Section *section = m_opaque_ap->GetSection(); - const addr_t file_addr = section->GetFileAddress(); - strm.Printf ("[0x%16.16llx-0x%16.16llx) ", file_addr, file_addr + section->GetByteSize()); - section->DumpName(&strm); + const addr_t file_addr = section_sp->GetFileAddress(); + strm.Printf ("[0x%16.16llx-0x%16.16llx) ", file_addr, file_addr + section_sp->GetByteSize()); + section_sp->DumpName(&strm); } else { |
