IPC messaging system

.vscode/launch.json

@@ -7,15 +7,31 @@
       "request": "launch",
       "program": "${workspaceRoot}/_build/_Install/psoff.exe",
       "args": [
-        "--d",
+        // "--d",
+        // "--vkValidation",
         "${config:psoff.add-arg}",
-        "--file=${config:psoff.game-path}/eboot.bin",
+        "--file=${config:psoff.game-path}/eboot.bin"
       ],
       "stopAtEntry": false,
       "cwd": "${workspaceRoot}/_build/_Install",
       "environment": [],
       "console": "integratedTerminal",
       "symbolSearchPath": "${workspaceRoot}/_build/_Install/debug"
+    },
+    {
+      "name": "(Windows) Attach",
+      "type": "cppvsdbg",
+      "request": "attach",
+      "processId": "${command:pickProcess}"
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Launch + Attach",
+      "configurations": [
+        "(Windows) Launch",
+        "(Windows) Attach"
+      ]
     }
   ]
 }

CMakeLists.txt

@@ -8,10 +8,10 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 
-set(PSOFF_LIB_VERSION v.0.3)
+set(PSOFF_LIB_VERSION v.0.4)
 set(PSOFF_RENDER_VERSION v.0.6-nightly_08.06.2024)
 
-set(ProjectName psOff_${CMAKE_BUILD_TYPE})
+set(ProjectName psOffChild_${CMAKE_BUILD_TYPE})
 project(${ProjectName} VERSION 0.0.1)
 
 unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
@@ -20,11 +20,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_INSTALL_MESSAGE LAZY)
 
+set(CMAKE_CXX_FLAGS_RELEASE "/MD /GS- /GF /Gy /GR /Oi -fno-strict-aliasing -Wno-unused-command-line-argument")
+
 if(ISDEBUG)
-  set(CMAKE_CXX_FLAGS_RELEASE "/MD /Zi /GS- /GF /Gy /GR /Oi -O0 -fno-strict-aliasing")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi -O0")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG /OPT:REF,ICF")
 else()
-  set(CMAKE_CXX_FLAGS_RELEASE "/MD /GS- /GF /Gy /GR /Oi -Ofast -fno-strict-aliasing")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF,ICF")
 endif()
 
@@ -101,6 +103,8 @@ add_subdirectory(tools/logging)
 add_subdirectory(tools/config_emu)
 add_subdirectory(tools/dll2Nids)
 
+add_subdirectory(mainprocess)
+
 add_subdirectory(eventsystem)
 add_dependencies(dll2Nids third_party)
 
@@ -185,13 +189,13 @@ set_target_properties(core
 )
 
 # ## Executable
