Remove implicit constructor and operator int from PowerOf2.
This patch is to make instantiation and conversion to an integer explicit,
so that we can mechanically replace all occurrences of the class with
integer in the next step.
Now get() returns an alignment value rather than its log2 value.
llvm-svn: 233242
diff --git a/lld/lib/ReaderWriter/MachO/File.h b/lld/lib/ReaderWriter/MachO/File.h
index 913644e..4fa1565 100644
--- a/lld/lib/ReaderWriter/MachO/File.h
+++ b/lld/lib/ReaderWriter/MachO/File.h
@@ -44,7 +44,7 @@
}
DefinedAtom::Alignment align(
inSection->alignment,
- sectionOffset % ((uint64_t)1 << inSection->alignment));
+ sectionOffset % inSection->alignment.get());
MachODefinedAtom *atom =
new (allocator()) MachODefinedAtom(*this, name, scope, type, merge,
thumb, noDeadStrip, content, align);
@@ -67,7 +67,7 @@
}
DefinedAtom::Alignment align(
inSection->alignment,
- sectionOffset % ((uint64_t)1 << inSection->alignment));
+ sectionOffset % inSection->alignment.get());
MachODefinedCustomSectionAtom *atom =
new (allocator()) MachODefinedCustomSectionAtom(*this, name, scope, type,
merge, thumb,
@@ -86,7 +86,7 @@
}
DefinedAtom::Alignment align(
inSection->alignment,
- sectionOffset % ((uint64_t)1 << inSection->alignment));
+ sectionOffset % inSection->alignment.get());
MachODefinedAtom *atom =
new (allocator()) MachODefinedAtom(*this, name, scope, size, noDeadStrip,
align);
diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index 1ae5be4..0940e31 100644
--- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -732,10 +732,7 @@
void MachOLinkingContext::addSectionAlignment(StringRef seg, StringRef sect,
PowerOf2 align2) {
- SectionAlign entry;
- entry.segmentName = seg;
- entry.sectionName = sect;
- entry.align2 = align2;
+ SectionAlign entry = { seg, sect, align2 };
_sectAligns.push_back(entry);
}
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
index 70bcde2..c1db36c 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
@@ -114,7 +114,7 @@
StringRef sectionName;
SectionType type;
SectionAttr attributes;
- uint32_t alignment;
+ PowerOf2 alignment;
Hex64 address;
ArrayRef<uint8_t> content;
Relocations relocations;
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
index 07a6dbf..5b3d942 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
@@ -297,7 +297,7 @@
section.type = (SectionType)(read32(§->flags, isBig) &
SECTION_TYPE);
section.attributes = read32(§->flags, isBig) & SECTION_ATTRIBUTES;
- section.alignment = read32(§->align, isBig);
+ section.alignment = PowerOf2(read32(§->align, isBig));
section.address = read64(§->addr, isBig);
const uint8_t *content =
(const uint8_t *)start + read32(§->offset, isBig);
@@ -341,7 +341,7 @@
SECTION_TYPE);
section.attributes =
read32((const uint8_t *)§->flags, isBig) & SECTION_ATTRIBUTES;
- section.alignment = read32(§->align, isBig);
+ section.alignment = PowerOf2(read32(§->align, isBig));
section.address = read32(§->addr, isBig);
const uint8_t *content =
(const uint8_t *)start + read32(§->offset, isBig);
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index be7acf9..0f8bba4 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -291,7 +291,7 @@
uint64_t offset = _startOfSectionsContent;
for (const Section § : file.sections) {
if (sect.type != llvm::MachO::S_ZEROFILL) {
- offset = llvm::RoundUpToAlignment(offset, 1 << sect.alignment);
+ offset = llvm::RoundUpToAlignment(offset, sect.alignment.get());
_sectInfo[§].fileOffset = offset;
offset += sect.content.size();
} else {
@@ -613,7 +613,7 @@
sout->addr = sin.address;
sout->size = sin.content.size();
sout->offset = _sectInfo[&sin].fileOffset;
- sout->align = sin.alignment;
+ sout->align = llvm::Log2_32(sin.alignment.get());
sout->reloff = sin.relocations.empty() ? 0 : relOffset;
sout->nreloc = sin.relocations.size();
sout->flags = sin.type | sin.attributes;
@@ -661,7 +661,7 @@
sect->offset = 0;
else
sect->offset = section->address - seg.address + segInfo.fileOffset;
- sect->align = section->alignment;
+ sect->align = llvm::Log2_32(section->alignment.get());
sect->reloff = 0;
sect->nreloc = 0;
sect->flags = section->type | section->attributes;
@@ -1343,4 +1343,3 @@
} // namespace normalized
} // namespace mach_o
} // namespace lld
-
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
index eda1172..3f8a944 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
@@ -328,7 +328,7 @@
// Figure out offset for atom in this section given alignment constraints.
uint64_t offset = sect->size;
DefinedAtom::Alignment atomAlign = atom->alignment();
- uint64_t align2 = 1 << atomAlign.powerOf2;
+ uint64_t align2 = atomAlign.powerOf2.get();
uint64_t requiredModulus = atomAlign.modulus;
uint64_t currentModulus = (offset % align2);
if ( currentModulus != requiredModulus ) {
@@ -338,7 +338,7 @@
offset += align2+requiredModulus-currentModulus;
}
// Record max alignment of any atom in this section.
- if ( atomAlign.powerOf2 > sect->alignment )
+ if (align2 > sect->alignment.get())
sect->alignment = atomAlign.powerOf2;
// Assign atom to this section with this offset.
AtomInfo ai = {atom, offset};
@@ -454,7 +454,7 @@
}
uint64_t Util::alignTo(uint64_t value, PowerOf2 align2) {
- return llvm::RoundUpToAlignment(value, 1 << align2);
+ return llvm::RoundUpToAlignment(value, align2.get());
}
@@ -477,7 +477,7 @@
for (auto it = seg->sections.rbegin(); it != seg->sections.rend(); ++it) {
SectionInfo *sect = *it;
taddr -= sect->size;
- taddr = taddr & (0 - (1 << sect->alignment));
+ taddr = taddr & (0 - sect->alignment.get());
}
int64_t padding = taddr - hlcSize;
while (padding < 0)
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp
index ae14d75..3635c62 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp
@@ -53,6 +53,20 @@
namespace llvm {
namespace yaml {
+template <>
+struct ScalarTraits<lld::PowerOf2> {
+ 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 = lld::PowerOf2(value);
+ return StringRef();
+ }
+ static bool mustQuote(StringRef) { return false; }
+};
+
// A vector of Sections is a sequence.
template<>
struct SequenceTraits< std::vector<Section> > {
@@ -276,7 +290,7 @@
io.mapRequired("section", sect.sectionName);
io.mapRequired("type", sect.type);
io.mapOptional("attributes", sect.attributes);
- io.mapOptional("alignment", sect.alignment, 0U);
+ io.mapOptional("alignment", sect.alignment, lld::PowerOf2(0));
io.mapRequired("address", sect.address);
if (sect.type == llvm::MachO::S_ZEROFILL) {
// S_ZEROFILL sections use "size:" instead of "content:"
@@ -799,4 +813,3 @@
} // namespace normalized
} // namespace mach_o
} // namespace lld
-