mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-09 13:19:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

extend IPC functionalities (#3545)

Browse Source 
* extend IPC

* clang

* clang
This commit is contained in:
Fire Cube
2025-09-09 23:57:42 +02:00
committed by GitHub
parent e885d52ad0
commit c05695fde5
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/memory_patcher.cpp
View File

@@ -123,7 +123,6 @@ std::string convertValueToHex(const std::string type, const std::string valueStr
void ApplyPendingPatches(); void ApplyPendingPatches();
void OnGameLoaded() { void OnGameLoaded() {
if (!patchFile.empty()) { if (!patchFile.empty()) {
std::filesystem::path patchDir = Common::FS::GetUserPath(Common::FS::PathType::PatchesDir); std::filesystem::path patchDir = Common::FS::GetUserPath(Common::FS::PathType::PatchesDir);
@@ -201,16 +200,11 @@ void OnGameLoaded() {
} }
} }
} }
ApplyPendingPatches();
return;
} else { } else {
LOG_ERROR(Loader, "couldnt patch parse xml : {}", result.description()); LOG_ERROR(Loader, "couldnt patch parse xml : {}", result.description());
} }
ApplyPendingPatches();
return;
} }
ApplyPendingPatches();
#ifdef ENABLE_QT_GUI #ifdef ENABLE_QT_GUI
// We use the QT headers for the xml and json parsing, this define is only true on QT builds // We use the QT headers for the xml and json parsing, this define is only true on QT builds

28
src/core/ipc/ipc.cpp
View File

@@ -6,9 +6,14 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <SDL3/SDL.h>
#include "common/memory_patcher.h" #include "common/memory_patcher.h"
#include "common/thread.h" #include "common/thread.h"
#include "common/types.h" #include "common/types.h"
#include "core/debug_state.h"
#include "input/input_handler.h"
#include "sdl_window.h"
/** /**
* Protocol summary: * Protocol summary:
@@ -28,7 +33,7 @@
* and ended by * and ended by
* #IPC_END * #IPC_END
* In between, it will send the current capabilities and commands before the emulator start * In between, it will send the current capabilities and commands before the emulator start
* - The IPC client(e.g., launcher) will send RUN then START to conintue the execution * - The IPC client(e.g., launcher) will send RUN then START to continue the execution
**/ **/
/** /**
@@ -43,6 +48,10 @@
* target: str, size: str, isOffset: number, littleEndian: number, * target: str, size: str, isOffset: number, littleEndian: number,
* patchMask: number, maskOffset: number * patchMask: number, maskOffset: number
* ): add a memory patch, check @ref MemoryPatcher::PatchMemory for details * ): add a memory patch, check @ref MemoryPatcher::PatchMemory for details
* - PAUSE: pause the game execution
* - RESUME: resume the game execution
* - STOP: stop and quit the emulator
* - TOGGLE_FULLSCREEN: enable / disable fullscreen
* - OUTPUT CMD: * - OUTPUT CMD:
* - N/A * - N/A
**/ **/
@@ -61,6 +70,7 @@ void IPC::Init() {
std::cerr << ";#IPC_ENABLED\n"; std::cerr << ";#IPC_ENABLED\n";
std::cerr << ";ENABLE_MEMORY_PATCH\n"; std::cerr << ";ENABLE_MEMORY_PATCH\n";
std::cerr << ";ENABLE_EMU_CONTROL\n";
std::cerr << ";#IPC_END\n"; std::cerr << ";#IPC_END\n";
std::cerr.flush(); std::cerr.flush();
@@ -106,8 +116,22 @@ void IPC::InputLoop() {
entry.patchMask = static_cast<MemoryPatcher::PatchMask>(next_u64()); entry.patchMask = static_cast<MemoryPatcher::PatchMask>(next_u64());
entry.maskOffset = static_cast<int>(next_u64()); entry.maskOffset = static_cast<int>(next_u64());
MemoryPatcher::AddPatchToQueue(entry); MemoryPatcher::AddPatchToQueue(entry);
} else if (cmd == "PAUSE") {
DebugState.PauseGuestThreads();
} else if (cmd == "RESUME") {
DebugState.ResumeGuestThreads();
} else if (cmd == "STOP") {
SDL_Event event;
SDL_memset(&event, 0, sizeof(event));
event.type = SDL_EVENT_QUIT;
SDL_PushEvent(&event);
} else if (cmd == "TOGGLE_FULLSCREEN") {
SDL_Event event;
SDL_memset(&event, 0, sizeof(event));
event.type = SDL_EVENT_TOGGLE_FULLSCREEN;
SDL_PushEvent(&event);
} else { } else {
std::cerr << "UNKNOWN CMD: " << cmd << std::endl; std::cerr << ";UNKNOWN CMD: " << cmd << std::endl;
} }
} }
} }