ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sys_fs: Integrated the function of get_vfs() into get_mp()

This commit is contained in:
brian218 2022-12-08 12:46:09 +08:00 committed by Megamouse
parent 9274b3f14d
commit a0f3704b41
2 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View File

@ -205,67 +205,64 @@ std::string_view lv2_fs_object::get_device_path(std::string_view filename)
return mp_name; return mp_name;
} }
lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename) lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename, std::string* vfs_path)
{ {
if (!filename.starts_with('/')) auto result = &g_mp_sys_no_device; // Default fallback
{
return &g_mp_sys_no_device;
}
const auto mp_name = get_device_path(filename); const auto mp_name = get_device_path(filename);
for (auto mp = &g_mp_sys_dev_root; mp; mp = mp->next) if (filename.starts_with('/'))
{ {
const auto pos = mp->root.find_first_not_of('/'); for (auto mp = &g_mp_sys_dev_root; mp; mp = mp->next)
const auto mp_root = pos != umax ? mp->root.substr(pos) : mp->root;
if (mp == &g_mp_sys_dev_usb)
{ {
for (int i = 0; i < 8; i++) const auto pos = mp->root.find_first_not_of('/');
const auto mp_root = pos != umax ? mp->root.substr(pos) : mp->root;
if (mp == &g_mp_sys_dev_usb)
{ {
if (fmt::format("%s%03d", mp_root, i) == mp_name) for (int i = 0; i < 8; i++)
{ {
return mp; if (fmt::format("%s%03d", mp_root, i) == mp_name)
{
result = mp;
break;
}
} }
} }
} else if (mp_root == mp_name)
else if (mp_root == mp_name) {
{ result = mp;
return mp; break;
}
} }
} }
// Default fallback if (vfs_path)
return &g_mp_sys_no_device; {
} if (result == &g_mp_sys_dev_hdd0)
*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, rpcs3::utils::get_emu_dir());
else if (result == &g_mp_sys_dev_hdd1)
*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, rpcs3::utils::get_emu_dir());
else if (result == &g_mp_sys_dev_usb)
*vfs_path = g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, fmt::format("/%s", mp_name), rpcs3::utils::get_emu_dir()).path;
else if (result == &g_mp_sys_dev_bdvd)
*vfs_path = g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir());
else if (result == &g_mp_sys_dev_dvd)
*vfs_path = {}; // Unsupported in VFS
else if (result == &g_mp_sys_app_home)
*vfs_path = g_cfg_vfs.get(g_cfg_vfs.app_home, rpcs3::utils::get_emu_dir());
else if (result == &g_mp_sys_host_root)
*vfs_path = g_cfg.vfs.host_root ? "/" : std::string();
else if (result == &g_mp_sys_dev_flash)
*vfs_path = g_cfg_vfs.get_dev_flash();
else if (result == &g_mp_sys_dev_flash2)
*vfs_path = g_cfg_vfs.get_dev_flash2();
else if (result == &g_mp_sys_dev_flash3)
*vfs_path = g_cfg_vfs.get_dev_flash3();
else
*vfs_path = {};
}
std::string lv2_fs_object::get_vfs(std::string_view filename) return result;
{
const auto mp = get_mp(filename);
if (mp == &g_mp_sys_dev_hdd0)
return g_cfg_vfs.get(g_cfg_vfs.dev_hdd0, rpcs3::utils::get_emu_dir());
if (mp == &g_mp_sys_dev_hdd1)
return g_cfg_vfs.get(g_cfg_vfs.dev_hdd1, rpcs3::utils::get_emu_dir());
if (mp == &g_mp_sys_dev_usb)
return g_cfg_vfs.get_device(g_cfg_vfs.dev_usb, fmt::format("/%s", get_device_path(filename)), rpcs3::utils::get_emu_dir()).path;
if (mp == &g_mp_sys_dev_bdvd)
return g_cfg_vfs.get(g_cfg_vfs.dev_bdvd, rpcs3::utils::get_emu_dir());
if (mp == &g_mp_sys_dev_dvd)
return {}; // Unsupported in VFS
if (mp == &g_mp_sys_app_home)
return g_cfg_vfs.get(g_cfg_vfs.app_home, rpcs3::utils::get_emu_dir());
if (mp == &g_mp_sys_host_root)
return g_cfg.vfs.host_root ? "/" : std::string();
if (mp == &g_mp_sys_dev_flash)
return g_cfg_vfs.get_dev_flash();
if (mp == &g_mp_sys_dev_flash2)
return g_cfg_vfs.get_dev_flash2();
if (mp == &g_mp_sys_dev_flash3)
return g_cfg_vfs.get_dev_flash3();
// Default fallback
return {};
} }
std::string lv2_fs_object::device_name_to_path(std::string_view device_name) std::string lv2_fs_object::device_name_to_path(std::string_view device_name)
@ -3164,8 +3161,8 @@ error_code sys_fs_newfs(ppu_thread&, vm::cptr<char> dev_name, vm::cptr<char> fil
return CELL_EABORT; return CELL_EABORT;
} }
const auto mp = lv2_fs_object::get_mp(device_path); std::string vfs_path;
const auto vfs_path = lv2_fs_object::get_vfs(device_path); const auto mp = lv2_fs_object::get_mp(device_path, &vfs_path);
bool success = true; bool success = true;
auto vfs_newfs = [&](const std::string& path) auto vfs_newfs = [&](const std::string& path)
@ -3221,8 +3218,8 @@ error_code sys_fs_mount(ppu_thread&, vm::cptr<char> dev_name, vm::cptr<char> fil
return { fs_error, filesystem }; return { fs_error, filesystem };
} }
const auto mp = lv2_fs_object::get_mp(vpath); std::string vfs_path;
const auto vfs_path = lv2_fs_object::get_vfs(vpath); const auto mp = lv2_fs_object::get_mp(vpath, &vfs_path);
bool success = true; bool success = true;
auto vfs_mount = [&vpath = vpath, &filesystem = filesystem, &mp = mp](std::string mount_path) auto vfs_mount = [&vpath = vpath, &filesystem = filesystem, &mp = mp](std::string mount_path)

3
rpcs3/Emu/Cell/lv2/sys_fs.h
View File

@ -190,8 +190,7 @@ public:
lv2_fs_object& operator=(const lv2_fs_object&) = delete; lv2_fs_object& operator=(const lv2_fs_object&) = delete;
static std::string_view get_device_path(std::string_view filename); static std::string_view get_device_path(std::string_view filename);
static lv2_fs_mount_point* get_mp(std::string_view filename); static lv2_fs_mount_point* get_mp(std::string_view filename, std::string* vfs_path = nullptr);
static std::string get_vfs(std::string_view filename);
static std::string device_name_to_path(std::string_view device_name); static std::string device_name_to_path(std::string_view device_name);
static u64 get_mount_count(); static u64 get_mount_count();
static bool vfs_unmount(std::string_view vpath, bool no_error = false); static bool vfs_unmount(std::string_view vpath, bool no_error = false);