catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emulator: Add libSceFiber and simplify logic

This commit is contained in:
IndecisiveTurtle 2024-07-17 15:37:32 +03:00
parent b6f011c8f6
commit 0408d8596d
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/emulator.cpp
View File

@ -148,39 +148,35 @@ void Emulator::Run(const std::filesystem::path& file) {
} }
void Emulator::LoadSystemModules(const std::filesystem::path& file) { void Emulator::LoadSystemModules(const std::filesystem::path& file) {
constexpr std::array<SysModules, 6> ModulesToLoad{ constexpr std::array<SysModules, 7> ModulesToLoad{
{{"libSceNgs2.sprx", nullptr}, {{"libSceNgs2.sprx", nullptr},
{"libSceFiber.sprx", nullptr},
{"libSceLibcInternal.sprx", &Libraries::LibcInternal::RegisterlibSceLibcInternal}, {"libSceLibcInternal.sprx", &Libraries::LibcInternal::RegisterlibSceLibcInternal},
{"libSceDiscMap.sprx", &Libraries::DiscMap::RegisterlibSceDiscMap}, {"libSceDiscMap.sprx", &Libraries::DiscMap::RegisterlibSceDiscMap},
{"libSceRtc.sprx", &Libraries::Rtc::RegisterlibSceRtc}, {"libSceRtc.sprx", &Libraries::Rtc::RegisterlibSceRtc},
{"libSceJpegEnc.sprx", nullptr}, {"libSceJpegEnc.sprx", nullptr},
{"libSceJson2.sprx", nullptr}}}; {"libSceJson2.sprx", nullptr}},
};
std::vector<std::filesystem::path> found_modules; std::vector<std::filesystem::path> found_modules;
const auto& sys_module_path = Common::FS::GetUserPath(Common::FS::PathType::SysModuleDir); const auto& sys_module_path = Common::FS::GetUserPath(Common::FS::PathType::SysModuleDir);
for (const auto& entry : std::filesystem::directory_iterator(sys_module_path)) { for (const auto& entry : std::filesystem::directory_iterator(sys_module_path)) {
found_modules.push_back(entry.path()); found_modules.push_back(entry.path());
} }
for (auto it : ModulesToLoad) { for (const auto& [module_name, init_func] : ModulesToLoad) {
bool found = false; const auto it = std::ranges::find_if(found_modules, [&](const auto& path) {
std::filesystem::path foundpath; return path.filename() == module_name;
for (auto f : found_modules) { });
if (f.filename().string() == it.module_name) { if (it != found_modules.end()) {
found = true; LOG_INFO(Loader, "Loading {}", it->string());
foundpath = f; linker->LoadModule(*it);
break; continue;
} }
} if (init_func) {
if (found) { LOG_INFO(Loader, "Can't Load {} switching to HLE", module_name);
LOG_INFO(Loader, "Loading {}", foundpath.string().c_str()); init_func(&linker->GetHLESymbols());
linker->LoadModule(foundpath);
} else { } else {
if (it.callback != nullptr) { LOG_INFO(Loader, "No HLE available for {} module", module_name);
LOG_INFO(Loader, "Can't Load {} switching to HLE", it.module_name);
it.callback(&linker->GetHLESymbols());
} else {
LOG_INFO(Loader, "No HLE available for {} module", it.module_name);
}
} }
} }
} }