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

Implement get_cellos_appname()

Browse source 
Identifying vsh.self and possibly other operating system executables in the future.
This commit is contained in:
Eladash 2021-04-02 20:39:47 +03:00 • committed by Ivan
parent 73320d4180
commit 878da3b474
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rpcs3/Emu/Cell/PPUModule.cpp
View file

@ -1546,6 +1546,12 @@ bool ppu_load_exec(const ppu_exec_object& elf)
load_libs.emplace("libsysmodule.sprx"); load_libs.emplace("libsysmodule.sprx");
} }
if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
{
// Cannot be used with vsh.self (it self-manages itself)
load_libs.clear();
}
const std::string lle_dir = vfs::get("/dev_flash/sys/external/"); const std::string lle_dir = vfs::get("/dev_flash/sys/external/");
if (!fs::is_file(lle_dir + "liblv2.sprx")) if (!fs::is_file(lle_dir + "liblv2.sprx"))
@ -1686,7 +1692,6 @@ bool ppu_load_exec(const ppu_exec_object& elf)
} }
// Initialize memory stats (according to sdk version) // Initialize memory stats (according to sdk version)
// TODO: This is probably wrong with vsh.self
u32 mem_size; u32 mem_size;
if (sdk_version > 0x0021FFFF) if (sdk_version > 0x0021FFFF)
{ {
@ -1719,11 +1724,18 @@ bool ppu_load_exec(const ppu_exec_object& elf)
mem_size += 0xC000000; mem_size += 0xC000000;
} }
if (g_ps3_process_info.get_cellos_appname() == "vsh.self"sv)
{
// Because vsh.self comes before any generic application, more memory is available to it
// This is an estimation though (TODO)
mem_size += 0x800000;
}
g_fxo->init<lv2_memory_container>(mem_size)->used += primary_stacksize; g_fxo->init<lv2_memory_container>(mem_size)->used += primary_stacksize;
ppu->cmd_push({ppu_cmd::initialize, 0}); ppu->cmd_push({ppu_cmd::initialize, 0});
if (!entry) if (!entry && g_ps3_process_info.get_cellos_appname() != "vsh.self"sv)
{ {
// Set TLS args, call sys_initialize_tls // Set TLS args, call sys_initialize_tls
ppu->cmd_list ppu->cmd_list
@ -1731,7 +1743,10 @@ bool ppu_load_exec(const ppu_exec_object& elf)
{ ppu_cmd::set_args, 4 }, u64{ppu->id}, u64{tls_vaddr}, u64{tls_fsize}, u64{tls_vsize}, { ppu_cmd::set_args, 4 }, u64{ppu->id}, u64{tls_vaddr}, u64{tls_fsize}, u64{tls_vsize},
{ ppu_cmd::hle_call, FIND_FUNC(sys_initialize_tls) }, { ppu_cmd::hle_call, FIND_FUNC(sys_initialize_tls) },
}); });
}
if (!entry)
{
entry = static_cast<u32>(elf.header.e_entry); // Run entry from elf entry = static_cast<u32>(elf.header.e_entry); // Run entry from elf
} }

11
rpcs3/Emu/Cell/lv2/sys_process.cpp
View file

@ -45,6 +45,17 @@ bool ps3_process_info_t::has_debug_perm() const
return (ctrl_flags1 & (0xa << 28)) != 0; return (ctrl_flags1 & (0xa << 28)) != 0;
} }
// If a SELF file is of CellOS return its filename, otheriwse return an empty string
std::string_view ps3_process_info_t::get_cellos_appname() const
{
if (!has_root_perm() || !Emu.GetTitleID().empty())
{
return {};
}
return std::string_view(Emu.GetBoot()).substr(Emu.GetBoot().find_last_of('/') + 1);
}
LOG_CHANNEL(sys_process); LOG_CHANNEL(sys_process);
ps3_process_info_t g_ps3_process_info; ps3_process_info_t g_ps3_process_info;

1
rpcs3/Emu/Cell/lv2/sys_process.h
View file

@ -48,6 +48,7 @@ struct ps3_process_info_t
bool has_root_perm() const; bool has_root_perm() const;
bool has_debug_perm() const; bool has_debug_perm() const;
bool debug_or_root() const; bool debug_or_root() const;
std::string_view get_cellos_appname() const;
}; };
extern ps3_process_info_t g_ps3_process_info; extern ps3_process_info_t g_ps3_process_info;