Compare commits
7 commits
94932270a5
...
8f06e954cd
Author | SHA1 | Date | |
---|---|---|---|
8f06e954cd | |||
1e69a91193 | |||
c1b83a6ee3 | |||
e30d68e160 | |||
61a2a5b814 | |||
9aa9ce5c36 | |||
8b74365f2a |
7 changed files with 46 additions and 16 deletions
|
@ -598,17 +598,12 @@ public:
|
|||
|
||||
bool ClearBackingRegion(size_t physical_offset, size_t length) {
|
||||
#ifdef __linux__
|
||||
// Only incur syscall cost IF memset would be slower (theshold = 16MiB)
|
||||
// TODO(lizzie): Smarter way to dynamically get this threshold (broadwell != raptor lake) for example
|
||||
if (length >= 2097152UL * 8) {
|
||||
// Set MADV_REMOVE on backing map to destroy it instantly.
|
||||
// This also deletes the area from the backing file.
|
||||
int ret = madvise(backing_base + physical_offset, length, MADV_REMOVE);
|
||||
ASSERT_MSG(ret == 0, "madvise failed: {}", strerror(errno));
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
// Set MADV_REMOVE on backing map to destroy it instantly.
|
||||
// This also deletes the area from the backing file.
|
||||
int ret = madvise(backing_base + physical_offset, length, MADV_REMOVE);
|
||||
ASSERT_MSG(ret == 0, "madvise failed: {}", strerror(errno));
|
||||
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
|
|
|
@ -107,6 +107,7 @@ add_library(core STATIC
|
|||
file_sys/fssystem/fssystem_nca_header.cpp
|
||||
file_sys/fssystem/fssystem_nca_header.h
|
||||
file_sys/fssystem/fssystem_nca_reader.cpp
|
||||
file_sys/fssystem/fssystem_passthrough_storage.h
|
||||
file_sys/fssystem/fssystem_pooled_buffer.cpp
|
||||
file_sys/fssystem/fssystem_pooled_buffer.h
|
||||
file_sys/fssystem/fssystem_sparse_storage.cpp
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "common/settings.h"
|
||||
#include "core/file_sys/errors.h"
|
||||
#include "core/file_sys/fssystem/fssystem_bucket_tree.h"
|
||||
#include "core/file_sys/fssystem/fssystem_bucket_tree_utils.h"
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "common/settings.h"
|
||||
#include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_aes_ctr_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_aes_xts_storage.h"
|
||||
|
@ -13,6 +14,7 @@
|
|||
#include "core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_indirect_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_integrity_romfs_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_passthrough_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_memory_resource_buffer_hold_storage.h"
|
||||
#include "core/file_sys/fssystem/fssystem_nca_file_system_driver.h"
|
||||
#include "core/file_sys/fssystem/fssystem_sparse_storage.h"
|
||||
|
|
|
@ -13,11 +13,13 @@ u8 NcaHeader::GetProperKeyGeneration() const {
|
|||
}
|
||||
|
||||
bool NcaPatchInfo::HasIndirectTable() const {
|
||||
return this->indirect_size != 0;
|
||||
static constexpr unsigned char BKTR[4] = {'B', 'K', 'T', 'R'};
|
||||
return std::memcmp(indirect_header.data(), BKTR, sizeof(BKTR)) == 0;
|
||||
}
|
||||
|
||||
bool NcaPatchInfo::HasAesCtrExTable() const {
|
||||
return this->aes_ctr_ex_size != 0;
|
||||
static constexpr unsigned char BKTR[4] = {'B', 'K', 'T', 'R'};
|
||||
return std::memcmp(aes_ctr_ex_header.data(), BKTR, sizeof(BKTR)) == 0;
|
||||
}
|
||||
|
||||
} // namespace FileSys
|
||||
|
|
32
src/core/file_sys/fssystem/fssystem_passthrough_storage.h
Normal file
32
src/core/file_sys/fssystem/fssystem_passthrough_storage.h
Normal file
|
@ -0,0 +1,32 @@
|
|||
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
#pragma once
|
||||
#include "core/file_sys/fssystem/fs_i_storage.h"
|
||||
#include "core/file_sys/vfs/vfs.h"
|
||||
|
||||
namespace FileSys {
|
||||
|
||||
//TODO: No integrity verification.
|
||||
class PassthroughStorage final : public IReadOnlyStorage {
|
||||
YUZU_NON_COPYABLE(PassthroughStorage);
|
||||
YUZU_NON_MOVEABLE(PassthroughStorage);
|
||||
|
||||
public:
|
||||
explicit PassthroughStorage(VirtualFile base) : base_(std::move(base)) {}
|
||||
~PassthroughStorage() override = default;
|
||||
|
||||
size_t Read(u8* buffer, size_t size, size_t offset) const override {
|
||||
if (!base_ || size == 0)
|
||||
return 0;
|
||||
return base_->Read(buffer, size, offset);
|
||||
}
|
||||
size_t GetSize() const override {
|
||||
return base_ ? base_->GetSize() : 0;
|
||||
}
|
||||
|
||||
private:
|
||||
VirtualFile base_{};
|
||||
};
|
||||
|
||||
} // namespace FileSys
|
|
@ -49,9 +49,6 @@ namespace Vulkan {
|
|||
}
|
||||
|
||||
[[nodiscard]] VkMemoryPropertyFlags MemoryUsagePreferredVmaFlags(MemoryUsage usage) {
|
||||
if (usage == MemoryUsage::Download) {
|
||||
return VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
|
||||
}
|
||||
return usage != MemoryUsage::DeviceLocal ? VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
|
||||
: VkMemoryPropertyFlagBits{};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue