From 629f964d50d140366edd129bc4368ba6bd918eea Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Thu, 26 Mar 2015 02:20:25 +0000 Subject: [PATCH] Use arithmetic type to represent alignments (not in log2) everywhere. This is the final step of conversion. Now log2 numbers are removed from everywhere! llvm-svn: 233246 --- lld/include/lld/Core/DefinedAtom.h | 22 +------------------ .../lld/ReaderWriter/MachOLinkingContext.h | 6 ++--- lld/lib/Driver/DarwinLdDriver.cpp | 2 +- .../MachO/MachOLinkingContext.cpp | 4 ++-- .../ReaderWriter/MachO/MachONormalizedFile.h | 2 +- .../MachO/MachONormalizedFileFromAtoms.cpp | 15 +++++-------- .../MachO/MachONormalizedFileYAML.cpp | 16 +------------- lld/test/mach-o/align_text.yaml | 2 +- lld/test/mach-o/parse-initializers64.yaml | 4 ++-- lld/test/mach-o/parse-literals.yaml | 10 ++++----- .../MachONormalizedFileYAMLTests.cpp | 18 +++++++-------- 11 files changed, 31 insertions(+), 70 deletions(-) diff --git a/lld/include/lld/Core/DefinedAtom.h b/lld/include/lld/Core/DefinedAtom.h index 211c9bd50c9b..986c7ff5ad1b 100644 --- a/lld/include/lld/Core/DefinedAtom.h +++ b/lld/include/lld/Core/DefinedAtom.h @@ -17,26 +17,6 @@ namespace lld { class File; class Reference; -// This class represents exponents of power-of-two numbers. -// Used to represent alignments. -// -// Currently we represent alignments both in log2 of a value or a -// value itself. That is confusing. We aim to use only real values -// only. Conversion is not easy, since both types are just arithmetic -// types, and thus the compiler doesn't help us find places we mix -// them. This class is to make all places where exponents are used -// explicit. -// -// Once the conversion is done, this class will be removed. -class PowerOf2 { -public: - PowerOf2(uint16_t v) : _v(v) {} - bool operator==(const PowerOf2 &other) const { return _v == other._v; } - operator uint16_t() const { return _v; } -private: - uint16_t _v; -}; - /// \brief The fundamental unit of linking. /// /// A C function or global variable is an atom. An atom has content and @@ -220,7 +200,7 @@ public: struct Alignment { Alignment(int v, int m = 0) : value(v), modulus(m) {} - PowerOf2 value; + uint16_t value; uint16_t modulus; bool operator==(const Alignment &rhs) const { diff --git a/lld/include/lld/ReaderWriter/MachOLinkingContext.h b/lld/include/lld/ReaderWriter/MachOLinkingContext.h index 9775aa5f8fbc..f8239a48d828 100644 --- a/lld/include/lld/ReaderWriter/MachOLinkingContext.h +++ b/lld/include/lld/ReaderWriter/MachOLinkingContext.h @@ -228,10 +228,10 @@ public: const StringRefVector &rpaths() const { return _rpaths; } /// Add section alignment constraint on final layout. - void addSectionAlignment(StringRef seg, StringRef sect, PowerOf2 align2); + void addSectionAlignment(StringRef seg, StringRef sect, uint16_t align2); /// Returns true if specified section had alignment constraints. - bool sectionAligned(StringRef seg, StringRef sect, PowerOf2 &align2) const; + bool sectionAligned(StringRef seg, StringRef sect, uint16_t &align2) const; StringRef dyldPath() const { return "/usr/lib/dyld"; } @@ -312,7 +312,7 @@ private: struct SectionAlign { StringRef segmentName; StringRef sectionName; - PowerOf2 align2; + uint16_t align2; }; struct OrderFileNode { diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp index 8d3c9161e5fb..f0ba2df178fc 100644 --- a/lld/lib/Driver/DarwinLdDriver.cpp +++ b/lld/lib/Driver/DarwinLdDriver.cpp @@ -479,7 +479,7 @@ bool DarwinLdDriver::parse(int argc, const char *argv[], << alignStr << "' not a valid number\n"; return false; } - PowerOf2 align2 = 1 << llvm::countTrailingZeros(alignValue); + uint16_t align2 = 1 << llvm::countTrailingZeros(alignValue); if (!llvm::isPowerOf2_64(alignValue)) { diagnostics << "warning: alignment for '-sectalign " << segName << " " << sectName diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp index 0940e310701e..c8bf7a6f961b 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -731,13 +731,13 @@ ArchHandler &MachOLinkingContext::archHandler() const { void MachOLinkingContext::addSectionAlignment(StringRef seg, StringRef sect, - PowerOf2 align2) { + uint16_t align2) { SectionAlign entry = { seg, sect, align2 }; _sectAligns.push_back(entry); } bool MachOLinkingContext::sectionAligned(StringRef seg, StringRef sect, - PowerOf2 &align2) const { + uint16_t &align2) const { for (const SectionAlign &entry : _sectAligns) { if (seg.equals(entry.segmentName) && sect.equals(entry.sectionName)) { align2 = entry.align2; diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h index 449d61960de8..134c28dfc29e 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h @@ -114,7 +114,7 @@ struct Section { StringRef sectionName; SectionType type; SectionAttr attributes; - PowerOf2 alignment; + uint16_t alignment; Hex64 address; ArrayRef content; Relocations relocations; diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp index 9d9d94b1f5ff..75cdaef22ddc 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp @@ -58,7 +58,7 @@ struct SectionInfo { uint32_t attributes; uint64_t address; uint64_t size; - PowerOf2 alignment; + uint16_t alignment; std::vector atomsAndOffsets; uint32_t normalizedSectionIndex; uint32_t finalSectionIndex; @@ -69,7 +69,7 @@ SectionInfo::SectionInfo(StringRef sg, StringRef sct, SectionType t, : segmentName(sg), sectionName(sct), type(t), attributes(attrs), address(0), size(0), alignment(1), normalizedSectionIndex(0), finalSectionIndex(0) { - PowerOf2 align = 1; + uint16_t align = 1; if (ctxt.sectionAligned(segmentName, sectionName, align)) { alignment = align; } @@ -142,7 +142,6 @@ private: void appendSection(SectionInfo *si, NormalizedFile &file); uint32_t sectionIndexForAtom(const Atom *atom); - static uint64_t alignTo(uint64_t value, PowerOf2 align2); typedef llvm::DenseMap AtomToIndex; struct AtomAndIndex { const Atom *atom; uint32_t index; SymbolScope scope; }; struct AtomSorter { @@ -453,15 +452,11 @@ void Util::organizeSections() { } -uint64_t Util::alignTo(uint64_t value, PowerOf2 align2) { - return llvm::RoundUpToAlignment(value, align2); -} - void Util::layoutSectionsInSegment(SegmentInfo *seg, uint64_t &addr) { seg->address = addr; for (SectionInfo *sect : seg->sections) { - sect->address = alignTo(addr, sect->alignment); + sect->address = llvm::RoundUpToAlignment(addr, sect->alignment); addr = sect->address + sect->size; } seg->size = llvm::RoundUpToAlignment(addr - seg->address,_context.pageSize()); @@ -485,7 +480,7 @@ void Util::layoutSectionsInTextSegment(size_t hlcSize, SegmentInfo *seg, // Start assigning section address starting at padded offset. addr += (padding + hlcSize); for (SectionInfo *sect : seg->sections) { - sect->address = alignTo(addr, sect->alignment); + sect->address = llvm::RoundUpToAlignment(addr, sect->alignment); addr = sect->address + sect->size; } seg->size = llvm::RoundUpToAlignment(addr - seg->address,_context.pageSize()); @@ -528,7 +523,7 @@ void Util::assignAddressesToSections(const NormalizedFile &file) { ); } else { for (SectionInfo *sect : _sectionInfos) { - sect->address = alignTo(address, sect->alignment); + sect->address = llvm::RoundUpToAlignment(address, sect->alignment); address = sect->address + sect->size; } DEBUG_WITH_TYPE("WriterMachO-norm", diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp index 5d71c75ef433..83359115fbfc 100644 --- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp +++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp @@ -53,20 +53,6 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(DataInCode) namespace llvm { namespace yaml { -template <> -struct ScalarTraits { - static void output(const lld::PowerOf2 &value, void*, raw_ostream &out) { - out << llvm::format("%d", value); - } - static StringRef input(StringRef scalar, void*, lld::PowerOf2 &result) { - uint32_t value; - scalar.getAsInteger(10, value); - result = 1 << value; - return StringRef(); - } - static bool mustQuote(StringRef) { return false; } -}; - // A vector of Sections is a sequence. template<> struct SequenceTraits< std::vector
> { @@ -290,7 +276,7 @@ struct MappingTraits
{ io.mapRequired("section", sect.sectionName); io.mapRequired("type", sect.type); io.mapOptional("attributes", sect.attributes); - io.mapOptional("alignment", sect.alignment, lld::PowerOf2(1)); + io.mapOptional("alignment", sect.alignment, (uint16_t)1); io.mapRequired("address", sect.address); if (sect.type == llvm::MachO::S_ZEROFILL) { // S_ZEROFILL sections use "size:" instead of "content:" diff --git a/lld/test/mach-o/align_text.yaml b/lld/test/mach-o/align_text.yaml index 2a4eecb2d6cd..66b5afb5ff30 100644 --- a/lld/test/mach-o/align_text.yaml +++ b/lld/test/mach-o/align_text.yaml @@ -13,7 +13,7 @@ sections: section: __text type: S_REGULAR attributes: [ S_ATTR_PURE_INSTRUCTIONS, S_ATTR_SOME_INSTRUCTIONS ] - alignment: 4 + alignment: 16 address: 0x0000000000000000 content: [ 0x90, 0x90, 0x90, 0xC3, 0xC3, 0xC3 ] local-symbols: diff --git a/lld/test/mach-o/parse-initializers64.yaml b/lld/test/mach-o/parse-initializers64.yaml index 5ebd8dafd7ce..40cd61091435 100644 --- a/lld/test/mach-o/parse-initializers64.yaml +++ b/lld/test/mach-o/parse-initializers64.yaml @@ -22,7 +22,7 @@ sections: section: __mod_init_func type: S_MOD_INIT_FUNC_POINTERS attributes: [ ] - alignment: 0 + alignment: 1 address: 0x0000000000000100 content: [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ] @@ -43,7 +43,7 @@ sections: section: __mod_term_func type: S_MOD_TERM_FUNC_POINTERS attributes: [ ] - alignment: 3 + alignment: 8 address: 0x0000000000000108 content: [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ] relocations: diff --git a/lld/test/mach-o/parse-literals.yaml b/lld/test/mach-o/parse-literals.yaml index 24568ea0fd4f..543f52def71f 100644 --- a/lld/test/mach-o/parse-literals.yaml +++ b/lld/test/mach-o/parse-literals.yaml @@ -14,7 +14,7 @@ sections: section: __cstring type: S_CSTRING_LITERALS attributes: [ ] - alignment: 0 + alignment: 1 address: 0x0000000000000100 content: [ 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0x00, 0x74, 0x68, 0x65, 0x72, 0x65, 0x00, 0x77, 0x6F, 0x72, 0x6C, @@ -23,7 +23,7 @@ sections: section: __literal4 type: S_4BYTE_LITERALS attributes: [ ] - alignment: 0 + alignment: 1 address: 0x0000000000000114 content: [ 0x01, 0x02, 0x03, 0x04, 0x11, 0x12, 0x13, 0x14, 0x28, 0x29, 0x2A, 0x2B ] @@ -31,7 +31,7 @@ sections: section: __literal8 type: S_8BYTE_LITERALS attributes: [ ] - alignment: 0 + alignment: 1 address: 0x0000000000000120 content: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F ] @@ -39,7 +39,7 @@ sections: section: __literal16 type: S_16BYTE_LITERALS attributes: [ ] - alignment: 0 + alignment: 1 address: 0x0000000000000130 content: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x00 ] @@ -47,7 +47,7 @@ sections: section: __ustring type: S_REGULAR attributes: [ ] - alignment: 0 + alignment: 1 address: 0x0000000000000100 content: [ 0x68, 0x00, 0x65, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x74, 0x00, 0x68, 0x00, diff --git a/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp index 6a1867380e62..d13e360b41a5 100644 --- a/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp +++ b/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp @@ -197,7 +197,7 @@ TEST(ObjectFileYAML, oneSection) { " section: __text\n" " type: S_REGULAR\n" " attributes: [ S_ATTR_PURE_INSTRUCTIONS ]\n" - " alignment: 1\n" + " alignment: 2\n" " address: 0x12345678\n" " content: [ 0x90, 0x90 ]\n" "...\n"); @@ -232,7 +232,7 @@ TEST(ObjectFileYAML, hello_x86_64) { " section: __text\n" " type: S_REGULAR\n" " attributes: [ S_ATTR_PURE_INSTRUCTIONS, S_ATTR_SOME_INSTRUCTIONS]\n" - " alignment: 0\n" + " alignment: 1\n" " address: 0x0000\n" " content: [ 0x55, 0x48, 0x89, 0xe5, 0x48, 0x8d, 0x3d, 0x00,\n" " 0x00, 0x00, 0x00, 0x30, 0xc0, 0xe8, 0x00, 0x00,\n" @@ -254,7 +254,7 @@ TEST(ObjectFileYAML, hello_x86_64) { " section: __cstring\n" " type: S_CSTRING_LITERALS\n" " attributes: [ ]\n" - " alignment: 0\n" + " alignment: 1\n" " address: 0x0016\n" " content: [ 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x0a, 0x00 ]\n" "global-symbols:\n" @@ -361,7 +361,7 @@ TEST(ObjectFileYAML, hello_x86) { " section: __text\n" " type: S_REGULAR\n" " attributes: [ S_ATTR_PURE_INSTRUCTIONS, S_ATTR_SOME_INSTRUCTIONS]\n" - " alignment: 0\n" + " alignment: 1\n" " address: 0x0000\n" " content: [ 0x55, 0x89, 0xe5, 0x83, 0xec, 0x08, 0xe8, 0x00,\n" " 0x00, 0x00, 0x00, 0x58, 0x8d, 0x80, 0x16, 0x00,\n" @@ -391,7 +391,7 @@ TEST(ObjectFileYAML, hello_x86) { " section: __cstring\n" " type: S_CSTRING_LITERALS\n" " attributes: [ ]\n" - " alignment: 0\n" + " alignment: 1\n" " address: 0x0021\n" " content: [ 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x0a, 0x00 ]\n" "global-symbols:\n" @@ -490,7 +490,7 @@ TEST(ObjectFileYAML, hello_armv6) { " section: __text\n" " type: S_REGULAR\n" " attributes: [ S_ATTR_PURE_INSTRUCTIONS, S_ATTR_SOME_INSTRUCTIONS]\n" - " alignment: 2\n" + " alignment: 4\n" " address: 0x0000\n" " content: [ 0x80, 0x40, 0x2d, 0xe9, 0x10, 0x00, 0x9f, 0xe5,\n" " 0x0d, 0x70, 0xa0, 0xe1, 0x00, 0x00, 0x8f, 0xe0,\n" @@ -519,7 +519,7 @@ TEST(ObjectFileYAML, hello_armv6) { " section: __cstring\n" " type: S_CSTRING_LITERALS\n" " attributes: [ ]\n" - " alignment: 0\n" + " alignment: 1\n" " address: 0x0020\n" " content: [ 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x0a, 0x00 ]\n" "global-symbols:\n" @@ -620,7 +620,7 @@ TEST(ObjectFileYAML, hello_armv7) { " section: __text\n" " type: S_REGULAR\n" " attributes: [ S_ATTR_PURE_INSTRUCTIONS, S_ATTR_SOME_INSTRUCTIONS]\n" - " alignment: 1\n" + " alignment: 2\n" " address: 0x0000\n" " content: [ 0x80, 0xb5, 0x40, 0xf2, 0x06, 0x00, 0x6f, 0x46,\n" " 0xc0, 0xf2, 0x00, 0x00, 0x78, 0x44, 0xff, 0xf7,\n" @@ -660,7 +660,7 @@ TEST(ObjectFileYAML, hello_armv7) { " section: __cstring\n" " type: S_CSTRING_LITERALS\n" " attributes: [ ]\n" - " alignment: 0\n" + " alignment: 1\n" " address: 0x0016\n" " content: [ 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x0a, 0x00 ]\n" "global-symbols:\n"