-add_executable(psoff
+add_executable(psOffChild
   main.cpp
 )
 
-add_dependencies(psoff logging core psOff_utility gamereport)
+add_dependencies(psOffChild logging core eventsystem psOff_utility gamereport)
 
-target_link_libraries(psoff PRIVATE
+target_link_libraries(psOffChild PRIVATE
   eventsystem
   core.lib
   gamereport.lib
@@ -200,9 +204,9 @@ target_link_libraries(psoff PRIVATE
   $<TARGET_OBJECTS:asmHelper>
 )
 
-target_link_options(psoff PUBLIC /DYNAMICBASE:NO /DEBUG --image-base=${IMAGE_BASE})
+target_link_options(psOffChild PUBLIC /DYNAMICBASE:NO /DEBUG --image-base=${IMAGE_BASE})
 
-set_property(TARGET psoff PROPERTY VS_DPI_AWARE "PerMonitor") # SDL2 High dpi window
+set_property(TARGET psOffChild PROPERTY VS_DPI_AWARE "PerMonitor") # SDL2 High dpi window
 
 # # Install
 install(DIRECTORY "${CMAKE_BINARY_DIR}/third_party/src/third_party/bin/" DESTINATION ${CMAKE_INSTALL_PREFIX}
@@ -225,16 +229,17 @@ if(DEFINED ISACTION)
   file(GENERATE OUTPUT ${CMAKE_BINARY_DIR}/bin/vulkan-1.dll CONTENT "") # cmake needs to find the file in order to ignore it
 endif()
 
-install(TARGETS psoff
-  COMPONENT psoff
+install(TARGETS psOffChild
+  COMPONENT psOffChild
   RUNTIME_DEPENDENCIES
   PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-"
   POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" ".*vulkan-1\\.dll"
 
   DIRECTORIES
-  $<TARGET_FILE_DIR:psoff>
+  $<TARGET_FILE_DIR:psOffChild>
   ${CMAKE_BINARY_DIR}/third_party/src/third_party/bin
   ${CMAKE_BINARY_DIR}/third_party/src/third_party/lib
+  ${CMAKE_BINARY_DIR}/eventsystem/lib
   ${CMAKE_BINARY_DIR}/bin
   ${CMAKE_BINARY_DIR}/lib
   ${CMAKE_CURRENT_BINARY_DIR}/core
@@ -243,4 +248,4 @@ install(TARGETS psoff
   DESTINATION .
 )
 
-install(FILES $<TARGET_PDB_FILE:psoff> DESTINATION ${CMAKE_INSTALL_PREFIX}/debug OPTIONAL)
+install(FILES $<TARGET_PDB_FILE:psOffChild> DESTINATION ${CMAKE_INSTALL_PREFIX}/debug OPTIONAL)

core/CMakeLists.txt

@@ -7,4 +7,4 @@ add_subdirectory(fileManager)
 add_subdirectory(memory)
 add_subdirectory(dmem)
 add_subdirectory(unwinding)
-add_subdirectory(runtime)
+add_subdirectory(runtime)

core/initParams/initParams.cpp

@@ -14,10 +14,6 @@ class InitParams: public IInitParams {
   bool init(int argc, char** argv) final;
   bool isDebug() final;
 
-  std::string getApplicationPath() final;
-  std::string getApplicationRoot() final;
-  std::string getUpdateRoot() final;
-
   bool enableValidation() final;
   bool enableBrightness() final;
   bool useVSYNC() final;
@@ -38,9 +34,6 @@ bool InitParams::init(int argc, char** argv) {
   ("bright", "use srgb display format (brightness)")
   ("4k", "try 4K display mode if game supports it")
   ("vsync", po::value<bool>()->default_value(true), "Enable vertical synchronization")
-  ("file", po::value<std::string>(), "fullpath to applications binary")
-  ("root", po::value<std::string>(), "Applications root")
-  ("update", po::value<std::string>(), "update files folder")
       // clang-format on
       ;
 
@@ -55,10 +48,6 @@ bool InitParams::init(int argc, char** argv) {
     std::cout << desc << '\n';
     return false;
   }
-  if (m_vm.count("file") == 0) {
-    std::cout << "--file missing\n";
-    return false;
-  }
 
   return true;
 }
@@ -72,18 +61,6 @@ bool InitParams::isDebug() {
   return m_vm.count("d");
 }
 
-std::string InitParams::getApplicationPath() {
-  return m_vm.count("file") ? m_vm["file"].as<std::string>() : std::string();
-}
-
-std::string InitParams::getApplicationRoot() {
-  return m_vm.count("root") ? m_vm["root"].as<std::string>() : std::string();
-}
-
-std::string InitParams::getUpdateRoot() {
-  return m_vm.count("update") ? m_vm["update"].as<std::string>() : std::string();
-}
-
 bool InitParams::enableValidation() {
   return m_vm.count("vkValidation");
 }

core/initParams/initParams.h

@@ -13,10 +13,6 @@ class IInitParams {
   virtual bool init(int argc, char** argv) = 0;
   virtual bool isDebug()                   = 0;
 
-  virtual std::string getApplicationPath() = 0;
-  virtual std::string getApplicationRoot() = 0;
-  virtual std::string getUpdateRoot()      = 0;
-
   virtual bool enableValidation() = 0;
   virtual bool enableBrightness() = 0;
   virtual bool useVSYNC()         = 0;
@@ -34,4 +30,4 @@ class IInitParams {
 #endif
 
 __APICALL IInitParams* accessInitParams();
-#undef __APICALL
+#undef __APICALL

core/runtime/runtimeExport.h

@@ -85,7 +85,7 @@ class IRuntimeExport {
 
   virtual std::vector<const char*> const& getEntryParams() const = 0;
 
-  virtual void addEntryParam(std::string const& arg) = 0;
+  virtual void addEntryParam(std::string_view const arg) = 0;
 
   virtual void cxa_add_atexit(CxaDestructor&&, int moduleId) = 0;
   virtual void cxa_finalize(int moduleId)                    = 0;

core/runtime/runtimeLinker.cpp

@@ -259,7 +259,7 @@ class RuntimeLinker: public IRuntimeLinker {
 
   int loadStartModule(std::filesystem::path const& path, size_t args, const void* argp, int* pRes) final;
 
-  uintptr_t execute() final;
+  uintptr_t relocate() final;
 
   void stopModules() final;
   void stopModule(int moduleId) final;
@@ -413,7 +413,7 @@ class RuntimeLinker: public IRuntimeLinker {
 
   std::vector<const char*> const& getEntryParams() const final { return m_entryParams; };
 
-  void addEntryParam(std::string const& arg) final {
+  void addEntryParam(std::string_view const arg) final {
     auto& item = m_argsSave.emplace_back(arg);
     m_entryParams.push_back(item.data());
   }
@@ -886,9 +886,9 @@ bool RuntimeLinker::interceptInternal(Program* prog, uintptr_t progoffset, uintp
   return true;
 }
 
-uintptr_t RuntimeLinker::execute() {
+uintptr_t RuntimeLinker::relocate() {
   LOG_USE_MODULE(RuntimeLinker);
-  LOG_INFO(L"Execute()");
+  LOG_INFO(L"Relocate()");
 
   initTlsStaticBlock();
   // pthread::initSelfForMainThread(m_tlsStaticInitBlock.size()); // call before runtimelinker

core/runtime/runtimeLinker.h

@@ -21,7 +21,7 @@ class IRuntimeLinker: public IRuntimeExport {
   virtual Program* findProgram(uint64_t vaddr)      = 0;
   virtual Program* findProgramById(size_t id) const = 0;
 
-  virtual uintptr_t execute()     = 0;
+  virtual uintptr_t relocate()    = 0;
   virtual void      stopModules() = 0;
 
   virtual void stopModule(int id) = 0;

eventsystem/CMakeLists.txt

@@ -1,18 +1,31 @@
 add_subdirectory(events/template)
+add_subdirectory(events/system_cross)
+add_subdirectory(events/system_circle)
 add_subdirectory(test)
 
 add_library(eventsystem_core SHARED
   $<TARGET_OBJECTS:events_intern_template>
+  $<TARGET_OBJECTS:events_intern_system_cross>
+  $<TARGET_OBJECTS:events_intern_system_circle>
 )
 
 add_library(eventsystem STATIC
   $<TARGET_OBJECTS:events_template>
+  $<TARGET_OBJECTS:events_system_cross>
+  $<TARGET_OBJECTS:events_system_circle>
 )
 
-target_link_libraries(eventsystem PUBLIC eventsystem_core.lib)
-target_link_directories(eventsystem PUBLIC ${CMAKE_BINARY_DIR}/eventsystem/lib)
+target_link_libraries(eventsystem_core PUBLIC libboost_serialization)
+target_link_directories(eventsystem_core PUBLIC
+  ${CMAKE_BINARY_DIR}/third_party/src/third_party/include
+)
+
+target_link_libraries(eventsystem PUBLIC eventsystem_core.lib libboost_serialization)
+target_link_directories(eventsystem PUBLIC
+  ${CMAKE_BINARY_DIR}/eventsystem/lib
+)
 
-add_dependencies(eventsystem eventsystem_core)
+add_dependencies(eventsystem eventsystem_core third_party)
 
 install(TARGETS eventsystem_core LIBRARY DESTINATION .)
 
@@ -28,4 +41,4 @@ set_target_properties(eventsystem_core
   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/eventsystem/lib"
   ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/eventsystem/bin"
   PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/"
-)
+)

eventsystem/events/system_circle/CMakeLists.txt

@@ -0,0 +1,16 @@
+add_library(events_system_circle OBJECT
+  events.cpp
+  handler.cpp
+)
+
+add_dependencies(events_system_circle third_party)
+
+target_compile_definitions(events_system_circle PUBLIC _CRT_SECURE_NO_WARNINGS)
+
+add_library(events_intern_system_circle OBJECT
+  intern/core.cpp
+)
+
+add_dependencies(events_intern_system_circle third_party)
+
+target_compile_definitions(events_intern_system_circle PUBLIC _CRT_SECURE_NO_WARNINGS)

eventsystem/events/system_circle/events.cpp

@@ -0,0 +1,44 @@
+#include "events.h"
+
+#include "intern/export.h"
+
+#include <boost/archive/binary_oarchive.hpp>
+#include <boost/serialization/string.hpp>
+#include <sstream>
+
+// todo use boost archive
+
+namespace events::system_circle {
+void initChild() {
+  core::initChild();
+}
+
+void postEventLoadExec(LoadArgs const& data) {
+  std::vector<char> cont;
+
+  std::ostringstream              oss(std::ios::binary);
+  boost::archive::binary_oarchive oa(oss);
+  oa << (int32_t)0;
+  oa << data;
+
+  core::postEvent(oss.str());
+}
+
+void postEventSetArguments(SetArg const& data) {
+  std::vector<char> cont;
+
+  std::ostringstream              oss(std::ios::binary);
+  boost::archive::binary_oarchive oa(oss);
+  oa << (int32_t)1;
+  oa << data;
+
+  core::postEvent(oss.str());
+}
+
+void postEventRunExec() {
+  std::ostringstream              oss(std::ios::binary);
+  boost::archive::binary_oarchive oa(oss);
+  oa << (int32_t)2;
+  core::postEvent(oss.str());
+}
+} // namespace events::system_circle

eventsystem/events/system_circle/events.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "types.h"
+
+namespace events::system_circle {
+
+void initChild();
+
+void postEventLoadExec(LoadArgs const& data);
+void postEventSetArguments(SetArg const& data);
+void postEventRunExec();
+} // namespace events::system_circle

eventsystem/events/system_circle/handler.cpp

@@ -0,0 +1,9 @@
+#include "handler.h"
+
+#include "intern/export.h"
+
+namespace events::system_circle {
+IEventHandler::IEventHandler() {
+  core::registerSelf(this);
+}
+} // namespace events::system_circle

eventsystem/events/system_circle/handler.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "types.h"
+
+namespace events::system_circle {
+class IEventHandler {
+  protected:
+  IEventHandler();
+
+  public:
+  virtual ~IEventHandler() = default;
+
+  virtual void onEventLoadExec(LoadArgs const& data)   = 0;
+  virtual void onEventSetArguments(SetArg const& data) = 0;
+};
+} // namespace events::system_circle