util: add pointer utils, use to constrain fs pointers

This commit is contained in:
Michael Scire committed 2022-03-24 16:21:03 -07:00
1 parent 141ae5c7ab
commit dfa475a769
8 files changed
+75 -6

No files matched your search

@@ -21,7 +21,7 @@
namespace ams::fssystem {
/* ACCURATE_TO_VERSION: Unknown */
template<typename BasePointer>
template<fs::PointerToStorage BasePointer>
class AesCtrStorage : public ::ams::fs::IStorage, public ::ams::fs::impl::Newable {
NON_COPYABLE(AesCtrStorage);
NON_MOVEABLE(AesCtrStorage);
@@ -22,7 +22,7 @@
namespace ams::fssystem {
/* ACCURATE_TO_VERSION: Unknown */
template<typename BasePointer>
template<fs::PointerToStorage BasePointer>
class AesXtsStorage : public ::ams::fs::IStorage, public ::ams::fs::impl::Newable {
NON_COPYABLE(AesXtsStorage);
NON_MOVEABLE(AesXtsStorage);
@@ -133,7 +133,7 @@ namespace ams::fssystem {
};
/* ACCURATE_TO_VERSION: Unknown */
template<typename BaseStorageType, size_t _BufferAlign>
template<fs::PointerToStorage BasePointer, size_t _BufferAlign>
class AlignmentMatchingStoragePooledBuffer : public ::ams::fs::IStorage, public ::ams::fs::impl::Newable {
NON_COPYABLE(AlignmentMatchingStoragePooledBuffer);
NON_MOVEABLE(AlignmentMatchingStoragePooledBuffer);
@@ -142,12 +142,12 @@ namespace ams::fssystem {
static_assert(util::IsPowerOfTwo(BufferAlign));
private:
BaseStorageType m_base_storage;
BasePointer m_base_storage;
s64 m_base_storage_size;
size_t m_data_align;
bool m_is_base_storage_size_dirty;
public:
explicit AlignmentMatchingStoragePooledBuffer(BaseStorageType bs, size_t da) : m_base_storage(std::move(bs)), m_data_align(da), m_is_base_storage_size_dirty(true) {
explicit AlignmentMatchingStoragePooledBuffer(BasePointer bs, size_t da) : m_base_storage(std::move(bs)), m_data_align(da), m_is_base_storage_size_dirty(true) {
AMS_ASSERT(util::IsPowerOfTwo(da));
}