Commit 4b5bc388 authored by Pavel Labath's avatar Pavel Labath
Browse files

[lldb/DWARF] Move location list sections into DWARFContext 

These are the last sections not managed by the DWARFContext object. I
also introduce separate SectionType enums for dwo section variants, as
this is necessary for proper handling of single-file split dwarf.
parent e1f524ea

lldb/include/lldb/lldb-enumerations.h

+2 −0
Original line number Diff line number Diff line
@@ -692,6 +692,8 @@ enum SectionType { 
  eSectionTypeDWARFDebugStrOffsetsDwo,

  eSectionTypeDWARFDebugTypesDwo,

  eSectionTypeDWARFDebugRngListsDwo,

  eSectionTypeDWARFDebugLocDwo,

  eSectionTypeDWARFDebugLocListsDwo,

};



FLAGS_ENUM(EmulateInstructionOptions){

lldb/source/Core/Section.cpp

+4 −0
Original line number Diff line number Diff line
@@ -80,8 +80,12 @@ const char *Section::GetTypeAsCString() const { 
    return "dwarf-line-str";

  case eSectionTypeDWARFDebugLoc:

    return "dwarf-loc";

  case eSectionTypeDWARFDebugLocDwo:

    return "dwarf-loc-dwo";

  case eSectionTypeDWARFDebugLocLists:

    return "dwarf-loclists";

  case eSectionTypeDWARFDebugLocListsDwo:

    return "dwarf-loclists-dwo";

  case eSectionTypeDWARFDebugMacInfo:

    return "dwarf-macinfo";

  case eSectionTypeDWARFDebugMacro:

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1572,8 +1572,10 @@ static SectionType GetSectionTypeFromName(llvm::StringRef Name) { 
        .Case("info.dwo", eSectionTypeDWARFDebugInfoDwo)

        .Cases("line", "line.dwo", eSectionTypeDWARFDebugLine)

        .Cases("line_str", "line_str.dwo", eSectionTypeDWARFDebugLineStr)

        .Cases("loc", "loc.dwo", eSectionTypeDWARFDebugLoc)

        .Cases("loclists", "loclists.dwo", eSectionTypeDWARFDebugLocLists)

        .Case("loc", eSectionTypeDWARFDebugLoc)

        .Case("loc.dwo", eSectionTypeDWARFDebugLocDwo)

        .Case("loclists", eSectionTypeDWARFDebugLocLists)

        .Case("loclists.dwo", eSectionTypeDWARFDebugLocListsDwo)

        .Case("macinfo", eSectionTypeDWARFDebugMacInfo)

        .Cases("macro", "macro.dwo", eSectionTypeDWARFDebugMacro)

        .Case("names", eSectionTypeDWARFDebugNames)

lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1133,7 +1133,9 @@ AddressClass ObjectFileMachO::GetAddressClass(lldb::addr_t file_addr) { 
        case eSectionTypeDWARFDebugLine:

        case eSectionTypeDWARFDebugLineStr:

        case eSectionTypeDWARFDebugLoc:

        case eSectionTypeDWARFDebugLocDwo:

        case eSectionTypeDWARFDebugLocLists:

        case eSectionTypeDWARFDebugLocListsDwo:

        case eSectionTypeDWARFDebugMacInfo:

        case eSectionTypeDWARFDebugMacro:

        case eSectionTypeDWARFDebugNames:

lldb/source/Plugins/SymbolFile/DWARF/DWARFContext.cpp

+11 −0
Original line number Diff line number Diff line
@@ -70,6 +70,17 @@ const DWARFDataExtractor &DWARFContext::getOrLoadLineStrData() { 
                          m_data_debug_line_str);

}



const DWARFDataExtractor &DWARFContext::getOrLoadLocData() {

  return LoadOrGetSection(eSectionTypeDWARFDebugLoc,

                          eSectionTypeDWARFDebugLocDwo, m_data_debug_loc);

}



const DWARFDataExtractor &DWARFContext::getOrLoadLocListsData() {

  return LoadOrGetSection(eSectionTypeDWARFDebugLocLists,

                          eSectionTypeDWARFDebugLocListsDwo,

                          m_data_debug_loclists);

}



const DWARFDataExtractor &DWARFContext::getOrLoadMacroData() {

  return LoadOrGetSection(eSectionTypeDWARFDebugMacro, llvm::None,

                          m_data_debug_macro);