archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add usz alias for std::size_t

Browse source
This commit is contained in:
Nekotekina 2020-12-18 10:39:54 +03:00
parent 360c4d1554
commit fb29933d3d
173 changed files with 718 additions and 717 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/System.cpp
View file

@ -776,7 +776,7 @@ std::string Emulator::GetExeDir()
GetModuleFileNameW(nullptr, buffer, sizeof(buffer)/2);
std::string path_to_exe = wchar_to_utf8(buffer);
size_t last = path_to_exe.find_last_of("\\");
usz last = path_to_exe.find_last_of("\\");
return last == std::string::npos ? std::string("") : path_to_exe.substr(0, last+1);
}
#endif
@ -1121,7 +1121,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
g_progr = "Scanning directories for SPRX libraries...";
// Find all .sprx files recursively (TODO: process .mself files)
for (std::size_t i = 0; i < dir_queue.size(); i++)
for (usz i = 0; i < dir_queue.size(); i++)
{
if (Emu.IsStopped())
{
@ -1193,13 +1193,13 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
ensure(vm::falloc(0x10000, 0xf0000, vm::main));
}
atomic_t<std::size_t> fnext = 0;
atomic_t<usz> fnext = 0;
shared_mutex sprx_mtx;
named_thread_group workers("SPRX Worker ", GetMaxThreads(), [&]
{
for (std::size_t func_i = fnext++; func_i < file_queue.size(); func_i = fnext++)
for (usz func_i = fnext++; func_i < file_queue.size(); func_i = fnext++)
{
const auto& path = std::as_const(file_queue)[func_i].first;
@ -1252,7 +1252,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
}
// Detect boot location
constexpr size_t game_dir_size = 8; // size of PS3_GAME and PS3_GMXX
constexpr usz game_dir_size = 8; // size of PS3_GAME and PS3_GMXX
const std::string hdd0_game = vfs::get("/dev_hdd0/game/");
const std::string hdd0_disc = vfs::get("/dev_hdd0/disc/");
const bool from_hdd0_game = m_path.find(hdd0_game) != umax;
@ -1260,7 +1260,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
// Mount /dev_bdvd/ if necessary
if (bdvd_dir.empty() && disc.empty())
{
if (const size_t usrdir_pos = elf_dir.rfind("/USRDIR"); usrdir_pos != umax)
if (const usz usrdir_pos = elf_dir.rfind("/USRDIR"); usrdir_pos != umax)
{
const std::string main_dir = elf_dir.substr(0, usrdir_pos);
@ -1626,7 +1626,7 @@ game_boot_result Emulator::Load(const std::string& title_id, bool add_only, bool
else if (!bdvd_dir.empty() && fs::is_dir(bdvd_dir))
{
// Disc games are on /dev_bdvd/
const std::size_t pos = m_path.rfind(m_game_dir);
const usz pos = m_path.rfind(m_game_dir);
argv[0] = "/dev_bdvd/PS3_GAME/" + m_path.substr(pos + game_dir_size + 1);
m_dir = "/dev_bdvd/PS3_GAME/";
}
@ -2007,7 +2007,7 @@ u32 Emulator::GetMaxThreads() const
s32 error_code::error_report(const fmt_type_info* sup, u64 arg, const fmt_type_info* sup2, u64 arg2)
{
static thread_local std::unordered_map<std::string, std::size_t> g_tls_error_stats;
static thread_local std::unordered_map<std::string, usz> g_tls_error_stats;
static thread_local std::string g_tls_error_str;
if (!sup)