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

review fixes

This commit is contained in:
georgemoralis 2024-06-10 18:26:37 +03:00
parent 6f8d99fbf2
commit beb631607a
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/emulator.cpp
View File

@ -1,3 +1,4 @@
#include "emulator.h"
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -45,6 +46,7 @@ Emulator::Emulator() : window{WindowWidth, WindowHeight, controller} {
// Initialize kernel and library facilities. // Initialize kernel and library facilities.
Libraries::Kernel::init_pthreads(); Libraries::Kernel::init_pthreads();
Libraries::InitHLELibs(&linker->GetHLESymbols());
} }
Emulator::~Emulator() { Emulator::~Emulator() {
@ -54,10 +56,6 @@ Emulator::~Emulator() {
} }
void Emulator::Run(const std::filesystem::path& file) { void Emulator::Run(const std::filesystem::path& file) {
// Initialize linker
auto linker = Common::Singleton<Core::Linker>::Instance();
Libraries::InitHLELibs(&linker->GetHLESymbols());
// Applications expect to be run from /app0 so mount the file's parent path as app0. // Applications expect to be run from /app0 so mount the file's parent path as app0.
auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance(); auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
mnt->Mount(file.parent_path(), "/app0"); mnt->Mount(file.parent_path(), "/app0");
@ -92,13 +90,8 @@ void Emulator::Run(const std::filesystem::path& file) {
linker->LoadModule(file); linker->LoadModule(file);
// check if we have system modules to load // check if we have system modules to load
const auto& sys_module_path = Common::FS::GetUserPath(Common::FS::PathType::SysModuleDir); LoadSystemModules(file);
for (const auto& entry : std::filesystem::directory_iterator(sys_module_path)) {
if (entry.path().filename() == "libSceNgs2.sprx") {
LOG_INFO(Loader, "Loading {}", entry.path().string().c_str());
linker->LoadModule(entry.path().string().c_str());
}
}
// Check if there is a libc.prx in sce_module folder // Check if there is a libc.prx in sce_module folder
bool found = false; bool found = false;
if (Config::isLleLibc()) { if (Config::isLleLibc()) {
@ -109,7 +102,7 @@ void Emulator::Run(const std::filesystem::path& file) {
entry.path().filename() == "libSceFios2.prx") { entry.path().filename() == "libSceFios2.prx") {
found = true; found = true;
LOG_INFO(Loader, "Loading {}", entry.path().string().c_str()); LOG_INFO(Loader, "Loading {}", entry.path().string().c_str());
linker->LoadModule(entry.path().string().c_str()); linker->LoadModule(entry.path());
} }
} }
} }
@ -119,7 +112,8 @@ void Emulator::Run(const std::filesystem::path& file) {
} }
// start execution // start execution
std::thread mainthread([linker]() { linker->Execute(); }); std::jthread mainthread =
std::jthread([this](std::stop_token stop_token) { linker->Execute(); });
// Begin main window loop until the application exits // Begin main window loop until the application exits
static constexpr std::chrono::microseconds FlipPeriod{100000}; static constexpr std::chrono::microseconds FlipPeriod{100000};
@ -133,4 +127,14 @@ void Emulator::Run(const std::filesystem::path& file) {
std::exit(0); std::exit(0);
} }
void Emulator::LoadSystemModules(const std::filesystem::path& file) {
const auto& sys_module_path = Common::FS::GetUserPath(Common::FS::PathType::SysModuleDir);
for (const auto& entry : std::filesystem::directory_iterator(sys_module_path)) {
if (entry.path().filename() == "libSceNgs2.sprx") {
LOG_INFO(Loader, "Loading {}", entry.path().string().c_str());
linker->LoadModule(entry.path());
}
}
}
} // namespace Core } // namespace Core

2
src/emulator.h
View File

@ -22,8 +22,10 @@ public:
void Run(const std::filesystem::path& file); void Run(const std::filesystem::path& file);
private: private:
void LoadSystemModules(const std::filesystem::path& file);
Discord::RPC discord_rpc; Discord::RPC discord_rpc;
Input::GameController* controller = Common::Singleton<Input::GameController>::Instance(); Input::GameController* controller = Common::Singleton<Input::GameController>::Instance();
Core::Linker* linker = Common::Singleton<Core::Linker>::Instance();
Frontend::WindowSDL window; Frontend::WindowSDL window;
}; };