OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: add pointer utils, use to constrain fs pointers

Browse Source
This commit is contained in:
Michael Scire
2022-03-24 16:21:03 -07:00
parent 141ae5c7ab
commit dfa475a769
8 changed files with 75 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/libstratosphere/include/stratosphere/fs/fs_filesystem.hpp
View File

@@ -20,7 +20,7 @@ namespace ams::fs {
namespace fsa {
class IFile;
class IFileSystem;
}

3
libraries/libstratosphere/include/stratosphere/fs/fs_istorage.hpp
View File

@@ -110,4 +110,7 @@ namespace ams::fs {
}
};
template<typename T>
concept PointerToStorage = ::ams::util::RawOrSmartPointerTo<T, ::ams::fs::IStorage>;
}

3
libraries/libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp
View File

@@ -181,4 +181,7 @@ namespace ams::fs::fsa {
}
};
template<typename T>
concept PointerToFileSystem = ::ams::util::RawOrSmartPointerTo<T, ::ams::fs::fsa::IFileSystem>;
}

2
libraries/libstratosphere/include/stratosphere/fssystem/fssystem_aes_ctr_storage.hpp
View File

@@ -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);

2
libraries/libstratosphere/include/stratosphere/fssystem/fssystem_aes_xts_storage.hpp
View File

@@ -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);

6
libraries/libstratosphere/include/stratosphere/fssystem/fssystem_alignment_matching_storage.hpp
View File

@@ -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));
}