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

Merge bf51e3b61f into 34c26eff68

Browse Source
This commit is contained in:
Megamouse 2026-04-06 22:02:00 +02:00 committed by GitHub
commit 8b0960a7c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 56 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/NV47/FW/draw_call.hpp
View File

@ -33,7 +33,7 @@ namespace rsx
u32 draw_command_barrier_mask = 0;
// Draw-time iterator to the draw_command_barriers struct
mutable rsx::simple_array<barrier_t>::iterator current_barrier_it;
mutable rsx::simple_array<barrier_t>::iterator current_barrier_it {};
// Subranges memory cache
mutable rsx::simple_array<draw_range_t> subranges_store;

4
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -2970,7 +2970,7 @@ namespace rsx
auto& cfg = g_fxo->get<gcm_config>();
std::unique_lock<shared_mutex> hle_lock;
std::optional<std::unique_lock<shared_mutex>> hle_lock;
for (u32 i = 0; i < std::size(unmap_status); i++)
{
@ -3011,7 +3011,7 @@ namespace rsx
if (hle_lock)
{
hle_lock.unlock();
hle_lock->unlock();
}
// Pause RSX thread momentarily to handle unmapping

86
rpcs3/Loader/ISO.cpp
View File

@ -37,62 +37,81 @@ 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;
}
// assumed that directory_entry is at file head
std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& file, bool names_in_ucs2 = false)
static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& entry, bool names_in_ucs2 = false)
{
const auto start_pos = file.pos();
const u8 entry_length = file.read<u8>();
const auto start_pos = entry.pos();
const u8 entry_length = entry.read<u8>();
if (entry_length == 0) return std::nullopt;
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);
// Batch this set of file reads. This reduces overall time spent in iso_read_directory_entry by ~41%
#pragma pack(push, 1)
struct iso_entry_header
{
//u8 entry_length; // Handled separately
u8 extended_attribute_length;
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;
u8 file_unit_size;
u8 interleave;
std::array<u8, 4> volume_sequence_number;
u8 file_name_length;
//u8 file_name[file_name_length]; // Handled separately
};
#pragma pack(pop)
const iso_entry_header header = entry.read<iso_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;
file.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 = ".";
}
@ -104,7 +123,7 @@ std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& file, bool nam
{
// 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++)
@ -120,13 +139,13 @@ std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& file, bool nam
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();
}
// skip the rest of the entry.
file.seek(entry_length + start_pos);
entry.seek(entry_length + start_pos);
return iso_fs_metadata
{
@ -180,6 +199,7 @@ void iso_form_hierarchy(fs::file& file, iso_fs_node& node, bool use_ucs2_decodin
selected_node->metadata.extents.push_back(entry->extents[0]);
extent_added = true;
break;
}
}