million/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

fs: Fix RomFS building when zero byte files are present

Browse source 
When zero byte files are present, the key (offset) for that file is identical to the file right after. A std::map isn't able to fit key-value pairs with identical keys (offsets), therefore, the solution is to use std::multimap which permits multiple entries with the same key.

This most prominently fixes Pokemon Sword and Shield weather with any RomFS mod applied.
This commit is contained in:
Morph 2020-07-12 04:31:01 -04:00
parent e60733aad3
commit fd1c3aa14e
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/file_sys/fsmitm_romfsbuild.cpp
View file

@ -240,7 +240,7 @@ RomFSBuildContext::RomFSBuildContext(VirtualDir base_, VirtualDir ext_)
RomFSBuildContext::~RomFSBuildContext() = default; RomFSBuildContext::~RomFSBuildContext() = default;
std::map<u64, VirtualFile> RomFSBuildContext::Build() { std::multimap<u64, VirtualFile> RomFSBuildContext::Build() {
const u64 dir_hash_table_entry_count = romfs_get_hash_table_count(num_dirs); const u64 dir_hash_table_entry_count = romfs_get_hash_table_count(num_dirs);
const u64 file_hash_table_entry_count = romfs_get_hash_table_count(num_files); const u64 file_hash_table_entry_count = romfs_get_hash_table_count(num_files);
dir_hash_table_size = 4 * dir_hash_table_entry_count; dir_hash_table_size = 4 * dir_hash_table_entry_count;
@ -294,7 +294,7 @@ std::map<u64, VirtualFile> RomFSBuildContext::Build() {
cur_dir->parent->child = cur_dir; cur_dir->parent->child = cur_dir;
} }
std::map<u64, VirtualFile> out; std::multimap<u64, VirtualFile> out;
// Populate file tables. // Populate file tables.
for (const auto& it : files) { for (const auto& it : files) {

2
src/core/file_sys/fsmitm_romfsbuild.h
View file

@ -43,7 +43,7 @@ public:
~RomFSBuildContext(); ~RomFSBuildContext();
// This finalizes the context. // This finalizes the context.
std::map<u64, VirtualFile> Build(); std::multimap<u64, VirtualFile> Build();
private: private:
VirtualDir base; VirtualDir base;

8
src/core/file_sys/vfs_concat.cpp
View file

@ -11,7 +11,7 @@
namespace FileSys { namespace FileSys {
static bool VerifyConcatenationMapContinuity(const std::map<u64, VirtualFile>& map) { static bool VerifyConcatenationMapContinuity(const std::multimap<u64, VirtualFile>& map) {
const auto last_valid = --map.end(); const auto last_valid = --map.end();
for (auto iter = map.begin(); iter != last_valid;) { for (auto iter = map.begin(); iter != last_valid;) {
const auto old = iter++; const auto old = iter++;
@ -27,12 +27,12 @@ ConcatenatedVfsFile::ConcatenatedVfsFile(std::vector<VirtualFile> files_, std::s
: name(std::move(name)) { : name(std::move(name)) {
std::size_t next_offset = 0; std::size_t next_offset = 0;
for (const auto& file : files_) { for (const auto& file : files_) {
files[next_offset] = file; files.emplace(next_offset, file);
next_offset += file->GetSize(); next_offset += file->GetSize();
} }
} }
ConcatenatedVfsFile::ConcatenatedVfsFile(std::map<u64, VirtualFile> files_, std::string name) ConcatenatedVfsFile::ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files_, std::string name)
: files(std::move(files_)), name(std::move(name)) { : files(std::move(files_)), name(std::move(name)) {
ASSERT(VerifyConcatenationMapContinuity(files)); ASSERT(VerifyConcatenationMapContinuity(files));
} }
@ -50,7 +50,7 @@ VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(std::vector<VirtualFile> f
} }
VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(u8 filler_byte, VirtualFile ConcatenatedVfsFile::MakeConcatenatedFile(u8 filler_byte,
std::map<u64, VirtualFile> files, std::multimap<u64, VirtualFile> files,
std::string name) { std::string name) {
if (files.empty()) if (files.empty())
return nullptr; return nullptr;

6
src/core/file_sys/vfs_concat.h
View file

@ -15,7 +15,7 @@ namespace FileSys {
// read-only. // read-only.
class ConcatenatedVfsFile : public VfsFile { class ConcatenatedVfsFile : public VfsFile {
ConcatenatedVfsFile(std::vector<VirtualFile> files, std::string name); ConcatenatedVfsFile(std::vector<VirtualFile> files, std::string name);
ConcatenatedVfsFile(std::map<u64, VirtualFile> files, std::string name); ConcatenatedVfsFile(std::multimap<u64, VirtualFile> files, std::string name);
public: public:
~ConcatenatedVfsFile() override; ~ConcatenatedVfsFile() override;
@ -25,7 +25,7 @@ public:
/// Convenience function that turns a map of offsets to files into a concatenated file, filling /// Convenience function that turns a map of offsets to files into a concatenated file, filling
/// gaps with a given filler byte. /// gaps with a given filler byte.
static VirtualFile MakeConcatenatedFile(u8 filler_byte, std::map<u64, VirtualFile> files, static VirtualFile MakeConcatenatedFile(u8 filler_byte, std::multimap<u64, VirtualFile> files,
std::string name); std::string name);
std::string GetName() const override; std::string GetName() const override;
@ -40,7 +40,7 @@ public:
private: private:
// Maps starting offset to file -- more efficient. // Maps starting offset to file -- more efficient.
std::map<u64, VirtualFile> files; std::multimap<u64, VirtualFile> files;
std::string name; std::string name;
}; };