Merge pull request #182 from shadps4-emu/miscfixes

Miscfixes

CMakeLists.txt

@@ -486,6 +486,8 @@ else()
         ${SHADER_RECOMPILER}
         ${VIDEO_CORE}
         src/main.cpp
+        src/emulator.cpp
+        src/emulator.h
         src/sdl_window.h
         src/sdl_window.cpp
     )

externals/cryptopp

@@ -1 +1 @@
-Subproject commit 782057f5f18fbdad2bd2b291fb1ec558a8ab8225
+Subproject commit 9bb6680cfaedd3d46eff082ede8d0c76be6a2145

externals/cryptopp-cmake

@@ -1 +1 @@
-Subproject commit 19cd13af5f7fa4904b174b81e98852283dbe8c1f
+Subproject commit 2c384c28265a93358a2455e610e76393358794df

externals/fmt

@@ -1 +1 @@
-Subproject commit d2473b7b73c0af2a3ed34c99e50ace0a1040581a
+Subproject commit 18a325f370ffd5ec1eda0087d2efc3dc9b3faf56

externals/glslang

@@ -1 +1 @@
-Subproject commit 2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83
+Subproject commit 73eccd4b67985d344578cade8958214cee0a3f6e

externals/magic_enum

@@ -1 +1 @@
-Subproject commit db0b726c051f2d631b85793038677caf467a7cfe
+Subproject commit bf3c74ab7eded2a7183a3729f5cd36bc367edb08

externals/sdl3

@@ -1 +1 @@
-Subproject commit bcbf09acdef71b550e837c8aaca67b08b6a38f0f
+Subproject commit 4fc68a48f20574326eb18022eed0b7c0fa52a10e

externals/sirit

@@ -1 +1 @@
-Subproject commit 8c281cc0b7cd638d3853a5aa2fc35b969fcbb599
+Subproject commit fc65ebb5b56b849b1205d5baa2ca38440096652d

externals/vma

@@ -1 +1 @@
-Subproject commit eaf8fc27eeadf6f21b11183651b829e897f01957
+Subproject commit 7942b798289f752dc23b0a79516fd8545febd718

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit 192d051db3382e213f8bd9d8048fc9eaa78ed6ab
+Subproject commit d192041a2fc9c9fd8ae67d8ae3f32c5511541f04

externals/zlib-ng

@@ -1 +1 @@
-Subproject commit 1007e7a9c74148fe915384d7cc44921559500241
+Subproject commit 2e3e5f30a05ee7b113c755ad9a075304e02bc328

src/audio_core/sdl_audio.cpp

@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <SDL3/SDL_audio.h>
+#include <SDL3/SDL_init.h>
+#include <SDL3/SDL_timer.h>
 #include <common/assert.h>
 #include <core/libraries/error_codes.h>
 #include "sdl_audio.h"

src/audio_core/sdl_audio.h

@@ -4,8 +4,7 @@
 #pragma once
 
 #include <mutex>
