From 86f6b6b7b2d930e8203114332b04a5c49a780b06 Mon Sep 17 00:00:00 2001
From: Liam
Date: Thu, 10 Aug 2023 21:34:43 -0400
Subject: vfs: expand support for NCA reading

---
 src/common/alignment.h         | 29 +++++++++++++++++++++++++++--
 src/common/lz4_compression.cpp |  6 ++++++
 src/common/lz4_compression.h   |  2 ++
 3 files changed, 35 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common/alignment.h b/src/common/alignment.h
index fa715d497..0057052af 100644
--- a/src/common/alignment.h
+++ b/src/common/alignment.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <bit>
 #include <cstddef>
 #include <new>
 #include <type_traits>
@@ -10,7 +11,7 @@
 namespace Common {
 
 template <typename T>
-    requires std::is_unsigned_v<T>
+    requires std::is_integral_v<T>
 [[nodiscard]] constexpr T AlignUp(T value, size_t size) {
     auto mod{static_cast<T>(value % size)};
     value -= mod;
@@ -24,7 +25,7 @@ template <typename T>
 }
 
 template <typename T>
-    requires std::is_unsigned_v<T>
+    requires std::is_integral_v<T>
 [[nodiscard]] constexpr T AlignDown(T value, size_t size) {
     return static_cast<T>(value - value % size);
 }
@@ -55,6 +56,30 @@ template <typename T, typename U>
     return (x + (y - 1)) / y;
 }
 
+template <typename T>
+    requires std::is_integral_v<T>
+[[nodiscard]] constexpr T LeastSignificantOneBit(T x) {
+    return x & ~(x - 1);
+}
+
+template <typename T>
+    requires std::is_integral_v<T>
+[[nodiscard]] constexpr T ResetLeastSignificantOneBit(T x) {
+    return x & (x - 1);
+}
+
+template <typename T>
+    requires std::is_integral_v<T>
+[[nodiscard]] constexpr bool IsPowerOfTwo(T x) {
+    return x > 0 && ResetLeastSignificantOneBit(x) == 0;
+}
+
+template <typename T>
+    requires std::is_integral_v<T>
+[[nodiscard]] constexpr T FloorPowerOfTwo(T x) {
+    return T{1} << (sizeof(T) * 8 - std::countl_zero(x) - 1);
+}
+
 template <typename T, size_t Align = 16>
 class AlignmentAllocator {
 public:
diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp
index ffb32fecf..6867c03c4 100644
--- a/src/common/lz4_compression.cpp
+++ b/src/common/lz4_compression.cpp
@@ -71,4 +71,10 @@ std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed, std::size_t un
     return uncompressed;
 }
 
+int DecompressLZ4(void* dst, size_t dst_size, const void* src, size_t src_size) {
+    // This is just a thin wrapper around LZ4.
+    return LZ4_decompress_safe(reinterpret_cast<const char*>(src), reinterpret_cast<char*>(dst),
+                               static_cast<int>(src_size), static_cast<int>(dst_size));
+}
+
 } // namespace Common::Compression
diff --git a/src/common/lz4_compression.h b/src/common/lz4_compression.h
index 7fd53a960..7200e0f22 100644
--- a/src/common/lz4_compression.h
+++ b/src/common/lz4_compression.h
@@ -56,4 +56,6 @@ namespace Common::Compression {
 [[nodiscard]] std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed,
                                                 std::size_t uncompressed_size);
 
+int DecompressLZ4(void* dst, size_t dst_size, const void* src, size_t src_size);
+
 } // namespace Common::Compression
-- 
cgit v1.2.3


From 50eee9b2185c59c32fb82cf464230a058edd10ea Mon Sep 17 00:00:00 2001
From: Liam
Date: Sat, 12 Aug 2023 15:18:55 -0400
Subject: fssystem: rework for yuzu style

---
 src/common/alignment.h         | 8 ++++++--
 src/common/lz4_compression.cpp | 2 +-
 src/common/lz4_compression.h   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/common')

diff --git a/src/common/alignment.h b/src/common/alignment.h
index 0057052af..fc5c26898 100644
--- a/src/common/alignment.h
+++ b/src/common/alignment.h
@@ -12,7 +12,9 @@ namespace Common {
 
 template <typename T>
     requires std::is_integral_v<T>
-[[nodiscard]] constexpr T AlignUp(T value, size_t size) {
+[[nodiscard]] constexpr T AlignUp(T value_, size_t size) {
+    using U = typename std::make_unsigned_t<T>;
+    auto value{static_cast<U>(value_)};
     auto mod{static_cast<T>(value % size)};
     value -= mod;
     return static_cast<T>(mod == T{0} ? value : value + size);
@@ -26,7 +28,9 @@ template <typename T>
 
 template <typename T>
     requires std::is_integral_v<T>
-[[nodiscard]] constexpr T AlignDown(T value, size_t size) {
+[[nodiscard]] constexpr T AlignDown(T value_, size_t size) {
+    using U = typename std::make_unsigned_t<T>;
+    const auto value{static_cast<U>(value_)};
     return static_cast<T>(value - value % size);
 }
 
diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp
index 6867c03c4..d85ab1742 100644
--- a/src/common/lz4_compression.cpp
+++ b/src/common/lz4_compression.cpp
@@ -71,7 +71,7 @@ std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed, std::size_t un
     return uncompressed;
 }
 
-int DecompressLZ4(void* dst, size_t dst_size, const void* src, size_t src_size) {
+int DecompressDataLZ4(void* dst, size_t dst_size, const void* src, size_t src_size) {
     // This is just a thin wrapper around LZ4.
     return LZ4_decompress_safe(reinterpret_cast<const char*>(src), reinterpret_cast<char*>(dst),
                                static_cast<int>(src_size), static_cast<int>(dst_size));
diff --git a/src/common/lz4_compression.h b/src/common/lz4_compression.h
index 7200e0f22..3ae17c2bb 100644
--- a/src/common/lz4_compression.h
+++ b/src/common/lz4_compression.h
@@ -56,6 +56,6 @@ namespace Common::Compression {
 [[nodiscard]] std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed,
                                                 std::size_t uncompressed_size);
 
-int DecompressLZ4(void* dst, size_t dst_size, const void* src, size_t src_size);
+[[nodiscard]] int DecompressDataLZ4(void* dst, size_t dst_size, const void* src, size_t src_size);
 
 } // namespace Common::Compression
-- 
cgit v1.2.3