diff options
author | Liam <byteslice@airmail.cc> | 2023-08-11 03:49:19 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-08-15 23:47:25 +0200 |
commit | 0398b34370f9a6d739e0101378770c7d592a4806 (patch) | |
tree | 9affd31d1ef4d41ccadb06eff1357ee228805b20 /src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp | |
parent | vfs: expand support for NCA reading (diff) | |
download | yuzu-0398b34370f9a6d739e0101378770c7d592a4806.tar yuzu-0398b34370f9a6d739e0101378770c7d592a4806.tar.gz yuzu-0398b34370f9a6d739e0101378770c7d592a4806.tar.bz2 yuzu-0398b34370f9a6d739e0101378770c7d592a4806.tar.lz yuzu-0398b34370f9a6d739e0101378770c7d592a4806.tar.xz yuzu-0398b34370f9a6d739e0101378770c7d592a4806.tar.zst yuzu-0398b34370f9a6d739e0101378770c7d592a4806.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp index 357fa7741..caea0b8f8 100644 --- a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp +++ b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.cpp @@ -73,31 +73,8 @@ size_t HierarchicalSha256Storage::Read(u8* buffer, size_t size, size_t offset) c // Validate that we have a buffer to read into. ASSERT(buffer != nullptr); - // Validate preconditions. - ASSERT(Common::IsAligned(offset, m_hash_target_block_size)); - ASSERT(Common::IsAligned(size, m_hash_target_block_size)); - // Read the data. - const size_t reduced_size = static_cast<size_t>( - std::min<s64>(m_base_storage_size, - Common::AlignUp(offset + size, m_hash_target_block_size)) - - offset); - m_base_storage->Read(buffer, reduced_size, offset); - - // Setup tracking variables. - auto cur_offset = offset; - auto remaining_size = reduced_size; - while (remaining_size > 0) { - const auto cur_size = - static_cast<size_t>(std::min<s64>(m_hash_target_block_size, remaining_size)); - ASSERT(static_cast<size_t>(cur_offset >> m_log_size_ratio) < m_hash_buffer_size); - - // Advance. - cur_offset += cur_size; - remaining_size -= cur_size; - } - - return size; + return m_base_storage->Read(buffer, size, offset); } } // namespace FileSys |