-#include <SDL.h>
+#include <SDL3/SDL_audio.h>
-
 #include "core/libraries/audio/audioout.h"
 
 namespace Audio {

src/common/config.cpp

@@ -10,7 +10,7 @@
 namespace Config {
 
 static bool isNeo = false;
-static bool isFullscreen = true;
+static bool isFullscreen = false;
 static u32 screenWidth = 1280;
 static u32 screenHeight = 720;
 static s32 gpuId = -1; // Vulkan physical device index. Set to negative for auto select

src/core/libraries/kernel/file_system.cpp

@@ -208,10 +208,11 @@ int PS4_SYSV_ABI sceKernelStat(const char* path, OrbisKernelStat* sb) {
 
 int PS4_SYSV_ABI posix_stat(const char* path, OrbisKernelStat* sb) {
     int result = sceKernelStat(path, sb);
-    if (result < 0) {
+    if (result != 0) {
-        UNREACHABLE(); // TODO
+        LOG_ERROR(Kernel_Pthread, "posix_stat: error = {}", result);
+        result += ORBIS_KERNEL_ERROR_UNKNOWN;
     }
-    return ORBIS_OK;
+    return result;
 }
 
 s64 PS4_SYSV_ABI sceKernelPread(int d, void* buf, size_t nbytes, s64 offset) {

src/core/libraries/kernel/threads/kernel_threads_rwlock.cpp

@@ -201,7 +201,9 @@ int PS4_SYSV_ABI scePthreadRwlockInit(OrbisPthreadRwlock* rwlock,
     if (attr == nullptr || *attr == nullptr) {
         attr = g_pthread_cxt->getDefaultRwattr();
     }
+    if (name != nullptr) {
         (*rwlock)->name = name;
+    }
     int result = pthread_rwlock_init(&(*rwlock)->pth_rwlock, &(*attr)->attr_rwlock);
     if (result != 0) {
         LOG_ERROR(Kernel_Pthread, "scePthreadRwlockInit: error = {}", result);

src/emulator.cpp

@@ -0,0 +1,139 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <common/logging/log.h>
+#include <core/file_format/psf.h>
+#include <core/file_format/splash.h>
+#include <core/libraries/libc/libc.h>
+#include <core/libraries/videoout/video_out.h>
+#include <fmt/core.h>
+#include "common/config.h"
+#include "common/logging/backend.h"
+#include "common/path_util.h"
+#include "common/singleton.h"
+#include "core/file_sys/fs.h"
+#include "core/libraries/kernel/thread_management.h"
+#include "core/libraries/libs.h"
+#include "core/linker.h"
+#include "core/memory.h"
+#include "emulator.h"
+
+Frontend::WindowSDL* g_window = nullptr;
+
+namespace Core {
+
+static constexpr s32 WindowWidth = 1280;
+static constexpr s32 WindowHeight = 720;
+
+Emulator::Emulator() : window{WindowWidth, WindowHeight, controller} {
+    g_window = &window;
+
+    // Initialize memory system as early as possible to reserve mappings.
+    [[maybe_unused]] const auto* memory = Core::Memory::Instance();
+
+    // Read configuration file.
+    const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
+    Config::load(config_dir / "config.toml");
+
+    // Start logger.
+    Common::Log::Initialize();
+    Common::Log::Start();
+
+    // Start discord integration
+    discord_rpc.init();
+    discord_rpc.update(Discord::RPCStatus::Idling, "");
+
+    // Initialize kernel and library facilities.
+    Libraries::Kernel::init_pthreads();
+    Libraries::InitHLELibs(&linker->GetHLESymbols());
+}
+
+Emulator::~Emulator() {
+    const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
+    Config::save(config_dir / "config.toml");
+    discord_rpc.stop();
+}
+
+void Emulator::Run(const std::filesystem::path& file) {
+    // Applications expect to be run from /app0 so mount the file's parent path as app0.
+    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
+    mnt->Mount(file.parent_path(), "/app0");
+
+    // Loading param.sfo file if exists
+    std::filesystem::path sce_sys_folder = file.parent_path() / "sce_sys";
+    if (std::filesystem::is_directory(sce_sys_folder)) {
+        for (const auto& entry : std::filesystem::directory_iterator(sce_sys_folder)) {
+            if (entry.path().filename() == "param.sfo") {
+                auto* param_sfo = Common::Singleton<PSF>::Instance();
+                param_sfo->open(sce_sys_folder.string() + "/param.sfo");
+                std::string id(param_sfo->GetString("CONTENT_ID"), 7, 9);
+                std::string title(param_sfo->GetString("TITLE"));
+                LOG_INFO(Loader, "Game id: {} Title: {}", id, title);
+                u32 fw_version = param_sfo->GetInteger("SYSTEM_VER");
+                std::string app_version = param_sfo->GetString("APP_VER");
+                LOG_INFO(Loader, "Fw: {:#x} App Version: {}", fw_version, app_version);
+            } else if (entry.path().filename() == "pic0.png" ||
+                       entry.path().filename() == "pic1.png") {
+                auto* splash = Common::Singleton<Splash>::Instance();
+                if (splash->IsLoaded()) {
+                    continue;
+                }
+                if (!splash->Open(entry.path().string())) {
+                    LOG_ERROR(Loader, "Game splash: unable to open file");
+                }
+            }
+        }
+    }
+
+    // Load the module with the linker
+    linker->LoadModule(file);
+
+    // check if we have system modules to load
+    LoadSystemModules(file);
+
+    // Check if there is a libc.prx in sce_module folder
+    bool found = false;
+    if (Config::isLleLibc()) {
+        std::filesystem::path sce_module_folder = file.parent_path() / "sce_module";
+        if (std::filesystem::is_directory(sce_module_folder)) {
+            for (const auto& entry : std::filesystem::directory_iterator(sce_module_folder)) {
+                if (entry.path().filename() == "libc.prx" ||
+                    entry.path().filename() == "libSceFios2.prx") {
+                    found = true;
+                    LOG_INFO(Loader, "Loading {}", entry.path().string().c_str());
+                    linker->LoadModule(entry.path());
+                }
+            }
+        }
+    }
+    if (!found) {
+        Libraries::LibC::libcSymbolsRegister(&linker->GetHLESymbols());
+    }
+
+    // start execution
+    std::jthread mainthread =
+        std::jthread([this](std::stop_token stop_token) { linker->Execute(); });
+
+    // Begin main window loop until the application exits
+    static constexpr std::chrono::microseconds FlipPeriod{100000};
+
+    while (window.isOpen()) {
+        window.waitEvent();
+        Libraries::VideoOut::Flip(FlipPeriod);
+        Libraries::VideoOut::Vblank();
+    }
+
+    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

src/emulator.h

@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <filesystem>
+#include <thread>
+
+#include <common/singleton.h>
+#include "common/discord.h"
+#include "core/linker.h"
+#include "input/controller.h"
+#include "sdl_window.h"
+
+namespace Core {
+
+class Emulator {
+public:
+    Emulator();
+    ~Emulator();
+
+    void Run(const std::filesystem::path& file);
+
+private:
+    void LoadSystemModules(const std::filesystem::path& file);
+    Discord::RPC discord_rpc;
+    Input::GameController* controller = Common::Singleton<Input::GameController>::Instance();
+    Core::Linker* linker = Common::Singleton<Core::Linker>::Instance();
+    Frontend::WindowSDL window;
+};
+
+} // namespace Core

src/main.cpp

@@ -1,126 +1,16 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <thread>
+#include <emulator.h>
-#include <SDL3/SDL.h>
-#include <Zydis/Zydis.h>
 #include <fmt/core.h>
 
-#include <core/file_format/psf.h>
-#include "common/config.h"
-#include "common/discord.h"
-#include "common/logging/backend.h"
-#include "common/logging/log.h"
-#include "common/path_util.h"
-#include "common/singleton.h"
-#include "core/file_format/splash.h"
-#include "core/file_sys/fs.h"
-#include "core/libraries/kernel/thread_management.h"
-#include "core/libraries/libc/libc.h"
-#include "core/libraries/libs.h"
-#include "core/libraries/videoout/video_out.h"
-#include "core/linker.h"
-#include "core/memory.h"
-#include "input/controller.h"
-#include "sdl_window.h"
-
-Frontend::WindowSDL* g_window;
-
 int main(int argc, char* argv[]) {
     if (argc == 1) {
         fmt::print("Usage: {} <elf or eboot.bin path>\n", argv[0]);
         return -1;
     }
-    // Initialize memory system as early as possible to reserve mappings.
-    [[maybe_unused]] const auto* memory = Core::Memory::Instance();
-    const auto config_dir = Common::FS::GetUserPath(Common::FS::PathType::UserDir);
-    Config::load(config_dir / "config.toml");
-    Common::Log::Initialize();
-    Common::Log::Start();
-    Libraries::Kernel::init_pthreads();
-    s32 width = Config::getScreenWidth();
-    s32 height = Config::getScreenHeight();
 
-    auto* controller = Common::Singleton<Input::GameController>::Instance();
+    Core::Emulator emulator;
-    Frontend::WindowSDL window{width, height, controller};
+    emulator.Run(argv[1]);
-    g_window = &window;
-
-    // Argument 1 is the path of self file to boot
-    const char* const path = argv[1];
-
-    auto* mnt = Common::Singleton<Core::FileSys::MntPoints>::Instance();
-    std::filesystem::path p = std::string(path);
-    mnt->Mount(p.parent_path(), "/app0");
-
-    // Loading param.sfo file if exists
-    std::filesystem::path sce_sys_folder = p.parent_path() / "sce_sys";
-    if (std::filesystem::is_directory(sce_sys_folder)) {
-        for (const auto& entry : std::filesystem::directory_iterator(sce_sys_folder)) {
-            if (entry.path().filename() == "param.sfo") {
-                auto* param_sfo = Common::Singleton<PSF>::Instance();
-                param_sfo->open(sce_sys_folder.string() + "/param.sfo");
-                std::string id(param_sfo->GetString("CONTENT_ID"), 7, 9);
-                std::string title(param_sfo->GetString("TITLE"));
-                LOG_INFO(Loader, "Game id: {} Title: {}", id, title);
-                u32 fw_version = param_sfo->GetInteger("SYSTEM_VER");
-                std::string app_version = param_sfo->GetString("APP_VER");
-                LOG_INFO(Loader, "Fw: {:#x} App Version: {}", fw_version, app_version);
-            } else if (entry.path().filename() == "pic0.png" ||
-                       entry.path().filename() == "pic1.png") {
-                auto* splash = Common::Singleton<Splash>::Instance();
-                if (splash->IsLoaded()) {
-                    continue;
-                }
-                if (!splash->Open(entry.path().string())) {
-                    LOG_ERROR(Loader, "Game splash: unable to open file");
-                }
-            }
-        }
-    }
-
-    auto linker = Common::Singleton<Core::Linker>::Instance();
-    Libraries::InitHLELibs(&linker->GetHLESymbols());
-    linker->LoadModule(path);
-
-    // check if we have system modules to load
-    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().string().c_str());
-        }
-    }
-    // Check if there is a libc.prx in sce_module folder
-    bool found = false;
-    if (Config::isLleLibc()) {
-        std::filesystem::path sce_module_folder = p.parent_path() / "sce_module";
-        if (std::filesystem::is_directory(sce_module_folder)) {
-            for (const auto& entry : std::filesystem::directory_iterator(sce_module_folder)) {
-                if (entry.path().filename() == "libc.prx" ||
-                    entry.path().filename() == "libSceFios2.prx") {
-                    found = true;
-                    LOG_INFO(Loader, "Loading {}", entry.path().string().c_str());
-                    linker->LoadModule(entry.path().string().c_str());
-                }
-            }
-        }
-    }
-    if (!found) {
-        Libraries::LibC::libcSymbolsRegister(&linker->GetHLESymbols());
-    }
-    std::thread mainthread([linker]() { linker->Execute(); });
-    Discord::RPC discordRPC;
-    discordRPC.init();
-    discordRPC.update(Discord::RPCStatus::Idling, "");
-
-    static constexpr std::chrono::microseconds FlipPeriod{100000};
-
-    while (window.isOpen()) {
-        window.waitEvent();
-        Libraries::VideoOut::Flip(FlipPeriod);
-        Libraries::VideoOut::Vblank();
-    }
-
-    discordRPC.stop();
     return 0;
 }

src/sdl_window.cpp

@@ -1,8 +1,10 @@
 // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <SDL.h>
+#include <SDL3/SDL_events.h>
-
+#include <SDL3/SDL_init.h>
+#include <SDL3/SDL_properties.h>
+#include <SDL3/SDL_video.h>
 #include "common/assert.h"
 #include "common/config.h"
 #include "common/version.h"