This is an archive of the discontinued LLVM Phabricator instance.

[lldb-test] Add a lit test for dependent modules in PECOFF
AbandonedPublic

Authored by asmith on Oct 10 2018, 10:33 AM.

Download Raw Diff

Details

Reviewers

rnk
zturner
aleksandr.urakov

Summary

Add a new subcommand to lldb-test called 'dep-modules' to test
dependent modules in PECOFF.

This has a dependence on,
https://reviews.llvm.org/D53094

Diff Detail

Event Timeline

asmith created this revision.Oct 10 2018, 10:33 AM

Herald added a subscriber: lldb-commits. · View Herald TranscriptOct 10 2018, 10:33 AM

asmith edited the summary of this revision. (Show Details)Oct 10 2018, 10:33 AM

LGTM after D53094 will be done!

This revision is now accepted and ready to land.Oct 11 2018, 6:29 AM

Changes from this CR were added to D53094

Revision Contents

Path

Size

lit/

Modules/

PECOFF/

dep-modules.yaml

168 lines

export-dllfunc.yaml

172 lines

lit.local.cfg

1 line

tools/

lldb-test/

lldb-test.cpp

24 lines

Diff 169042

lit/Modules/PECOFF/dep-modules.yaml

This file was added.

				# REQUIRES: windows
				# RUN: yaml2obj < %p/export-dllfunc.yaml > %t.export-dllfunc.obj
				# RUN: yaml2obj < %s > %t.obj
				#
				# RUN: lld-link /machine:x64 /out:%t.export-dllfunc.dll /noentry /nodefaultlib /dll %t.export-dllfunc.obj /export:DllFunc
				# RUN: lld-link /out:%t.exe %t.obj %t.export-dllfunc.lib /nodefaultlib /entry:main /include:DllFunc
				#
				# RUN: lldb-test object-file -dep-modules %t.exe \| FileCheck -check-prefix=DEPS %s


				# DEPS: Showing 1 dependent module(s)
				# DEPS: Name: dep-modules.yaml.{{.*}}export-dllfunc.dll


				--- !COFF
				header:
				Machine: IMAGE_FILE_MACHINE_AMD64
				Characteristics: [ ]
				sections:
				- Name: .text
				Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
				Alignment: 16
				SectionData: 4883EC48C7442444000000004889542438894C2434B904000000E80000000089442430B908000000E8000000008944242C8B4424300344242C4883C448C3
				Relocations:
				- VirtualAddress: 27
				SymbolName: 'DllFunc'
				Type: IMAGE_REL_AMD64_REL32
				- VirtualAddress: 41
				SymbolName: 'DllFunc'
				Type: IMAGE_REL_AMD64_REL32
				- Name: .data
				Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
				Alignment: 4
				SectionData: ''
				- Name: .bss
				Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
				Alignment: 4
				SectionData: ''
				- Name: .xdata
				Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
				Alignment: 4
				SectionData: '0104010004820000'
				- Name: .drectve
				Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
				Alignment: 1
				SectionData: 202F44454641554C544C49423A6C6962636D742E6C6962202F44454641554C544C49423A6F6C646E616D65732E6C6962
				- Name: .pdata
				Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
				Alignment: 4
				SectionData: '000000003E00000000000000'
				Relocations:
				- VirtualAddress: 0
				SymbolName: main
				Type: IMAGE_REL_AMD64_ADDR32NB
				- VirtualAddress: 4
				SymbolName: main
				Type: IMAGE_REL_AMD64_ADDR32NB
				- VirtualAddress: 8
				SymbolName: .xdata
				Type: IMAGE_REL_AMD64_ADDR32NB
				- Name: .llvm_addrsig
				Characteristics: [ IMAGE_SCN_LNK_REMOVE ]
				Alignment: 1
				SectionData: '10'
				symbols:
				- Name: .text
				Value: 0
				SectionNumber: 1
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 62
				NumberOfRelocations: 2
				NumberOfLinenumbers: 0
				CheckSum: 373303044
				Number: 1
				- Name: .data
				Value: 0
				SectionNumber: 2
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 0
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 0
				Number: 2
				- Name: .bss
				Value: 0
				SectionNumber: 3
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 0
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 0
				Number: 3
				- Name: .xdata
				Value: 0
				SectionNumber: 4
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 8
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 2657791889
				Number: 4
				- Name: .drectve
				Value: 0
				SectionNumber: 5
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 48
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 149686238
				Number: 5
				- Name: .pdata
				Value: 0
				SectionNumber: 6
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 12
				NumberOfRelocations: 3
				NumberOfLinenumbers: 0
				CheckSum: 2420588879
				Number: 6
				- Name: .llvm_addrsig
				Value: 0
				SectionNumber: 7
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 1
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 498536548
				Number: 7
				- Name: '@feat.00'
				Value: 0
				SectionNumber: -1
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				- Name: main
				Value: 0
				SectionNumber: 1
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_FUNCTION
				StorageClass: IMAGE_SYM_CLASS_EXTERNAL
				- Name: 'DllFunc'
				Value: 0
				SectionNumber: 0
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_EXTERNAL
				...

