This is an archive of the discontinued LLVM Phabricator instance.

[llvm-objcopy] Change Segment::Type from uint64_t to uint32_t
ClosedPublic

Authored by MaskRay on Dec 12 2018, 2:16 PM.

Reviewers

Commits

Summary

Elf{32,64}_Word p_type is uint32_t.

Also reorder the fields to be similar to Elf64_Phdr (different from
Elf32_Phdr but quite similar).

Repository

rL LLVM

Build Status

Buildable 25963
Build 25962: arc lint + arc unit

Is there a motivation for this change or just cleanup?

This revision is now accepted and ready to land.Dec 12 2018, 2:45 PM

It is a cleanup..

This revision was automatically updated to reflect the committed changes.

Path

Size

tools/

llvm-objcopy/

ELF/

14 lines

Show First 20 Lines • Show All 250 Lines • ▼ Show 20 Lines	bool operator()(const SectionBase Lhs, const SectionBase Rhs) const {
return Lhs < Rhs;		return Lhs < Rhs;
return Lhs->OriginalOffset < Rhs->OriginalOffset;		return Lhs->OriginalOffset < Rhs->OriginalOffset;
}		}
};		};

std::set<const SectionBase *, SectionCompare> Sections;		std::set<const SectionBase *, SectionCompare> Sections;

public:		public:
uint64_t Align;		uint32_t Type;
uint64_t FileSize;
uint32_t Flags;		uint32_t Flags;
uint32_t Index;
uint64_t MemSize;
uint64_t Offset;		uint64_t Offset;
uint64_t PAddr;
uint64_t Type;
uint64_t VAddr;		uint64_t VAddr;
		uint64_t PAddr;
		uint64_t FileSize;
		uint64_t MemSize;
		uint64_t Align;

		uint32_t Index;
uint64_t OriginalOffset;		uint64_t OriginalOffset;
Segment *ParentSegment = nullptr;		Segment *ParentSegment = nullptr;
ArrayRef<uint8_t> Contents;		ArrayRef<uint8_t> Contents;

explicit Segment(ArrayRef<uint8_t> Data) : Contents(Data) {}		explicit Segment(ArrayRef<uint8_t> Data) : Contents(Data) {}
Segment() {}		Segment() {}

const SectionBase *firstSection() const {		const SectionBase *firstSection() const {
▲ Show 20 Lines • Show All 498 Lines • Show Last 20 Lines