project Many small misc changes

Author: suhas-pai

CMakeLists.txt

@@ -28,7 +28,7 @@ target_compile_options(ktool PUBLIC
     -Wstrict-overflow=5 -Wundef -Wnull-dereference -funsigned-char
     -fno-exceptions -Wcast-align -Wfloat-equal -Wredundant-decls
     -Wstrict-overflow=5 -Wundef -Wnull-dereference -funsigned-char -Wformat=2
-    -DBUILD_KERNEL -Wno-address-of-packed-member)
+    -DBUILD_KERNEL -Wno-address-of-packed-member -Wthread-safety)
 
 target_link_options(ktool PUBLIC -stdlib=libc++)
 target_link_options(ktool PUBLIC -fuse-ld=lld)
@@ -45,7 +45,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
                         "-fsanitize=address" "-fsanitize=undefined")
 elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
     set_target_properties(ktool PROPERTIES OUTPUT_NAME "ktool_release")
-    target_compile_options(ktool PRIVATE "-O3" "-Wno-unused-parameter" "-Wno-gnu-statement-expression-from-macro-expansion")
+    target_compile_options(ktool PRIVATE "-O3" "-Wno-unused-parameter"
+                           "-Wno-gnu-statement-expression-from-macro-expansion")
     target_link_options(ktool PRIVATE "-O3")
 endif()
 

include/ADT/Range.h

@@ -49,9 +49,14 @@ namespace ADT {
         }
 
         [[nodiscard]] constexpr static
-        auto FromEnd(const uint64_t Begin, const uint64_t End) noexcept {
-            assert(Begin <= End);
-            return Range::FromSize(Begin, (End - Begin));
+        auto FromEnd(const uint64_t Begin, const uint64_t End) noexcept
+            -> std::optional<Range>
+        {
+            if (Begin <= End) {
+                return Range::FromSize(Begin, (End - Begin));
+            }
+
+            return std::nullopt;
         }
 
         [[nodiscard]] constexpr auto front() const noexcept {

include/MachO/ExportTrie.h

@@ -540,9 +540,8 @@ namespace MachO {
             return this->Kind;
         }
 
-        [[nodiscard]]
-        constexpr auto string() const noexcept -> std::string_view {
-            return this->String;
+        [[nodiscard]] constexpr auto string() const noexcept {
+            return std::string_view(this->String);
         }
 
         constexpr auto setKind(const ExportTrieExportKind Kind) noexcept

include/Objects/DscImage.h

@@ -62,6 +62,7 @@ namespace Objects {
 
             constexpr Error(const OpenError Kind) noexcept : Kind(Kind) {}
 
+            [[nodiscard]]
             static inline auto invalidAddress(const uint64_t Address) noexcept {
                 auto Result = Error(OpenError::InvalidAddress);
                 Result.InvalidAddress.Address = Address;

include/Utils/Print.h

@@ -104,7 +104,8 @@ namespace Utils {
         : Begin(Begin), Size(Size) {}
 
         explicit PrintRange(const ADT::Range Range) noexcept
-        : Begin(Range.front()), Size(Range.size()) {}
+        : Begin(static_cast<T>(Range.front())),
+          Size(static_cast<U>(Range.size())) {}
 
         [[nodiscard]] constexpr auto front() const noexcept {
             return this->Begin;
@@ -140,17 +141,6 @@ namespace Utils {
         bool Value;
     };
 
-    auto
-    PrintOffsetSizeInfo(FILE *OutFile,
-                        const ADT::Range Range,
-                        bool Is64Bit,
-                        bool IsSize64Bit,
-                        bool IsOutOfBounds,
-                        std::string_view OffsetKey,
-                        std::string_view SizeKey,
-                        std::string_view Prefix = "",
-                        std::string_view Suffix = "") noexcept -> int;
-
     auto
     PrintDylibOrdinalPath(FILE *OutFile,
                           uint8_t DylibOrdinal,

src/ADT/Trie.cpp

@@ -38,7 +38,12 @@ namespace ADT {
             return Error::InvalidFormat;
         }
 
-        const auto Range = ADT::Range::FromEnd(Offset, OffsetEndOpt.value());
+        const auto RangeOpt = ADT::Range::FromEnd(Offset, OffsetEndOpt.value());
+        if (!RangeOpt.has_value()) {
+            return Error::InvalidFormat;
+        }
+
+        const auto Range = RangeOpt.value();
         const auto Predicate = [Range](const ADT::Range RhsRange) noexcept {
             return Range.overlaps(RhsRange);
         };

src/MachO/SegmentList.cpp

@@ -129,11 +129,11 @@ namespace MachO {
         for (const auto &SegInfo : this->List | std::views::filter(Filter)) {
             const uint64_t VmIndex = SegInfo.VmRange.indexForLoc(VmAddr);
             if (!SegInfo.FileRange.hasIndex(VmIndex)) {
-                return std::nullopt;
+                continue;
             }
 
             if (!SegInfo.FileRange.hasEndIndex(VmIndex + Size)) {
-                return std::nullopt;
+                continue;
             }
 
             return SegInfo.FileRange.locForIndex(VmIndex);

src/Objects/DscImage.cpp

@@ -111,7 +111,7 @@ namespace Objects {
 
         auto FileSize = uint64_t();
         if (Header->is64Bit()) {
-            for (const auto &Segment :
+            for (const auto Segment :
                     LoadCommandsMap |
                     ::MachO::LCMapFilterType<
                         ::MachO::SegmentCommand64>(IsBigEndian))
@@ -140,7 +140,7 @@ namespace Objects {
                 FileSize = NewFileSize.value();
             }
         } else {
-            for (const auto &Segment :
+            for (const auto Segment :
                     LoadCommandsMap |
                     ::MachO::LCMapFilterType<
                         ::MachO::SegmentCommand>(IsBigEndian))

src/Objects/MachO.cpp

@@ -122,6 +122,6 @@ namespace Objects {
                 });
         }
 
-        return ADT::Range::FromEnd(Base, End);
+        return ADT::Range::FromEnd(Base, End).value();
     }
 }

src/Operations/PrintBindOpcodeList.cpp

@@ -45,11 +45,11 @@ namespace Operations {
         if (!Flags.empty()) {
             std::println(OutFile, "");
             if (Flags.hasNonWeakDefinition()) {
-                std::println(OutFile, "\t\tHas Non-Weak Definition");
+                std::println(OutFile, "\t\t" "Has Non-Weak Definition");
             }
 
             if (Flags.isWeakImport()) {
-                std::println(OutFile, "\t\tWeak-Import");
+                std::println(OutFile, "\t\t" "Weak-Import");
             }
         } else {
             std::println(OutFile, " None");