Skip to content

Commit

Permalink
[LLDB] - Parse the DW_LLE_startx_length correctly for DWARF v5 case.
Browse files Browse the repository at this point in the history
Currently, we always parse the length field of DW_LLE_startx_length entry as U32.
That is correct for pre-standard definition:

https://gcc.gnu.org/wiki/DebugFission - "A start/length entry contains one unsigned LEB128 number
and a 4-byte unsigned value (as would be represented by the form code DW_FORM_const4u). The first
number is an index into the .debug_addr section that selects the beginning offset, and the second
number is the length of the range. ")

But DWARF v5 says: "This is a form of bounded location description that has two unsigned ULEB operands.
The first value is an address index (into the .debug_addr section) that indicates the beginning of the address
range over which the location is valid. The second value is the length of the range."

Fortunately, we can easily handle the difference. No test case because it seems impossible to test
until we will be ready to use DWARF v5 in tests that need to run the executables.

Differential revision: https://reviews.llvm.org/D53646

llvm-svn: 345249
  • Loading branch information
George Rimar committed Oct 25, 2018
1 parent 1f6ca0b commit d871964
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 5 additions & 3 deletions lldb/include/lldb/Expression/DWARFExpression.h
Expand Up @@ -40,8 +40,10 @@ class DWARFExpression {
enum LocationListFormat : uint8_t {
NonLocationList, // Not a location list
RegularLocationList, // Location list format used in non-split dwarf files
SplitDwarfLocationList, // Location list format used in split dwarf files
LocLists, // Location list format used in DWARF v5 (.debug_loclists).
SplitDwarfLocationList, // Location list format used in pre-DWARF v5 split
// dwarf files (.debug_loc.dwo)
LocLists, // Location list format used in DWARF v5
// (.debug_loclists/.debug_loclists.dwo).
};

//------------------------------------------------------------------
Expand Down Expand Up @@ -153,7 +155,7 @@ class DWARFExpression {
lldb::addr_t GetLocation_DW_OP_addr(uint32_t op_addr_idx, bool &error) const;

bool Update_DW_OP_addr(lldb::addr_t file_addr);

void SetModule(const lldb::ModuleSP &module) { m_module_wp = module; }

bool ContainsThreadLocalStorage() const;
Expand Down
8 changes: 6 additions & 2 deletions lldb/source/Expression/DWARFExpression.cpp
Expand Up @@ -3029,7 +3029,9 @@ bool DWARFExpression::AddressRangeForLocationListEntry(
if (!debug_loc_data.ValidOffset(*offset_ptr))
return false;

switch (dwarf_cu->GetSymbolFileDWARF()->GetLocationListFormat()) {
DWARFExpression::LocationListFormat format =
dwarf_cu->GetSymbolFileDWARF()->GetLocationListFormat();
switch (format) {
case NonLocationList:
return false;
case RegularLocationList:
Expand All @@ -3051,7 +3053,9 @@ bool DWARFExpression::AddressRangeForLocationListEntry(
case DW_LLE_startx_length: {
uint64_t index = debug_loc_data.GetULEB128(offset_ptr);
low_pc = ReadAddressFromDebugAddrSection(dwarf_cu, index);
uint32_t length = debug_loc_data.GetU32(offset_ptr);
uint64_t length = (format == LocLists)
? debug_loc_data.GetULEB128(offset_ptr)
: debug_loc_data.GetU32(offset_ptr);
high_pc = low_pc + length;
return true;
}
Expand Down

0 comments on commit d871964

Please sign in to comment.