diff --git a/llvm/include/llvm/ObjectYAML/DWARFYAML.h b/llvm/include/llvm/ObjectYAML/DWARFYAML.h --- a/llvm/include/llvm/ObjectYAML/DWARFYAML.h +++ b/llvm/include/llvm/ObjectYAML/DWARFYAML.h @@ -145,8 +145,8 @@ uint8_t DefaultIsStmt; uint8_t LineBase; uint8_t LineRange; - uint8_t OpcodeBase; - std::vector StandardOpcodeLengths; + Optional OpcodeBase; + Optional> StandardOpcodeLengths; std::vector IncludeDirs; std::vector Files; std::vector Opcodes; diff --git a/llvm/lib/ObjectYAML/DWARFEmitter.cpp b/llvm/lib/ObjectYAML/DWARFEmitter.cpp --- a/llvm/lib/ObjectYAML/DWARFEmitter.cpp +++ b/llvm/lib/ObjectYAML/DWARFEmitter.cpp @@ -552,6 +552,14 @@ } } +static std::vector +getStandardOpcodeLengths(uint16_t Version, Optional OpcodeBase) { + if (OpcodeBase) + return std::vector(*OpcodeBase > 0 ? *OpcodeBase - 1 : 0); + else + return std::vector{0, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1}; +} + Error DWARFYAML::emitDebugLine(raw_ostream &OS, const DWARFYAML::Data &DI) { for (const DWARFYAML::LineTable &LineTable : DI.DebugLines) { // Buffer holds the bytes following the header_length (or prologue_length in @@ -566,9 +574,15 @@ writeInteger(LineTable.DefaultIsStmt, BufferOS, DI.IsLittleEndian); writeInteger(LineTable.LineBase, BufferOS, DI.IsLittleEndian); writeInteger(LineTable.LineRange, BufferOS, DI.IsLittleEndian); - writeInteger(LineTable.OpcodeBase, BufferOS, DI.IsLittleEndian); - for (uint8_t OpcodeLength : LineTable.StandardOpcodeLengths) + std::vector StandardOpcodeLengths = + LineTable.StandardOpcodeLengths.getValueOr( + getStandardOpcodeLengths(LineTable.Version, LineTable.OpcodeBase)); + uint8_t OpcodeBase = LineTable.OpcodeBase + ? *LineTable.OpcodeBase + : StandardOpcodeLengths.size() + 1; + writeInteger(OpcodeBase, BufferOS, DI.IsLittleEndian); + for (uint8_t OpcodeLength : StandardOpcodeLengths) writeInteger(OpcodeLength, BufferOS, DI.IsLittleEndian); for (StringRef IncludeDir : LineTable.IncludeDirs) { @@ -585,8 +599,8 @@ LineTable.PrologueLength ? *LineTable.PrologueLength : Buffer.size(); for (const DWARFYAML::LineTableOpcode &Op : LineTable.Opcodes) - writeLineTableOpcode(Op, LineTable.OpcodeBase, DI.Is64BitAddrSize ? 8 : 4, - BufferOS, DI.IsLittleEndian); + writeLineTableOpcode(Op, OpcodeBase, DI.Is64BitAddrSize ? 8 : 4, BufferOS, + DI.IsLittleEndian); uint64_t Length; if (LineTable.Length) { diff --git a/llvm/lib/ObjectYAML/DWARFYAML.cpp b/llvm/lib/ObjectYAML/DWARFYAML.cpp --- a/llvm/lib/ObjectYAML/DWARFYAML.cpp +++ b/llvm/lib/ObjectYAML/DWARFYAML.cpp @@ -244,8 +244,8 @@ IO.mapRequired("DefaultIsStmt", LineTable.DefaultIsStmt); IO.mapRequired("LineBase", LineTable.LineBase); IO.mapRequired("LineRange", LineTable.LineRange); - IO.mapRequired("OpcodeBase", LineTable.OpcodeBase); - IO.mapRequired("StandardOpcodeLengths", LineTable.StandardOpcodeLengths); + IO.mapOptional("OpcodeBase", LineTable.OpcodeBase); + IO.mapOptional("StandardOpcodeLengths", LineTable.StandardOpcodeLengths); IO.mapOptional("IncludeDirs", LineTable.IncludeDirs); IO.mapOptional("Files", LineTable.Files); IO.mapOptional("Opcodes", LineTable.Opcodes); diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml @@ -668,3 +668,98 @@ ## Specify the ExtLen field. ExtLen: 0x1234 SubOpcode: DW_LNE_end_sequence + +## m) Test how yaml2obj generates the opcode_base and the +## standard_opcode_lengths fields. + +## Both the opcode_base and the standard_opcode_lengths fields are not +## specified. + +# RUN: yaml2obj --docnum=13 %s -o %t13.o +# RUN: llvm-readelf --hex-dump=.debug_line %t13.o | \ +# RUN: FileCheck %s --check-prefix=OPCODEBASE1 + +# OPCODEBASE1: Hex dump of section '.debug_line': +# OPCODEBASE1-NEXT: 0x00000000 1a000000 04001400 00000100 0100010d ................ +## ^- opcode_base (13) +# OPCODEBASE1-NEXT: 0x00000010 00010101 01000000 01000001 0000 .............. +## ^- standard_opcode_lengths[DW_LNS_copy] = 0 +## ^- standard_opcode_lengths[DW_LNS_advance_pc] = 1 +## ^- standard_opcode_lengths[DW_LNS_advance_line] = 1 +## ^- standard_opcode_lengths[DW_LNS_set_file] = 1 +## ^- standard_opcode_lengths[DW_LNS_set_column] = 1 +## ^- standard_opcode_lengths[DW_LNS_negate_stmt] = 0 +## ^- standard_opcode_lengths[DW_LNS_set_basic_block] = 0 +## ^- standard_opcode_lengths[DW_LNS_const_add_pc] = 0 +## ^- standard_opcode_lengths[DW_LNS_fixed_advance_pc] = 1 +## ^- standard_opcode_lengths[DW_LNS_set_prologue_end] = 0 +## ^- standard_opcode_lengths[DW_LNS_set_epilogue_begin] = 0 +## ^- standard_opcode_lengths[DW_LNS_set_isa] = 1 +## ^--- terminators for include_directories and file_names + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC +DWARF: + debug_line: + - Version: 4 + MinInstLength: 1 + MaxOpsPerInst: 0 + DefaultIsStmt: 1 + LineBase: 0 + LineRange: 1 + OpcodeBase: [[OPCODEBASE=]] + StandardOpcodeLengths: [[STANDARDOPCODELENGTHS=]] + +## Specify the opcode_base field (opcode_base!=0). + +# RUN: yaml2obj --docnum=13 -DOPCODEBASE=4 %s -o %t14.o +# RUN: llvm-readelf --hex-dump=.debug_line %t14.o | \ +# RUN: FileCheck %s --check-prefix=OPCODEBASE2 + +# OPCODEBASE2: Hex dump of section '.debug_line': +# OPCODEBASE2-NEXT: 0x00000000 11000000 04000b00 00000100 01000104 ................ +## ^- opcode_base (4) +# OPCODEBASE2-NEXT: 0x00000010 00000000 00 ..... +## ^----- standard_opcode_lengths (3-byte) +## ^---- terminators for include_directories and file_names + +## Specify the opcode_base field (opcode_base=0). + +# RUN: yaml2obj --docnum=13 -DOPCODEBASE=0 %s -o %t15.o +# RUN: llvm-readelf --hex-dump=.debug_line %t15.o | \ +# RUN: FileCheck %s --check-prefix=OPCODEBASE3 + +# OPCODEBASE3: Hex dump of section '.debug_line': +# OPCODEBASE3-NEXT: 0x00000000 0e000000 04000800 00000100 01000100 ................ +## ^- opcode_base (0) +# OPCODEBASE3-NEXT: 0x00000010 0000 .. +## ^--- terminators for include_directories and file_names + +## Specify the standard_opcode_lengths field. + +# RUN: yaml2obj --docnum=13 -DSTANDARDOPCODELENGTHS=[0,1,0] %s -o %t16.o +# RUN: llvm-readelf --hex-dump=.debug_line %t16.o | \ +# RUN: FileCheck %s --check-prefix=OPCODEBASE4 + +# OPCODEBASE4: Hex dump of section '.debug_line': +# OPCODEBASE4-NEXT: 0x00000000 11000000 04000b00 00000100 01000104 ................ +## ^- opcode_base (4) +# OPCODEBASE4-NEXT: 0x00000010 00010000 00 ..... +## ^----- standard_opcode_lengths (3-byte) +## ^---- terminators for include_directories and file_names + +## Specify both the opcode_base and the standard_opcode_lengths fields. + +# RUN: yaml2obj --docnum=13 -DOPCODEBASE=2 -DSTANDARDOPCODELENGTHS=[0,1,0] %s -o %t17.o +# RUN: llvm-readelf --hex-dump=.debug_line %t17.o | \ +# RUN: FileCheck %s --check-prefix=OPCODEBASE5 + +# OPCODEBASE5: Hex dump of section '.debug_line': +# OPCODEBASE5-NEXT: 0x00000000 11000000 04000b00 00000100 01000102 ................ +## ^- opcode_base (2) +# OPCODEBASE5-NEXT: 0x00000010 00010000 00 ..... +## ^----- standard_opcode_lengths (3-byte) +## ^---- terminators for include_directories and file_names diff --git a/llvm/tools/obj2yaml/dwarf2yaml.cpp b/llvm/tools/obj2yaml/dwarf2yaml.cpp --- a/llvm/tools/obj2yaml/dwarf2yaml.cpp +++ b/llvm/tools/obj2yaml/dwarf2yaml.cpp @@ -378,9 +378,9 @@ DebugLines.LineRange = LineData.getU8(&Offset); DebugLines.OpcodeBase = LineData.getU8(&Offset); - DebugLines.StandardOpcodeLengths.reserve(DebugLines.OpcodeBase - 1); + DebugLines.StandardOpcodeLengths.emplace(); for (uint8_t i = 1; i < DebugLines.OpcodeBase; ++i) - DebugLines.StandardOpcodeLengths.push_back(LineData.getU8(&Offset)); + DebugLines.StandardOpcodeLengths->push_back(LineData.getU8(&Offset)); while (Offset < EndPrologue) { StringRef Dir = LineData.getCStr(&Offset); @@ -422,7 +422,7 @@ while (Offset < StartExt + *NewOp.ExtLen) NewOp.UnknownOpcodeData.push_back(LineData.getU8(&Offset)); } - } else if (NewOp.Opcode < DebugLines.OpcodeBase) { + } else if (NewOp.Opcode < *DebugLines.OpcodeBase) { switch (NewOp.Opcode) { case dwarf::DW_LNS_copy: case dwarf::DW_LNS_negate_stmt: @@ -449,7 +449,9 @@ default: for (uint8_t i = 0; - i < DebugLines.StandardOpcodeLengths[NewOp.Opcode - 1]; ++i) + i < + DebugLines.StandardOpcodeLengths.getValue()[NewOp.Opcode - 1]; + ++i) NewOp.StandardOpcodeData.push_back(LineData.getULEB128(&Offset)); } }