This is an archive of the discontinued LLVM Phabricator instance.

Differential D73598

Add dwarfdump support for DW_OP_regval_type
ClosedPublic

Authored by aprantl on Jan 28 2020, 5:26 PM.

Details

Reviewers
bjope
JDevlieghere
jdoerfert
jhenderson
Commits
rGaa6ec19c5f42: Add dwarfdump support for DW_OP_regval_type.

Diff Detail

Event Timeline

aprantl created this revision.Jan 28 2020, 5:26 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJan 28 2020, 5:26 PM
Herald added a reviewer: jhenderson. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: ormris, hiraditya. · View Herald Transcript
aprantl added a child revision: D73283: Handle complex DWARF expressions in combination with "complex" registers.Jan 28 2020, 5:27 PM
JDevlieghere accepted this revision.Jan 28 2020, 8:16 PM
JDevlieghere added inline comments.
llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp
194

assert(Operand < 2)

This revision is now accepted and ready to land.Jan 28 2020, 8:16 PM
Closed by commit rGaa6ec19c5f42: Add dwarfdump support for DW_OP_regval_type. (authored by aprantl). · Explain WhyJan 29 2020, 10:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
DebugInfo/
DWARF/
38 lines
test/
tools/
llvm-dwarfdump/
X86/
185 lines

Diff 241033

llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Linesstatic DescVector getDescriptions() {
Descriptions[DW_OP_GNU_push_tls_address] = Desc(Op::Dwarf3); Descriptions[DW_OP_GNU_push_tls_address] = Desc(Op::Dwarf3);
Descriptions[DW_OP_addrx] = Desc(Op::Dwarf4, Op::SizeLEB); Descriptions[DW_OP_addrx] = Desc(Op::Dwarf4, Op::SizeLEB);
Descriptions[DW_OP_GNU_addr_index] = Desc(Op::Dwarf4, Op::SizeLEB); Descriptions[DW_OP_GNU_addr_index] = Desc(Op::Dwarf4, Op::SizeLEB);
Descriptions[DW_OP_GNU_const_index] = Desc(Op::Dwarf4, Op::SizeLEB); Descriptions[DW_OP_GNU_const_index] = Desc(Op::Dwarf4, Op::SizeLEB);
Descriptions[DW_OP_GNU_entry_value] = Desc(Op::Dwarf4, Op::SizeLEB); Descriptions[DW_OP_GNU_entry_value] = Desc(Op::Dwarf4, Op::SizeLEB);
Descriptions[DW_OP_convert] = Desc(Op::Dwarf5, Op::BaseTypeRef); Descriptions[DW_OP_convert] = Desc(Op::Dwarf5, Op::BaseTypeRef);
Descriptions[DW_OP_entry_value] = Desc(Op::Dwarf5, Op::SizeLEB); Descriptions[DW_OP_entry_value] = Desc(Op::Dwarf5, Op::SizeLEB);
Descriptions[DW_OP_regval_type] =
Desc(Op::Dwarf5, Op::SizeLEB, Op::BaseTypeRef);
return Descriptions; return Descriptions;
} }
static DWARFExpression::Operation::Description getOpDesc(unsigned OpCode) { static DWARFExpression::Operation::Description getOpDesc(unsigned OpCode) {
// FIXME: Make this constexpr once all compilers are smart enough to do it. // FIXME: Make this constexpr once all compilers are smart enough to do it.
static DescVector Descriptions = getDescriptions(); static DescVector Descriptions = getDescriptions();
// Handle possible corrupted or unsupported operation. // Handle possible corrupted or unsupported operation.
▲ Show 20 Lines • Show All 68 Lines • ▼ Show 20 Lines for (unsigned Operand = 0; Operand < 2; ++Operand) {
OperandEndOffsets[Operand] = Offset; OperandEndOffsets[Operand] = Offset;
} }
EndOffset = Offset; EndOffset = Offset;
return true; return true;
} }
static bool prettyPrintRegisterOp(raw_ostream &OS, uint8_t Opcode, static void prettyPrintBaseTypeRef(DWARFUnit *U, raw_ostream &OS,
uint64_t Operands[2], unsigned Operand) {
auto Die = U->getDIEForOffset(U->getOffset() + Operands[Operand]);
JDevlieghereUnsubmitted
Not Done
ReplyInline Actions

assert(Operand < 2)

JDevlieghere: `assert(Operand < 2)`
if (Die && Die.getTag() == dwarf::DW_TAG_base_type) {
OS << format(" (0x%08" PRIx64 ")", U->getOffset() + Operands[Operand]);
if (auto Name = Die.find(dwarf::DW_AT_name))
OS << " \"" << Name->getAsCString() << "\"";
} else {
OS << format(" <invalid base_type ref: 0x%" PRIx64 ">",
Operands[Operand]);
}
}
static bool prettyPrintRegisterOp(DWARFUnit *U, raw_ostream &OS, uint8_t Opcode,
uint64_t Operands[2], uint64_t Operands[2],
const MCRegisterInfo *MRI, bool isEH) { const MCRegisterInfo *MRI, bool isEH) {
if (!MRI) if (!MRI)
return false; return false;
uint64_t DwarfRegNum; uint64_t DwarfRegNum;
unsigned OpNum = 0; unsigned OpNum = 0;
if (Opcode == DW_OP_bregx || Opcode == DW_OP_regx) if (Opcode == DW_OP_bregx || Opcode == DW_OP_regx ||
Opcode == DW_OP_regval_type)
DwarfRegNum = Operands[OpNum++]; DwarfRegNum = Operands[OpNum++];
else if (Opcode >= DW_OP_breg0 && Opcode < DW_OP_bregx) else if (Opcode >= DW_OP_breg0 && Opcode < DW_OP_bregx)
DwarfRegNum = Opcode - DW_OP_breg0; DwarfRegNum = Opcode - DW_OP_breg0;
else else
DwarfRegNum = Opcode - DW_OP_reg0; DwarfRegNum = Opcode - DW_OP_reg0;
if (Optional<unsigned> LLVMRegNum = MRI->getLLVMRegNum(DwarfRegNum, isEH)) { if (Optional<unsigned> LLVMRegNum = MRI->getLLVMRegNum(DwarfRegNum, isEH)) {
if (const char *RegName = MRI->getName(*LLVMRegNum)) { if (const char *RegName = MRI->getName(*LLVMRegNum)) {
if ((Opcode >= DW_OP_breg0 && Opcode <= DW_OP_breg31) || if ((Opcode >= DW_OP_breg0 && Opcode <= DW_OP_breg31) ||
Opcode == DW_OP_bregx) Opcode == DW_OP_bregx)
OS << format(" %s%+" PRId64, RegName, Operands[OpNum]); OS << format(" %s%+" PRId64, RegName, Operands[OpNum]);
else else
OS << ' ' << RegName; OS << ' ' << RegName;
if (Opcode == DW_OP_regval_type)
prettyPrintBaseTypeRef(U, OS, Operands, 1);
return true; return true;
} }
} }
return false; return false;
} }
bool DWARFExpression::Operation::print(raw_ostream &OS, bool DWARFExpression::Operation::print(raw_ostream &OS,
const DWARFExpression *Expr, const DWARFExpression *Expr,
const MCRegisterInfo *RegInfo, const MCRegisterInfo *RegInfo,
DWARFUnit *U, DWARFUnit *U,
bool isEH) { bool isEH) {
if (Error) { if (Error) {
OS << "<decoding error>"; OS << "<decoding error>";
return false; return false;
} }
StringRef Name = OperationEncodingString(Opcode); StringRef Name = OperationEncodingString(Opcode);
assert(!Name.empty() && "DW_OP has no name!"); assert(!Name.empty() && "DW_OP has no name!");
OS << Name; OS << Name;
if ((Opcode >= DW_OP_breg0 && Opcode <= DW_OP_breg31) || if ((Opcode >= DW_OP_breg0 && Opcode <= DW_OP_breg31) ||
(Opcode >= DW_OP_reg0 && Opcode <= DW_OP_reg31) || (Opcode >= DW_OP_reg0 && Opcode <= DW_OP_reg31) ||
Opcode == DW_OP_bregx || Opcode == DW_OP_regx) Opcode == DW_OP_bregx || Opcode == DW_OP_regx ||
if (prettyPrintRegisterOp(OS, Opcode, Operands, RegInfo, isEH)) Opcode == DW_OP_regval_type)
if (prettyPrintRegisterOp(U, OS, Opcode, Operands, RegInfo, isEH))
return true; return true;
for (unsigned Operand = 0; Operand < 2; ++Operand) { for (unsigned Operand = 0; Operand < 2; ++Operand) {
unsigned Size = Desc.Op[Operand]; unsigned Size = Desc.Op[Operand];
unsigned Signed = Size & Operation::SignBit; unsigned Signed = Size & Operation::SignBit;
if (Size == Operation::SizeNA) if (Size == Operation::SizeNA)
break; break;
if (Size == Operation::BaseTypeRef && U) { if (Size == Operation::BaseTypeRef && U) {
auto Die = U->getDIEForOffset(U->getOffset() + Operands[Operand]); prettyPrintBaseTypeRef(U, OS, Operands, Operand);
if (Die && Die.getTag() == dwarf::DW_TAG_base_type) {
OS << format(" (0x%08" PRIx64 ")", U->getOffset() + Operands[Operand]);
if (auto Name = Die.find(dwarf::DW_AT_name))
OS << " \"" << Name->getAsCString() << "\"";
} else {
OS << format(" <invalid base_type ref: 0x%" PRIx64 ">",
Operands[Operand]);
}
} else if (Size == Operation::SizeBlock) { } else if (Size == Operation::SizeBlock) {
uint64_t Offset = Operands[Operand]; uint64_t Offset = Operands[Operand];
for (unsigned i = 0; i < Operands[Operand - 1]; ++i) for (unsigned i = 0; i < Operands[Operand - 1]; ++i)
OS << format(" 0x%02x", Expr->Data.getU8(&Offset)); OS << format(" 0x%02x", Expr->Data.getU8(&Offset));
} else { } else {
if (Signed) if (Signed)
OS << format(" %+" PRId64, (int64_t)Operands[Operand]); OS << format(" %+" PRId64, (int64_t)Operands[Operand]);
else if (Opcode != DW_OP_entry_value && else if (Opcode != DW_OP_entry_value &&
▲ Show 20 Lines • Show All 65 Lines • Show Last 20 Lines

llvm/test/tools/llvm-dwarfdump/X86/dw_op_regval_type.s

  • This file was added.
# RUN: llvm-mc -dwarf-version=5 %s -filetype obj -triple x86_64-apple-darwin -o - \
# RUN: | llvm-dwarfdump - | FileCheck %s
# CHECK: DW_AT_location (DW_OP_regval_type RSI (0x0000003a) "int")
.section __TEXT,__text,regular,pure_instructions
.globl _f ## -- Begin function f
.p2align 4, 0x90
_f: ## @f
Lfunc_begin0:
.file 0 "/Volumes/Data/llvm-project" "/tmp/t.c" md5 0xe111397c9e6224481f168e197b7fac99
.loc 0 1 0 ## /tmp/t.c:1:0
.cfi_startproc
## %bb.0:
pushq %rbp
.cfi_def_cfa_offset 16
.cfi_offset %rbp, -16
movq %rsp, %rbp
.cfi_def_cfa_register %rbp
Ltmp0:
.loc 0 2 7 prologue_end ## /tmp/t.c:2:7
movl $23, -4(%rbp)
.loc 0 3 1 ## /tmp/t.c:3:1
popq %rbp
retq
Ltmp1:
Lfunc_end0:
.cfi_endproc
## -- End function
.section __DWARF,__debug_str_offs,regular,debug
Lsection_str_off:
.long 28
.short 5
.short 0
Lstr_offsets_base0:
.section __DWARF,__debug_str,regular,debug
Linfo_string:
.asciz "clang " ## string offset=0
.asciz "/tmp/t.c" ## string offset=48
.asciz "/Volumes/Data/llvm-project" ## string offset=57
.asciz "f" ## string offset=84
.asciz "x" ## string offset=86
.asciz "int" ## string offset=88
.section __DWARF,__debug_str_offs,regular,debug
.long 0
.long 48
.long 57
.long 84
.long 86
.long 88
.section __DWARF,__debug_abbrev,regular,debug
Lsection_abbrev:
.byte 1 ## Abbreviation Code
.byte 17 ## DW_TAG_compile_unit
.byte 1 ## DW_CHILDREN_yes
.byte 37 ## DW_AT_producer
.byte 37 ## DW_FORM_strx1
.byte 19 ## DW_AT_language
.byte 5 ## DW_FORM_data2
.byte 3 ## DW_AT_name
.byte 37 ## DW_FORM_strx1
.byte 114 ## DW_AT_str_offsets_base
.byte 23 ## DW_FORM_sec_offset
.byte 16 ## DW_AT_stmt_list
.byte 23 ## DW_FORM_sec_offset
.byte 27 ## DW_AT_comp_dir
.byte 37 ## DW_FORM_strx1
.byte 17 ## DW_AT_low_pc
.byte 27 ## DW_FORM_addrx
.byte 18 ## DW_AT_high_pc
.byte 6 ## DW_FORM_data4
.byte 115 ## DW_AT_addr_base
.byte 23 ## DW_FORM_sec_offset
.byte 0 ## EOM(1)
.byte 0 ## EOM(2)
.byte 2 ## Abbreviation Code
.byte 46 ## DW_TAG_subprogram
.byte 1 ## DW_CHILDREN_yes
.byte 17 ## DW_AT_low_pc
.byte 27 ## DW_FORM_addrx
.byte 18 ## DW_AT_high_pc
.byte 6 ## DW_FORM_data4
.byte 64 ## DW_AT_frame_base
.byte 24 ## DW_FORM_exprloc
.byte 3 ## DW_AT_name
.byte 37 ## DW_FORM_strx1
.byte 58 ## DW_AT_decl_file
.byte 11 ## DW_FORM_data1
.byte 59 ## DW_AT_decl_line
.byte 11 ## DW_FORM_data1
.byte 63 ## DW_AT_external
.byte 25 ## DW_FORM_flag_present
.byte 0 ## EOM(1)
.byte 0 ## EOM(2)
.byte 3 ## Abbreviation Code
.byte 52 ## DW_TAG_variable
.byte 0 ## DW_CHILDREN_no
.byte 2 ## DW_AT_location
.byte 24 ## DW_FORM_exprloc
.byte 3 ## DW_AT_name
.byte 37 ## DW_FORM_strx1
.byte 58 ## DW_AT_decl_file
.byte 11 ## DW_FORM_data1
.byte 73 ## DW_AT_type
.byte 19 ## DW_FORM_ref4
.byte 0 ## EOM(1)
.byte 0 ## EOM(2)
.byte 4 ## Abbreviation Code
.byte 36 ## DW_TAG_base_type
.byte 0 ## DW_CHILDREN_no
.byte 3 ## DW_AT_name
.byte 37 ## DW_FORM_strx1
.byte 62 ## DW_AT_encoding
.byte 11 ## DW_FORM_data1
.byte 11 ## DW_AT_byte_size
.byte 11 ## DW_FORM_data1
.byte 0 ## EOM(1)
.byte 0 ## EOM(2)
.byte 0 ## EOM(3)
.section __DWARF,__debug_info,regular,debug
Lsection_info:
Lcu_begin0:
.set Lset0, Ldebug_info_end0-Ldebug_info_start0 ## Length of Unit
.long Lset0
Ldebug_info_start0:
.short 5 ## DWARF version number
.byte 1 ## DWARF Unit Type
.byte 8 ## Address Size (in bytes)
.set Lset1, Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section
.long Lset1
.byte 1 ## Abbrev [1] 0xc:0x33 DW_TAG_compile_unit
.byte 0 ## DW_AT_producer
.short 12 ## DW_AT_language
.byte 1 ## DW_AT_name
.set Lset2, Lstr_offsets_base0-Lsection_str_off ## DW_AT_str_offsets_base
.long Lset2
.set Lset3, Lline_table_start0-Lsection_line ## DW_AT_stmt_list
.long Lset3
.byte 2 ## DW_AT_comp_dir
.byte 0 ## DW_AT_low_pc
.set Lset4, Lfunc_end0-Lfunc_begin0 ## DW_AT_high_pc
.long Lset4
.set Lset5, Laddr_table_base0-Lsection_info0 ## DW_AT_addr_base
.long Lset5
.byte 2 ## Abbrev [2] 0x23:0x17 DW_TAG_subprogram
.byte 0 ## DW_AT_low_pc
.set Lset6, Lfunc_end0-Lfunc_begin0 ## DW_AT_high_pc
.long Lset6
.byte 1 ## DW_AT_frame_base
.byte 86
.byte 3 ## DW_AT_name
.byte 0 ## DW_AT_decl_file
.byte 1 ## DW_AT_decl_line
## DW_AT_external
.byte 3 ## Abbrev [3] 0x2e:0xb DW_TAG_variable
.byte 3 ## DW_AT_location
.byte 0xa5
.byte 0x04
.byte 0x3a
.byte 4 ## DW_AT_name
.byte 0 ## DW_AT_decl_file
.long 58 ## DW_AT_type
.byte 0 ## End Of Children Mark
.byte 4 ## Abbrev [4] 0x3a:0x4 DW_TAG_base_type
.byte 5 ## DW_AT_name
.byte 5 ## DW_AT_encoding
.byte 4 ## DW_AT_byte_size
.byte 0 ## End Of Children Mark
Ldebug_info_end0:
.section __DWARF,__debug_addr,regular,debug
Lsection_info0:
.set Lset7, Ldebug_addr_end0-Ldebug_addr_start0 ## Length of contribution
.long Lset7
Ldebug_addr_start0:
.short 5 ## DWARF version number
.byte 8 ## Address size
.byte 0 ## Segment selector size
Laddr_table_base0:
.quad Lfunc_begin0
Ldebug_addr_end0:
.subsections_via_symbols
.section __DWARF,__debug_line,regular,debug
Lsection_line:
Lline_table_start0: