labath created this revision.
labath added reviewers: aprantl, zturner.
This test makes sure we are able to read the shorter build-ids which are
generated by lld.
To make this work, I've extended lldb-test to print the UUID of the
loaded object file. I've renamed the lldb-test subcommand from
"module-sections" to "object-file" to reflect the fact it prints more
than just the sections.
I've also added the module Architecture to the output, so we could avoid
printing the entire symbol file information just to get the ArchSpec
details in the lc_version_min test (which was also the only test in it's
folder not using the module-sections command).
https://reviews.llvm.org/D48646
Files:
lit/Modules/build-id-case.yaml
lit/Modules/compressed-sections.yaml
lit/Modules/elf-duplicate-section.yaml
lit/Modules/elf-section-types.yaml
lit/Modules/lc_version_min.yaml
lit/Modules/short-build-id.yaml
tools/lldb-test/lldb-test.cpp
Index: tools/lldb-test/lldb-test.cpp
===================================================================
--- tools/lldb-test/lldb-test.cpp
+++ tools/lldb-test/lldb-test.cpp
@@ -51,14 +51,15 @@
namespace opts {
static cl::SubCommand BreakpointSubcommand("breakpoints",
"Test breakpoint resolution");
-cl::SubCommand ModuleSubcommand("module-sections",
- "Display LLDB Module Information");
+cl::SubCommand ObjectFileSubcommand("object-file",
+ "Display LLDB object file information");
cl::SubCommand SymbolsSubcommand("symbols", "Dump symbols for an object file");
cl::SubCommand IRMemoryMapSubcommand("ir-memory-map", "Test IRMemoryMap");
cl::opt<std::string> Log("log", cl::desc("Path to a log file"), cl::init(""),
cl::sub(BreakpointSubcommand),
- cl::sub(ModuleSubcommand), cl::sub(SymbolsSubcommand),
+ cl::sub(ObjectFileSubcommand),
+ cl::sub(SymbolsSubcommand),
cl::sub(IRMemoryMapSubcommand));
/// Create a target using the file pointed to by \p Filename, or abort.
@@ -85,13 +86,14 @@
static int evaluateBreakpoints(Debugger &Dbg);
} // namespace breakpoint
-namespace module {
+namespace object {
cl::opt<bool> SectionContents("contents",
cl::desc("Dump each section's contents"),
- cl::sub(ModuleSubcommand));
+ cl::sub(ObjectFileSubcommand));
cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input files>"),
- cl::OneOrMore, cl::sub(ModuleSubcommand));
-} // namespace module
+ cl::OneOrMore,
+ cl::sub(ObjectFileSubcommand));
+} // namespace object
namespace symbols {
static cl::list<std::string> InputFilenames(cl::Positional,
@@ -582,11 +584,11 @@
return HadErrors;
}
-static int dumpModules(Debugger &Dbg) {
+static int dumpObjectFiles(Debugger &Dbg) {
LinePrinter Printer(4, llvm::outs());
int HadErrors = 0;
- for (const auto &File : opts::module::InputFilenames) {
+ for (const auto &File : opts::object::InputFilenames) {
ModuleSpec Spec{FileSpec(File, false)};
auto ModulePtr = std::make_shared<lldb_private::Module>(Spec);
@@ -600,6 +602,10 @@
continue;
}
+ Printer.formatLine("Architecture: {0}",
+ ModulePtr->GetArchitecture().GetTriple().getTriple());
+ Printer.formatLine("UUID: {0}", ModulePtr->GetUUID().GetAsString());
+
size_t Count = Sections->GetNumSections(0);
Printer.formatLine("Showing {0} sections", Count);
for (size_t I = 0; I < Count; ++I) {
@@ -612,7 +618,7 @@
Printer.formatLine("VM size: {0}", S->GetByteSize());
Printer.formatLine("File size: {0}", S->GetFileSize());
- if (opts::module::SectionContents) {
+ if (opts::object::SectionContents) {
DataExtractor Data;
S->GetSectionData(Data);
ArrayRef<uint8_t> Bytes = {Data.GetDataStart(), Data.GetDataEnd()};
@@ -807,8 +813,8 @@
if (opts::BreakpointSubcommand)
return opts::breakpoint::evaluateBreakpoints(*Dbg);
- if (opts::ModuleSubcommand)
- return dumpModules(*Dbg);
+ if (opts::ObjectFileSubcommand)
+ return dumpObjectFiles(*Dbg);
if (opts::SymbolsSubcommand)
return opts::symbols::dumpSymbols(*Dbg);
if (opts::IRMemoryMapSubcommand)
Index: lit/Modules/short-build-id.yaml
===================================================================
--- /dev/null
+++ lit/Modules/short-build-id.yaml
@@ -0,0 +1,26 @@
+# RUN: yaml2obj %s >%t
+# RUN: lldb-test object-file %t | FileCheck %s
+
+# CHECK: UUID: 333059A4-3CC3-D5F9
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_EXEC
+ Machine: EM_X86_64
+ Entry: 0x0000000000201000
+Sections:
+ - Name: .note.gnu.build-id
+ Type: SHT_NOTE
+ Flags: [ SHF_ALLOC ]
+ Address: 0x0000000000200190
+ AddressAlign: 0x0000000000000004
+ Content: 040000000800000003000000474E5500333059A43CC3D5F9
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ Address: 0x0000000000201000
+ AddressAlign: 0x0000000000000004
+ Content: ''
+...
Index: lit/Modules/lc_version_min.yaml
===================================================================
--- lit/Modules/lc_version_min.yaml
+++ lit/Modules/lc_version_min.yaml
@@ -1,8 +1,8 @@
# RUN: yaml2obj %s > %t.out
-# RUN: lldb-test symbols %t.out | FileCheck %s
+# RUN: lldb-test object-file %t.out | FileCheck %s
# Test that the deployment target is parsed from the load commands.
-# CHECK: x86_64-apple-macosx10.9.0
+# CHECK: Architecture: x86_64-apple-macosx10.9.0
--- !mach-o
FileHeader:
magic: 0xFEEDFACF
Index: lit/Modules/elf-section-types.yaml
===================================================================
--- lit/Modules/elf-section-types.yaml
+++ lit/Modules/elf-section-types.yaml
@@ -1,5 +1,5 @@
# RUN: yaml2obj %s > %t
-# RUN: lldb-test module-sections %t | FileCheck %s
+# RUN: lldb-test object-file %t | FileCheck %s
# CHECK: Name: .text
# CHECK-NEXT: Type: code
Index: lit/Modules/elf-duplicate-section.yaml
===================================================================
--- lit/Modules/elf-duplicate-section.yaml
+++ lit/Modules/elf-duplicate-section.yaml
@@ -2,7 +2,7 @@
# RUN: yaml2obj %s > %t/.build-id/1b/8a73ac238390e32a7ff4ac8ebe4d6a41ecf5c9.debug
# RUN: cd %t
# RUN: llvm-objcopy --strip-all --add-gnu-debuglink=.build-id/1b/8a73ac238390e32a7ff4ac8ebe4d6a41ecf5c9.debug %t/.build-id/1b/8a73ac238390e32a7ff4ac8ebe4d6a41ecf5c9.debug %t/stripped.out
-# RUN: lldb-test module-sections %t/stripped.out | FileCheck %s
+# RUN: lldb-test object-file %t/stripped.out | FileCheck %s
# Make sure that the debug_frame section is present only once.
# CHECK: Name: .debug_frame
Index: lit/Modules/compressed-sections.yaml
===================================================================
--- lit/Modules/compressed-sections.yaml
+++ lit/Modules/compressed-sections.yaml
@@ -1,6 +1,6 @@
# REQUIRES: zlib
# RUN: yaml2obj %s > %t
-# RUN: lldb-test module-sections --contents %t | FileCheck %s
+# RUN: lldb-test object-file --contents %t | FileCheck %s
--- !ELF
FileHeader:
Class: ELFCLASS32
Index: lit/Modules/build-id-case.yaml
===================================================================
--- lit/Modules/build-id-case.yaml
+++ lit/Modules/build-id-case.yaml
@@ -2,7 +2,7 @@
# RUN: yaml2obj %s > %t/.build-id/1b/8a73ac238390e32a7ff4ac8ebe4d6a41ecf5c9.debug
# RUN: cd %t
# RUN: llvm-objcopy --strip-all --add-gnu-debuglink=.build-id/1b/8a73ac238390e32a7ff4ac8ebe4d6a41ecf5c9.debug %t/.build-id/1b/8a73ac238390e32a7ff4ac8ebe4d6a41ecf5c9.debug %t/stripped.out
-# RUN: lldb-test module-sections %t/stripped.out | FileCheck %s
+# RUN: lldb-test object-file %t/stripped.out | FileCheck %s
# CHECK: Name: .debug_frame
# CHECK-NEXT: Type: dwarf-frame
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
