mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-08 00:39:07 +01:00
fsmitm_romfsbuild: Replace manual value aligning with Common::AlignUp()
Theres no need to do explicit bitwise arithmetic here, when we have a function that does this with a more descriptive name.
This commit is contained in:
parent
c0445006af
commit
7ecdaaf189
1 changed files with 11 additions and 12 deletions
|
@ -23,6 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include "common/alignment.h"
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "core/file_sys/fsmitm_romfsbuild.h"
|
#include "core/file_sys/fsmitm_romfsbuild.h"
|
||||||
#include "core/file_sys/vfs.h"
|
#include "core/file_sys/vfs.h"
|
||||||
|
@ -182,7 +183,7 @@ bool RomFSBuildContext::AddDirectory(std::shared_ptr<RomFSBuildDirectoryContext>
|
||||||
// Add a new directory.
|
// Add a new directory.
|
||||||
num_dirs++;
|
num_dirs++;
|
||||||
dir_table_size +=
|
dir_table_size +=
|
||||||
sizeof(RomFSDirectoryEntry) + ((dir_ctx->path_len - dir_ctx->cur_path_ofs + 3) & ~3);
|
sizeof(RomFSDirectoryEntry) + Common::AlignUp(dir_ctx->path_len - dir_ctx->cur_path_ofs, 4);
|
||||||
dir_ctx->parent = parent_dir_ctx;
|
dir_ctx->parent = parent_dir_ctx;
|
||||||
directories.emplace(dir_ctx->path, dir_ctx);
|
directories.emplace(dir_ctx->path, dir_ctx);
|
||||||
|
|
||||||
|
@ -200,7 +201,7 @@ bool RomFSBuildContext::AddFile(std::shared_ptr<RomFSBuildDirectoryContext> pare
|
||||||
// Add a new file.
|
// Add a new file.
|
||||||
num_files++;
|
num_files++;
|
||||||
file_table_size +=
|
file_table_size +=
|
||||||
sizeof(RomFSFileEntry) + ((file_ctx->path_len - file_ctx->cur_path_ofs + 3) & ~3);
|
sizeof(RomFSFileEntry) + Common::AlignUp(file_ctx->path_len - file_ctx->cur_path_ofs, 4);
|
||||||
file_ctx->parent = parent_dir_ctx;
|
file_ctx->parent = parent_dir_ctx;
|
||||||
files.emplace(file_ctx->path, file_ctx);
|
files.emplace(file_ctx->path, file_ctx);
|
||||||
|
|
||||||
|
@ -241,12 +242,12 @@ std::map<u64, VirtualFile> RomFSBuildContext::Build() {
|
||||||
std::shared_ptr<RomFSBuildFileContext> prev_file = nullptr;
|
std::shared_ptr<RomFSBuildFileContext> prev_file = nullptr;
|
||||||
for (const auto& it : files) {
|
for (const auto& it : files) {
|
||||||
cur_file = it.second;
|
cur_file = it.second;
|
||||||
file_partition_size = (file_partition_size + 0xFULL) & ~0xFULL;
|
file_partition_size = Common::AlignUp(file_partition_size, 16);
|
||||||
cur_file->offset = file_partition_size;
|
cur_file->offset = file_partition_size;
|
||||||
file_partition_size += cur_file->size;
|
file_partition_size += cur_file->size;
|
||||||
cur_file->entry_offset = entry_offset;
|
cur_file->entry_offset = entry_offset;
|
||||||
entry_offset +=
|
entry_offset += sizeof(RomFSFileEntry) +
|
||||||
sizeof(RomFSFileEntry) + ((cur_file->path_len - cur_file->cur_path_ofs + 3) & ~3);
|
Common::AlignUp(cur_file->path_len - cur_file->cur_path_ofs, 4);
|
||||||
prev_file = cur_file;
|
prev_file = cur_file;
|
||||||
}
|
}
|
||||||
// Assign deferred parent/sibling ownership.
|
// Assign deferred parent/sibling ownership.
|
||||||
|
@ -263,8 +264,8 @@ std::map<u64, VirtualFile> RomFSBuildContext::Build() {
|
||||||
for (const auto& it : directories) {
|
for (const auto& it : directories) {
|
||||||
cur_dir = it.second;
|
cur_dir = it.second;
|
||||||
cur_dir->entry_offset = entry_offset;
|
cur_dir->entry_offset = entry_offset;
|
||||||
entry_offset +=
|
entry_offset += sizeof(RomFSDirectoryEntry) +
|
||||||
sizeof(RomFSDirectoryEntry) + ((cur_dir->path_len - cur_dir->cur_path_ofs + 3) & ~3);
|
Common::AlignUp(cur_dir->path_len - cur_dir->cur_path_ofs, 4);
|
||||||
}
|
}
|
||||||
// Assign deferred parent/sibling ownership.
|
// Assign deferred parent/sibling ownership.
|
||||||
for (auto it = directories.rbegin(); it->second != root; ++it) {
|
for (auto it = directories.rbegin(); it->second != root; ++it) {
|
||||||
|
@ -297,7 +298,7 @@ std::map<u64, VirtualFile> RomFSBuildContext::Build() {
|
||||||
out.emplace(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->source);
|
out.emplace(cur_file->offset + ROMFS_FILEPARTITION_OFS, cur_file->source);
|
||||||
std::memcpy(file_table.data() + cur_file->entry_offset, &cur_entry, sizeof(RomFSFileEntry));
|
std::memcpy(file_table.data() + cur_file->entry_offset, &cur_entry, sizeof(RomFSFileEntry));
|
||||||
std::memset(file_table.data() + cur_file->entry_offset + sizeof(RomFSFileEntry), 0,
|
std::memset(file_table.data() + cur_file->entry_offset + sizeof(RomFSFileEntry), 0,
|
||||||
(cur_entry.name_size + 3) & ~3);
|
Common::AlignUp(cur_entry.name_size, 4));
|
||||||
std::memcpy(file_table.data() + cur_file->entry_offset + sizeof(RomFSFileEntry),
|
std::memcpy(file_table.data() + cur_file->entry_offset + sizeof(RomFSFileEntry),
|
||||||
cur_file->path.data() + cur_file->cur_path_ofs, name_size);
|
cur_file->path.data() + cur_file->cur_path_ofs, name_size);
|
||||||
}
|
}
|
||||||
|
@ -322,12 +323,10 @@ std::map<u64, VirtualFile> RomFSBuildContext::Build() {
|
||||||
|
|
||||||
cur_entry.name_size = name_size;
|
cur_entry.name_size = name_size;
|
||||||
|
|
||||||
std::memcpy(dir_table.data() + cur_dir->entry_offset, &cur_entry,
|
|
||||||
sizeof(RomFSDirectoryEntry));
|
|
||||||
std::memcpy(dir_table.data() + cur_dir->entry_offset, &cur_entry,
|
std::memcpy(dir_table.data() + cur_dir->entry_offset, &cur_entry,
|
||||||
sizeof(RomFSDirectoryEntry));
|
sizeof(RomFSDirectoryEntry));
|
||||||
std::memset(dir_table.data() + cur_dir->entry_offset + sizeof(RomFSDirectoryEntry), 0,
|
std::memset(dir_table.data() + cur_dir->entry_offset + sizeof(RomFSDirectoryEntry), 0,
|
||||||
(cur_entry.name_size + 3) & ~3);
|
Common::AlignUp(cur_entry.name_size, 4));
|
||||||
std::memcpy(dir_table.data() + cur_dir->entry_offset + sizeof(RomFSDirectoryEntry),
|
std::memcpy(dir_table.data() + cur_dir->entry_offset + sizeof(RomFSDirectoryEntry),
|
||||||
cur_dir->path.data() + cur_dir->cur_path_ofs, name_size);
|
cur_dir->path.data() + cur_dir->cur_path_ofs, name_size);
|
||||||
}
|
}
|
||||||
|
@ -339,7 +338,7 @@ std::map<u64, VirtualFile> RomFSBuildContext::Build() {
|
||||||
header.dir_hash_table_size = dir_hash_table_size;
|
header.dir_hash_table_size = dir_hash_table_size;
|
||||||
header.dir_table_size = dir_table_size;
|
header.dir_table_size = dir_table_size;
|
||||||
header.file_partition_ofs = ROMFS_FILEPARTITION_OFS;
|
header.file_partition_ofs = ROMFS_FILEPARTITION_OFS;
|
||||||
header.dir_hash_table_ofs = (header.file_partition_ofs + file_partition_size + 3ULL) & ~3ULL;
|
header.dir_hash_table_ofs = Common::AlignUp(header.file_partition_ofs + file_partition_size, 4);
|
||||||
header.dir_table_ofs = header.dir_hash_table_ofs + header.dir_hash_table_size;
|
header.dir_table_ofs = header.dir_hash_table_ofs + header.dir_hash_table_size;
|
||||||
header.file_hash_table_ofs = header.dir_table_ofs + header.dir_table_size;
|
header.file_hash_table_ofs = header.dir_table_ofs + header.dir_table_size;
|
||||||
header.file_table_ofs = header.file_hash_table_ofs + header.file_hash_table_size;
|
header.file_table_ofs = header.file_hash_table_ofs + header.file_hash_table_size;
|
||||||
|
|
Loading…
Reference in a new issue