piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DirectoryBlob: Remove m_fst_name_offset

Browse Source
This commit is contained in:
JosJuice
2017-06-10 13:02:16 +02:00
parent ef39b4da46
commit 0d4ad0e39e
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -386,8 +386,8 @@ void DirectoryBlobReader::BuildFST(u64 fst_address)
u32 name_table_size = Common::AlignUp(ComputeNameSize(rootEntry), 1ull << m_address_shift); u32 name_table_size = Common::AlignUp(ComputeNameSize(rootEntry), 1ull << m_address_shift);
u64 total_entries = rootEntry.size + 1; // The root entry itself isn't counted in rootEntry.size u64 total_entries = rootEntry.size + 1; // The root entry itself isn't counted in rootEntry.size
m_fst_name_offset = total_entries * ENTRY_SIZE; // offset of name table in FST const u64 name_table_offset = total_entries * ENTRY_SIZE;
m_fst_data.resize(m_fst_name_offset + name_table_size); m_fst_data.resize(name_table_offset + name_table_size);
// 32 KiB aligned start of data on disk // 32 KiB aligned start of data on disk
u64 current_data_address = Common::AlignUp(fst_address + m_fst_data.size(), 0x8000ull); u64 current_data_address = Common::AlignUp(fst_address + m_fst_data.size(), 0x8000ull);
@ -399,7 +399,8 @@ void DirectoryBlobReader::BuildFST(u64 fst_address)
// write root entry // write root entry
WriteEntryData(&fst_offset, DIRECTORY_ENTRY, 0, 0, total_entries, m_address_shift); WriteEntryData(&fst_offset, DIRECTORY_ENTRY, 0, 0, total_entries, m_address_shift);
WriteDirectory(rootEntry, &fst_offset, &name_offset, &current_data_address, root_offset); WriteDirectory(rootEntry, &fst_offset, &name_offset, &current_data_address, root_offset,
name_table_offset);
// overflow check, compare the aligned name offset with the aligned name table size // overflow check, compare the aligned name offset with the aligned name table size
_assert_(Common::AlignUp(name_offset, 1ull << m_address_shift) == name_table_size); _assert_(Common::AlignUp(name_offset, 1ull << m_address_shift) == name_table_size);
@ -449,15 +450,17 @@ void DirectoryBlobReader::WriteEntryData(u32* entry_offset, u8 type, u32 name_of
*entry_offset += 4; *entry_offset += 4;
} }
void DirectoryBlobReader::WriteEntryName(u32* name_offset, const std::string& name) void DirectoryBlobReader::WriteEntryName(u32* name_offset, const std::string& name,
u64 name_table_offset)
{ {
strncpy((char*)&m_fst_data[*name_offset + m_fst_name_offset], name.c_str(), name.length() + 1); strncpy((char*)&m_fst_data[*name_offset + name_table_offset], name.c_str(), name.length() + 1);
*name_offset += (u32)(name.length() + 1); *name_offset += (u32)(name.length() + 1);
} }
void DirectoryBlobReader::WriteDirectory(const File::FSTEntry& parent_entry, u32* fst_offset, void DirectoryBlobReader::WriteDirectory(const File::FSTEntry& parent_entry, u32* fst_offset,
u32* name_offset, u64* data_offset, u32 parent_entry_index) u32* name_offset, u64* data_offset, u32 parent_entry_index,
u64 name_table_offset)
{ {
std::vector<File::FSTEntry> sorted_entries = parent_entry.children; std::vector<File::FSTEntry> sorted_entries = parent_entry.children;
@ -476,16 +479,16 @@ void DirectoryBlobReader::WriteDirectory(const File::FSTEntry& parent_entry, u32
u32 entry_index = *fst_offset / ENTRY_SIZE; u32 entry_index = *fst_offset / ENTRY_SIZE;
WriteEntryData(fst_offset, DIRECTORY_ENTRY, *name_offset, parent_entry_index, WriteEntryData(fst_offset, DIRECTORY_ENTRY, *name_offset, parent_entry_index,
entry_index + entry.size + 1, 0); entry_index + entry.size + 1, 0);
WriteEntryName(name_offset, entry.virtualName); WriteEntryName(name_offset, entry.virtualName, name_table_offset);
WriteDirectory(entry, fst_offset, name_offset, data_offset, entry_index); WriteDirectory(entry, fst_offset, name_offset, data_offset, entry_index, name_table_offset);
} }
else else
{ {
// put entry in FST // put entry in FST
WriteEntryData(fst_offset, FILE_ENTRY, *name_offset, *data_offset, entry.size, WriteEntryData(fst_offset, FILE_ENTRY, *name_offset, *data_offset, entry.size,
m_address_shift); m_address_shift);
WriteEntryName(name_offset, entry.virtualName); WriteEntryName(name_offset, entry.virtualName, name_table_offset);
// write entry to virtual disc // write entry to virtual disc
auto result = m_virtual_disc.emplace(*data_offset, entry.size, entry.physicalName); auto result = m_virtual_disc.emplace(*data_offset, entry.size, entry.physicalName);

5
Source/Core/DiscIO/DirectoryBlob.h
View File

@ -95,9 +95,9 @@ private:
// FST creation // FST creation
void WriteEntryData(u32* entry_offset, u8 type, u32 name_offset, u64 data_offset, u64 length, void WriteEntryData(u32* entry_offset, u8 type, u32 name_offset, u64 data_offset, u64 length,
u32 address_shift); u32 address_shift);
void WriteEntryName(u32* name_offset, const std::string& name); void WriteEntryName(u32* name_offset, const std::string& name, u64 name_table_offset);
void WriteDirectory(const File::FSTEntry& parent_entry, u32* fst_offset, u32* name_offset, void WriteDirectory(const File::FSTEntry& parent_entry, u32* fst_offset, u32* name_offset,
u64* data_offset, u32 parent_entry_index); u64* data_offset, u32 parent_entry_index, u64 name_table_offset);
std::string m_root_directory; std::string m_root_directory;
@ -109,7 +109,6 @@ private:
// GameCube has no shift, Wii has 2 bit shift // GameCube has no shift, Wii has 2 bit shift
u32 m_address_shift; u32 m_address_shift;
u64 m_fst_name_offset;
std::vector<u8> m_fst_data; std::vector<u8> m_fst_data;
std::vector<u8> m_disk_header; std::vector<u8> m_disk_header;