lit/Modules/PECOFF/export-dllfunc.yaml

This file was added.

				# REQUIRES: windows
				# RUN: yaml2obj < %s > %t.obj
				#
				# RUN: lld-link /machine:x64 /out:%t.dll /noentry /nodefaultlib /dll %t.obj /export:DllFunc
				#
				# RUN: lldb-test object-file %t.dll \| FileCheck -check-prefix=BASIC-CHECK %s
				# RUN: lldb-test object-file -dep-modules %t.dll \| FileCheck -check-prefix=DEPS %s


				# BASIC-CHECK: Showing 3 sections
				# BASIC-CHECK: Index: 0
				# BASIC-CHECK: Name: .text
				# BASIC-CHECK: Type: code
				# BASIC-CHECK: VM size: 22
				# BASIC-CHECK: File size: 512
				#
				# BASIC-CHECK: Index: 1
				# BASIC-CHECK: Name: .rdata
				# BASIC-CHECK: Type: data
				# BASIC-CHECK: VM size: {{.}}
				# BASIC-CHECK: File size: 512
				#
				# BASIC-CHECK: Index: 2
				# BASIC-CHECK: Name: .pdata
				# BASIC-CHECK: Type: data
				# BASIC-CHECK: VM size: 12
				# BASIC-CHECK: File size: 512
				#
				# DEPS: Showing 0 dependent module(s)


				--- !COFF
				header:
				Machine: IMAGE_FILE_MACHINE_AMD64
				Characteristics: [ ]
				sections:
				- Name: .text
				Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
				Alignment: 16
				SectionData: 50894C24048B4C24040FAF4C2404890C248B042459C3
				- Name: .data
				Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
				Alignment: 4
				SectionData: ''
				- Name: .bss
				Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA, IMAGE_SCN_MEM_READ, IMAGE_SCN_MEM_WRITE ]
				Alignment: 4
				SectionData: ''
				- Name: .xdata
				Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
				Alignment: 4
				SectionData: '0101010001020000'
				- Name: .drectve
				Characteristics: [ IMAGE_SCN_LNK_INFO, IMAGE_SCN_LNK_REMOVE ]
				Alignment: 1
				SectionData: 202F44454641554C544C49423A6C6962636D742E6C6962202F44454641554C544C49423A6F6C646E616D65732E6C6962
				- Name: .pdata
				Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ]
				Alignment: 4
				SectionData: '000000001600000000000000'
				Relocations:
				- VirtualAddress: 0
				SymbolName: 'DllFunc'
				Type: IMAGE_REL_AMD64_ADDR32NB
				- VirtualAddress: 4
				SymbolName: 'DllFunc'
				Type: IMAGE_REL_AMD64_ADDR32NB
				- VirtualAddress: 8
				SymbolName: .xdata
				Type: IMAGE_REL_AMD64_ADDR32NB
				- Name: .llvm_addrsig
				Characteristics: [ IMAGE_SCN_LNK_REMOVE ]
				Alignment: 1
				SectionData: ''
				symbols:
				- Name: .text
				Value: 0
				SectionNumber: 1
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 22
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 3054557294
				Number: 1
				- Name: .data
				Value: 0
				SectionNumber: 2
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 0
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 0
				Number: 2
				- Name: .bss
				Value: 0
				SectionNumber: 3
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 0
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 0
				Number: 3
				- Name: .xdata
				Value: 0
				SectionNumber: 4
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 8
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 448359300
				Number: 4
				- Name: .drectve
				Value: 0
				SectionNumber: 5
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 48
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 149686238
				Number: 5
				- Name: .pdata
				Value: 0
				SectionNumber: 6
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 12
				NumberOfRelocations: 3
				NumberOfLinenumbers: 0
				CheckSum: 3134470316
				Number: 6
				- Name: .llvm_addrsig
				Value: 0
				SectionNumber: 7
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				SectionDefinition:
				Length: 0
				NumberOfRelocations: 0
				NumberOfLinenumbers: 0
				CheckSum: 0
				Number: 7
				- Name: '@feat.00'
				Value: 0
				SectionNumber: -1
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_NULL
				StorageClass: IMAGE_SYM_CLASS_STATIC
				- Name: 'DllFunc'
				Value: 0
				SectionNumber: 1
				SimpleType: IMAGE_SYM_TYPE_NULL
				ComplexType: IMAGE_SYM_DTYPE_FUNCTION
				StorageClass: IMAGE_SYM_CLASS_EXTERNAL
				...

lit/Modules/PECOFF/lit.local.cfg

This file was added.

config.suffixes = ['.yaml', '.test']

tools/lldb-test/lldb-test.cpp

Show First 20 Lines • Show All 84 Lines • ▼ Show 20 Lines
static std::string substitute(StringRef Cmd);		static std::string substitute(StringRef Cmd);
static int evaluateBreakpoints(Debugger &Dbg);		static int evaluateBreakpoints(Debugger &Dbg);
} // namespace breakpoint		} // namespace breakpoint

