caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lld-macho][nfc] Convert more alignTo() to alignToPowerOf2()

Browse Source 
Reviewed By: #lld-macho, smeenai

Differential Revision: https://reviews.llvm.org/D145261
This commit is contained in:
Jez Ng
2023-03-03 10:22:40 -08:00
parent 9ca2fb8217
commit dd4a9c463b
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lld/MachO/ConcatOutputSection.cpp
View File

@@ -126,7 +126,7 @@ bool TextOutputSection::needsThunks() const {
return false;
uint64_t isecAddr = addr;
for (ConcatInputSection *isec : inputs)
isecAddr = alignTo(isecAddr, isec->align) + isec->getSize();
isecAddr = alignToPowerOf2(isecAddr, isec->align) + isec->getSize();
if (isecAddr - addr + in.stubs->getSize() <=
std::min(target->backwardBranchRange, target->forwardBranchRange))
return false;
@@ -172,7 +172,7 @@ uint64_t TextOutputSection::estimateStubsInRangeVA(size_t callIdx) const {
uint64_t isecEnd = isecVA;
for (size_t i = callIdx; i < inputs.size(); i++) {
InputSection *isec = inputs[i];
isecEnd = alignTo(isecEnd, isec->align) + isec->getSize();
isecEnd = alignToPowerOf2(isecEnd, isec->align) + isec->getSize();
}
// Estimate the address after which call sites can safely call stubs
// directly rather than through intermediary thunks.
@@ -194,8 +194,8 @@ uint64_t TextOutputSection::estimateStubsInRangeVA(size_t callIdx) const {
}
void ConcatOutputSection::finalizeOne(ConcatInputSection *isec) {
size = alignTo(size, isec->align);
fileSize = alignTo(fileSize, isec->align);
size = alignToPowerOf2(size, isec->align);
fileSize = alignToPowerOf2(fileSize, isec->align);
isec->outSecOff = size;
isec->isFinal = true;
size += isec->getSize();
@@ -248,8 +248,9 @@ void TextOutputSection::finalize() {
// grows. So leave room for a bunch of thunks.
unsigned slop = 256 * thunkSize;
while (finalIdx < endIdx) {
uint64_t expectedNewSize = alignTo(addr + size, inputs[finalIdx]->align) +
inputs[finalIdx]->getSize();
uint64_t expectedNewSize =
alignToPowerOf2(addr + size, inputs[finalIdx]->align) +
inputs[finalIdx]->getSize();
if (expectedNewSize >= isecVA + forwardBranchRange - slop)
break;
finalizeOne(inputs[finalIdx++]);

7
lld/MachO/SyntheticSections.cpp
View File

@@ -95,7 +95,7 @@ uint64_t MachHeaderSection::getSize() const {
// If we are emitting an encryptable binary, our load commands must have a
// separate (non-encrypted) page to themselves.
if (config->emitEncryptionInfo)
size = alignTo(size, target->getPageSize());
size = alignToPowerOf2(size, target->getPageSize());
return size;
}
@@ -1642,7 +1642,7 @@ void CStringSection::finalizeContents() {
// handled.
uint32_t pieceAlign = 1
<< llvm::countr_zero(isec->align | piece.inSecOff);
offset = alignTo(offset, pieceAlign);
offset = alignToPowerOf2(offset, pieceAlign);
piece.outSecOff = offset;
isec->isFinal = true;
StringRef string = isec->getStringRef(i);
@@ -1717,7 +1717,8 @@ void DeduplicatedCStringSection::finalizeContents() {
assert(it != stringOffsetMap.end());
StringOffset &offsetInfo = it->second;
if (offsetInfo.outSecOff == UINT64_MAX) {
offsetInfo.outSecOff = alignTo(size, 1ULL << offsetInfo.trailingZeros);
offsetInfo.outSecOff =
alignToPowerOf2(size, 1ULL << offsetInfo.trailingZeros);
size =
offsetInfo.outSecOff + s.size() + 1; // account for null terminator
}

11
lld/MachO/Writer.cpp
View File

@@ -1077,9 +1077,10 @@ void Writer::finalizeAddresses() {
seg->addr = addr;
assignAddresses(seg);
// codesign / libstuff checks for segment ordering by verifying that
// `fileOff + fileSize == next segment fileOff`. So we call alignTo() before
// (instead of after) computing fileSize to ensure that the segments are
// contiguous. We handle addr / vmSize similarly for the same reason.
// `fileOff + fileSize == next segment fileOff`. So we call
// alignToPowerOf2() before (instead of after) computing fileSize to ensure
// that the segments are contiguous. We handle addr / vmSize similarly for
// the same reason.
fileOff = alignToPowerOf2(fileOff, pageSize);
addr = alignToPowerOf2(addr, pageSize);
seg->vmSize = addr - seg->addr;
@@ -1122,8 +1123,8 @@ void Writer::assignAddresses(OutputSegment *seg) {
for (OutputSection *osec : seg->getSections()) {
if (!osec->isNeeded())
continue;
addr = alignTo(addr, osec->align);
fileOff = alignTo(fileOff, osec->align);
addr = alignToPowerOf2(addr, osec->align);
fileOff = alignToPowerOf2(fileOff, osec->align);
osec->addr = addr;
osec->fileOff = isZeroFill(osec->flags) ? 0 : fileOff;
osec->finalize();