mirror/PS2Recomp
1
0
Fork 0
mirror of https://github.com/ran-j/PS2Recomp.git synced 2026-10-02 10:46:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: auto set runtime internal stubs and syscalls on recompiled code

Browse Source
This commit is contained in:
Ran-j
2026-01-27 17:12:35 -03:00
parent 7b3fee9247
commit b1f86a7597
6 changed files with 254 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ps2xRecomp/CMakeLists.txt
+10 -5
View File
@@ -37,13 +37,14 @@ file(GLOB_RECURSE PS2RECOMP_HEADERS
"include/*.h"
"include/*.hpp"
)
add_executable(ps2recomp ${PS2RECOMP_SOURCES})
add_library(ps2_recomp STATIC ${PS2RECOMP_SOURCES})
target_include_directories(ps2recomp PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/../ps2xRuntime/include
${elfio_SOURCE_DIR}
)
@@ -51,7 +52,11 @@ target_include_directories(ps2_recomp PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include
${elfio_SOURCE_DIR}
)
target_include_directories(ps2_recomp PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../ps2xRuntime/include
)
target_link_libraries(ps2recomp PRIVATE
fmt::fmt
toml11::toml11
@@ -61,7 +66,7 @@ target_link_libraries(ps2_recomp PUBLIC
fmt::fmt
toml11::toml11
)
install(TARGETS ps2recomp ps2_recomp
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ps2xRecomp/src/ps2_recompiler.cpp
+46 -2
View File
@@ -1,5 +1,6 @@
#include "ps2recomp/ps2_recompiler.h"
#include "ps2recomp/instructions.h"
#include "ps2_runtime_calls.h"
#include <iostream>
#include <fstream>
#include <sstream>
@@ -15,6 +16,28 @@ namespace fs = std::filesystem;
namespace ps2recomp
{
namespace
{
enum class StubTarget
{
Unknown,
Syscall,
Stub
};
StubTarget resolveStubTarget(const std::string &name)
{
if (ps2_runtime_calls::isSyscallName(name))
{
return StubTarget::Syscall;
}
if (ps2_runtime_calls::isStubName(name))
{
return StubTarget::Stub;
}
return StubTarget::Unknown;
}
}
PS2Recompiler::PS2Recompiler(const std::string &configPath)
: m_configManager(configPath)
@@ -234,7 +257,22 @@ namespace ps2recomp
std::string generatedName = m_codeGenerator->getGeneratedFunctionName(function);
std::stringstream stub;
stub << "void " << generatedName
<< "(uint8_t* rdram, R5900Context* ctx, PS2Runtime *runtime) { ps2_syscalls::TODO(rdram, ctx, runtime); }";
<< "(uint8_t* rdram, R5900Context* ctx, PS2Runtime *runtime) { ";
switch (resolveStubTarget(function.name))
{
case StubTarget::Syscall:
stub << "ps2_syscalls::" << function.name << "(rdram, ctx, runtime); ";
break;
case StubTarget::Stub:
stub << "ps2_stubs::" << function.name << "(rdram, ctx, runtime); ";
break;
default:
stub << "ps2_syscalls::TODO(rdram, ctx, runtime); ";
break;
}
stub << "}";
m_generatedStubs[function.start] = stub.str();
}
}
@@ -250,6 +288,7 @@ namespace ps2recomp
combinedOutput << "#include \"ps2_runtime.h\"\n";
combinedOutput << "#include \"ps2_recompiled_stubs.h\"\n";
combinedOutput << "#include \"ps2_syscalls.h\"\n";
combinedOutput << "#include \"ps2_stubs.h\"\n";
if (m_bootstrapInfo.valid)
{
combinedOutput << "\n"
@@ -315,7 +354,12 @@ namespace ps2recomp
{
if (function.isStub)
{
code = m_generatedStubs[function.start];
std::stringstream stubFile;
stubFile << "#include \"ps2_runtime.h\"\n";
stubFile << "#include \"ps2_syscalls.h\"\n";
stubFile << "#include \"ps2_stubs.h\"\n\n";
stubFile << m_generatedStubs[function.start] << "\n";
code = stubFile.str();
}
else
{