aboutsummaryrefslogtreecommitdiff
path: root/backend/lib
diff options
context:
space:
mode:
Diffstat (limited to 'backend/lib')
-rw-r--r--backend/lib/CodeGen/TargetRegisterInfo.cpp8
-rw-r--r--backend/lib/MC/ELFObjectWriter.cpp13
-rw-r--r--backend/lib/MC/MCAssembler.cpp11
-rw-r--r--backend/lib/MC/MCSection.cpp7
-rw-r--r--backend/lib/MC/MCStreamer.cpp7
5 files changed, 15 insertions, 31 deletions
diff --git a/backend/lib/CodeGen/TargetRegisterInfo.cpp b/backend/lib/CodeGen/TargetRegisterInfo.cpp
index 7ddf676..b6631eb 100644
--- a/backend/lib/CodeGen/TargetRegisterInfo.cpp
+++ b/backend/lib/CodeGen/TargetRegisterInfo.cpp
@@ -22,10 +22,6 @@ namespace {
"target register description: " + std::move(Message));
}
-[[nodiscard]] bool isPowerOfTwo(std::uint32_t Value) noexcept {
- return Value != 0 && std::has_single_bit(Value);
-}
-
[[nodiscard]] std::string lowerASCII(std::string_view Name) {
std::string Result(Name);
for (char &Character : Result) {
@@ -274,8 +270,8 @@ Expected<TargetRegisterInfo> TargetRegisterInfo::create(TargetRegisterInfoDesc D
for (const RegisterClassDesc &Class : Result.Description.RegisterClasses) {
if (Class.Registers.empty() || Class.SizeInBits == 0 ||
- Class.SpillSizeInBits < Class.SizeInBits || !isPowerOfTwo(Class.SpillAlignmentInBits) ||
- Class.Lanes.empty()) {
+ Class.SpillSizeInBits < Class.SizeInBits ||
+ !std::has_single_bit(Class.SpillAlignmentInBits) || Class.Lanes.empty()) {
return invalidDescription(
"register class requires members, sizes, power-of-two spill alignment, and lanes");
}
diff --git a/backend/lib/MC/ELFObjectWriter.cpp b/backend/lib/MC/ELFObjectWriter.cpp
index 730ef72..96ec234 100644
--- a/backend/lib/MC/ELFObjectWriter.cpp
+++ b/backend/lib/MC/ELFObjectWriter.cpp
@@ -3,6 +3,7 @@
#include "rcc/MC/ELFObjectWriter.h"
#include <algorithm>
+#include <bit>
#include <cstddef>
#include <cstdint>
#include <limits>
@@ -98,10 +99,6 @@ struct OutputSection final {
MCSymbolRef GroupSignature;
};
-[[nodiscard]] bool isPowerOfTwo(std::uint64_t Value) noexcept {
- return Value != 0 && (Value & (Value - 1U)) == 0;
-}
-
[[nodiscard]] bool isWriterManagedSectionType(std::uint32_t Type) noexcept {
switch (Type) {
case SHTNull:
@@ -127,7 +124,7 @@ struct OutputSection final {
}
[[nodiscard]] Expected<std::uint64_t> alignTo(std::uint64_t Value, std::uint64_t Alignment) {
- if (!isPowerOfTwo(Alignment))
+ if (!std::has_single_bit(Alignment))
return makeUnexpected(ErrorCode::ObjectWritingFailed, "ELF alignment is not a power of two");
auto Adjusted = checkedAdd(Value, Alignment - 1U, "ELF file offset overflows");
if (!Adjusted)
@@ -290,7 +287,7 @@ ELF64LEObjectWriter::writeObject(const MCAssembledObject &Object) const {
return std::unexpected(DescriptionVerification.error());
const bool NoBits =
Description.Kind == MCSectionKind::BSS || Description.Kind == MCSectionKind::TLSBSS;
- if (!isPowerOfTwo(Input.Alignment) || Input.Alignment < Description.Alignment) {
+ if (!std::has_single_bit(Input.Alignment) || Input.Alignment < Description.Alignment) {
return makeUnexpected(ErrorCode::ObjectWritingFailed,
"ELF input section has an invalid effective alignment");
}
@@ -324,7 +321,7 @@ ELF64LEObjectWriter::writeObject(const MCAssembledObject &Object) const {
for (const ELFExtraSection &Extra : Target.ExtraSections) {
if (Extra.Name.empty() || isWriterManagedSectionType(Extra.Type) ||
- !isPowerOfTwo(Extra.Alignment) || (Extra.Flags & (SHFInfoLink | SHFGroup)) != 0 ||
+ !std::has_single_bit(Extra.Alignment) || (Extra.Flags & (SHFInfoLink | SHFGroup)) != 0 ||
(Extra.EntrySize != 0 && Extra.Contents.size() % Extra.EntrySize != 0)) {
return makeUnexpected(ErrorCode::ObjectWritingFailed,
"ELF extra section has an invalid description");
@@ -365,7 +362,7 @@ ELF64LEObjectWriter::writeObject(const MCAssembledObject &Object) const {
std::uint16_t Section = SHNUndefined;
std::uint64_t Value = Input.Value;
if (Input.CommonAlignment != 0) {
- if (!isPowerOfTwo(Input.CommonAlignment) || Input.Size == 0 || Input.SectionIndex ||
+ if (!std::has_single_bit(Input.CommonAlignment) || Input.Size == 0 || Input.SectionIndex ||
Input.Binding == MCObjectSymbolBinding::Local || Input.Value != Input.CommonAlignment) {
return makeUnexpected(ErrorCode::ObjectWritingFailed,
"ELF common symbol has an invalid definition");
diff --git a/backend/lib/MC/MCAssembler.cpp b/backend/lib/MC/MCAssembler.cpp
index 0f92edb..e1eb8e0 100644
--- a/backend/lib/MC/MCAssembler.cpp
+++ b/backend/lib/MC/MCAssembler.cpp
@@ -3,6 +3,7 @@
#include "rcc/MC/MCAssembler.h"
#include <algorithm>
+#include <bit>
#include <cstddef>
#include <cstdint>
#include <limits>
@@ -12,10 +13,6 @@
namespace rcc::mc {
namespace {
-[[nodiscard]] bool isPowerOfTwo(std::uint64_t Value) noexcept {
- return Value != 0 && (Value & (Value - 1U)) == 0;
-}
-
[[nodiscard]] Expected<std::uint64_t> checkedAdd(std::uint64_t Left, std::uint64_t Right,
std::string_view Message) {
std::uint64_t Result = 0;
@@ -48,7 +45,7 @@ namespace {
[[nodiscard]] Expected<std::uint64_t> alignmentPadding(std::uint64_t Offset,
std::uint64_t Alignment) {
- if (!isPowerOfTwo(Alignment))
+ if (!std::has_single_bit(Alignment))
return makeUnexpected(ErrorCode::InvalidArgument, "MC alignment is not a power of two");
const std::uint64_t Mask = Alignment - 1U;
auto Adjusted = checkedAdd(Offset, Mask, "MC section alignment overflows");
@@ -230,7 +227,7 @@ Expected<void> MCAssembler::emitAlignment(std::uint64_t Alignment, std::uint8_t
auto SectionIndex = currentSectionIndex();
if (!SectionIndex)
return std::unexpected(SectionIndex.error());
- if (!isPowerOfTwo(Alignment))
+ if (!std::has_single_bit(Alignment))
return makeUnexpected(ErrorCode::InvalidArgument, "MC alignment is not a power of two");
Sections[*SectionIndex].Fragments.push_back(Fragment{
.Payload =
@@ -296,7 +293,7 @@ Expected<void> MCAssembler::emitCommonSymbol(MCSymbolRef Symbol, std::uint64_t S
std::uint64_t Alignment) {
if (WasAssembled)
return makeUnexpected(ErrorCode::ObjectWritingFailed, "MC assembler is already finalized");
- if (!Symbol || Size == 0 || !isPowerOfTwo(Alignment)) {
+ if (!Symbol || Size == 0 || !std::has_single_bit(Alignment)) {
return makeUnexpected(ErrorCode::InvalidArgument,
"common symbol requires a size and power-of-two alignment");
}
diff --git a/backend/lib/MC/MCSection.cpp b/backend/lib/MC/MCSection.cpp
index 21ba410..464dcc6 100644
--- a/backend/lib/MC/MCSection.cpp
+++ b/backend/lib/MC/MCSection.cpp
@@ -2,6 +2,7 @@
#include "rcc/MC/MCSection.h"
+#include <bit>
#include <cstdint>
#include <string_view>
@@ -19,16 +20,12 @@ namespace {
return true;
}
-[[nodiscard]] bool isPowerOfTwo(std::uint64_t Value) noexcept {
- return Value != 0 && (Value & (Value - 1U)) == 0;
-}
-
} // namespace
Expected<void> MCSectionDesc::verify() const {
if (!isValidAssemblyName(Name))
return makeUnexpected(ErrorCode::InvalidArgument, "MC section has an invalid name");
- if (!isPowerOfTwo(Alignment)) {
+ if (!std::has_single_bit(Alignment)) {
return makeUnexpected(ErrorCode::InvalidArgument,
"MC section alignment must be a nonzero power of two");
}
diff --git a/backend/lib/MC/MCStreamer.cpp b/backend/lib/MC/MCStreamer.cpp
index 56c3f96..709dccc 100644
--- a/backend/lib/MC/MCStreamer.cpp
+++ b/backend/lib/MC/MCStreamer.cpp
@@ -4,6 +4,7 @@
#include <algorithm>
#include <array>
+#include <bit>
#include <cctype>
#include <cstddef>
#include <cstdint>
@@ -23,10 +24,6 @@ namespace {
Text.find('\r') != std::string_view::npos;
}
-[[nodiscard]] bool isPowerOfTwo(std::uint64_t Value) noexcept {
- return Value != 0 && (Value & (Value - 1U)) == 0;
-}
-
[[nodiscard]] unsigned log2Exact(std::uint64_t Value) noexcept {
unsigned Result = 0;
while (Value > 1) {
@@ -282,7 +279,7 @@ Expected<void> AsmTextStreamer::emitAlignment(std::uint64_t Alignment, std::uint
auto Active = requireActiveSection();
if (!Active)
return std::unexpected(Active.error());
- if (!isPowerOfTwo(Alignment)) {
+ if (!std::has_single_bit(Alignment)) {
return makeUnexpected(ErrorCode::InvalidArgument,
"assembly alignment must be a nonzero power of two");
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-10-29 09:13:17 +0000