namespace object {		namespace object {
cl::opt<bool> SectionContents("contents",		cl::opt<bool> SectionContents("contents",
cl::desc("Dump each section's contents"),		cl::desc("Dump each section's contents"),
cl::sub(ObjectFileSubcommand));		cl::sub(ObjectFileSubcommand));
		cl::opt<bool> SectionDependentModules("dep-modules",
		cl::desc("Dump each dependent module"),
		cl::sub(ObjectFileSubcommand));
cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input files>"),		cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input files>"),
cl::OneOrMore,		cl::OneOrMore,
cl::sub(ObjectFileSubcommand));		cl::sub(ObjectFileSubcommand));
} // namespace object		} // namespace object

namespace symbols {		namespace symbols {
static cl::list<std::string> InputFilenames(cl::Positional,		static cl::list<std::string> InputFilenames(cl::Positional,
cl::desc("<input files>"),		cl::desc("<input files>"),
▲ Show 20 Lines • Show All 506 Lines • ▼ Show 20 Lines	if (Regex \|\| !Context.empty() \|\| !Name.empty() \|\| !File.empty() \|\|
return make_string_error(		return make_string_error(
"-regex, -context, -name, -file and -line options are not "		"-regex, -context, -name, -file and -line options are not "
"applicable for symbol verification.");		"applicable for symbol verification.");
return verify;		return verify;
}		}

if (DumpAST) {		if (DumpAST) {
if (Find != FindType::None)		if (Find != FindType::None)
return make_string_error(		return make_string_error("Cannot both search and dump AST.");
"Cannot both search and dump AST.");
if (Regex \|\| !Context.empty() \|\| !Name.empty() \|\| !File.empty() \|\|		if (Regex \|\| !Context.empty() \|\| !Name.empty() \|\| !File.empty() \|\|
Line != 0)		Line != 0)
return make_string_error(		return make_string_error(
"-regex, -context, -name, -file and -line options are not "		"-regex, -context, -name, -file and -line options are not "
"applicable for dumping AST.");		"applicable for dumping AST.");
return dumpAST;		return dumpAST;
}		}

▲ Show 20 Lines • Show All 128 Lines • ▼ Show 20 Lines	for (size_t I = 0; I < Count; ++I) {
if (opts::object::SectionContents) {		if (opts::object::SectionContents) {
DataExtractor Data;		DataExtractor Data;
S->GetSectionData(Data);		S->GetSectionData(Data);
ArrayRef<uint8_t> Bytes = {Data.GetDataStart(), Data.GetDataEnd()};		ArrayRef<uint8_t> Bytes = {Data.GetDataStart(), Data.GetDataEnd()};
Printer.formatBinary("Data: ", Bytes, 0);		Printer.formatBinary("Data: ", Bytes, 0);
}		}
Printer.NewLine();		Printer.NewLine();
}		}

		if (opts::object::SectionDependentModules) {
		// A non-empty section list ensures a valid object file.
		auto Obj = ModulePtr->GetObjectFile();
		FileSpecList Files;
		auto Count = Obj->GetDependentModules(Files);
		Printer.formatLine("Showing {0} dependent module(s)", Count);
		for (size_t I = 0; I < Files.GetSize(); ++I) {
		AutoIndent Indent(Printer, 2);
		Printer.formatLine("Name: {0}",
		Files.GetFileSpecAtIndex(I).GetCString());
		}
		Printer.NewLine();
		}
}		}
return HadErrors;		return HadErrors;
}		}

/// Check if two half-open intervals intersect:		/// Check if two half-open intervals intersect:
/// http://world.std.com/~swmcd/steven/tech/interval.html		/// http://world.std.com/~swmcd/steven/tech/interval.html
bool opts::irmemorymap::areAllocationsOverlapping(const AllocationT &L,		bool opts::irmemorymap::areAllocationsOverlapping(const AllocationT &L,
const AllocationT &R) {		const AllocationT &R) {
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines	if (areAllocationsOverlapping(ProbeAllocation, NewAllocation)) {
outs() << "Malloc error: overlapping allocation detected"		outs() << "Malloc error: overlapping allocation detected"
<< formatv(", previous allocation at [{0:x}, {1:x})\n",		<< formatv(", previous allocation at [{0:x}, {1:x})\n",
Probe.start(), Probe.stop());		Probe.start(), Probe.stop());
exit(1);		exit(1);
}		}
++Probe;		++Probe;
}		}

// Insert the new allocation into the interval map. Use unique allocation IDs		// Insert the new allocation into the interval map. Use unique allocation
// to inhibit interval coalescing.		// IDs to inhibit interval coalescing.
static unsigned AllocationID = 0;		static unsigned AllocationID = 0;
if (Size)		if (Size)
State.Allocations.insert(Addr, EndOfRegion, AllocationID++);		State.Allocations.insert(Addr, EndOfRegion, AllocationID++);

// Store the label -> address mapping.		// Store the label -> address mapping.
State.Label2AddrMap[Label] = Addr;		State.Label2AddrMap[Label] = Addr;

return true;		return true;
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines