dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-09 19:14:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

iso: batch file reads (test 2)

Browse Source
This commit is contained in:
Megamouse 2026-04-04 18:35:05 +02:00
parent 2c682e3d93
commit 81dbfc75ae
1 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
rpcs3/Loader/ISO.cpp
View File

@ -38,19 +38,19 @@ bool is_file_iso(const fs::file& file)
const int ISO_BLOCK_SIZE = 2048;
template<typename T>
inline T read_both_endian_int(fs::file& file)
inline T retrieve_endian_int(const u8* buf)
{
T out;
T out {};
if (std::endian::little == std::endian::native)
if constexpr (std::endian::little == std::endian::native)
{
out = file.read<T>();
file.seek(sizeof(T), fs::seek_cur);
// first half = little-endian copy
std::memcpy(&out, buf, sizeof(T));
}
else
{
file.seek(sizeof(T), fs::seek_cur);
out = file.read<T>();
// second half = big-endian copy
std::memcpy(&out, buf + sizeof(T), sizeof(T));
}
return out;
@ -64,41 +64,51 @@ static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& entry,
if (entry_length == 0) return std::nullopt;
// Batch this set of file reads. This reduces overall time spent in iso_read_directory_entry by ~38%
constexpr usz read_size = 1 + 4 * sizeof(u32) + 8 + 6 + 1;
const std::array<u8, read_size> data = entry.read<std::array<u8, read_size>>();
fs::file file(data.data(), data.size());
// Batch this set of file reads. This reduces overall time spent in iso_read_directory_entry by ~41%
#pragma pack(push, 1)
struct entry_header
{
u8 padding;
std::array<u8, 8> start_sector;
std::array<u8, 8> file_size;
u8 year;
u8 month;
u8 day;
u8 hour;
u8 minute;
u8 second;
u8 timezone_value;
u8 flags;
std::array<u8, 6> padding2;
u8 file_name_length;
};
#pragma pack(pop)
file.seek(1, fs::seek_cur);
const u32 start_sector = read_both_endian_int<u32>(file);
const u32 file_size = read_both_endian_int<u32>(file);
const entry_header header = entry.read<entry_header>();
const u32 start_sector = retrieve_endian_int<u32>(header.start_sector.data());
const u32 file_size = retrieve_endian_int<u32>(header.file_size.data());
std::tm file_date = {};
file_date.tm_year = file.read<u8>();
file_date.tm_mon = file.read<u8>() - 1;
file_date.tm_mday = file.read<u8>();
file_date.tm_hour = file.read<u8>();
file_date.tm_min = file.read<u8>();
file_date.tm_sec = file.read<u8>();
const s16 timezone_value = file.read<u8>();
file_date.tm_year = header.year;
file_date.tm_mon = header.month - 1;
file_date.tm_mday = header.day;
file_date.tm_hour = header.hour;
file_date.tm_min = header.minute;
file_date.tm_sec = header.second;
const s16 timezone_value = header.timezone_value;
const s16 timezone_offset = (timezone_value - 50) * 15 * 60;
const std::time_t date_time = std::mktime(&file_date) + timezone_offset;
const u8 flags = file.read<u8>();
// 2nd flag bit indicates whether a given fs node is a directory
const bool is_directory = flags & 0b00000010;
const bool has_more_extents = flags & 0b10000000;
file.seek(6, fs::seek_cur);
const u8 file_name_length = file.read<u8>();
const bool is_directory = header.flags & 0b00000010;
const bool has_more_extents = header.flags & 0b10000000;
std::string file_name;
entry.read(file_name, file_name_length);
entry.read(file_name, header.file_name_length);
if (file_name_length == 1 && file_name[0] == 0)
if (header.file_name_length == 1 && file_name[0] == 0)
{
file_name = ".";
}
@ -110,7 +120,7 @@ static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& entry,
{
// characters are stored in big endian format.
std::u16string utf16;
utf16.resize(file_name_length / 2);
utf16.resize(header.file_name_length / 2);
const u16* raw = reinterpret_cast<const u16*>(file_name.data());
for (size_t i = 0; i < utf16.size(); ++i, raw++)
@ -126,7 +136,7 @@ static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& entry,
file_name.erase(file_name.end() - 2, file_name.end());
}
if (file_name_length > 1 && file_name.ends_with("."))
if (header.file_name_length > 1 && file_name.ends_with("."))
{
file_name.pop_back();
}