RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-02-01 13:25:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[rpcsx-os/linker] Fix so name

Browse source
This commit is contained in:
DH 2023-07-01 15:43:56 +03:00
parent 1220454a87
commit 8f79685f77
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
rpcsx-os/linker.cpp
View file

@ -527,6 +527,26 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
orbis::Relocation *nonPltRelocations = nullptr;
std::size_t nonPltRelocationCount = 0;
auto patchSoName = [](std::string_view name) {
if (name.ends_with(".prx")) {
name.remove_suffix(4);
}
if (name.ends_with("-PRX")) {
name.remove_suffix(4); // TODO: implement lib scan
}
if (name.ends_with("-module")) {
name.remove_suffix(7); // TODO: implement lib scan
}
if (name.ends_with("_padebug")) {
name.remove_suffix(8);
}
if (name.ends_with("_sys")) {
name.remove_suffix(4);
}
return name;
};
for (auto dyn : dyns) {
// std::printf("%s: %lx", toString((OrbisElfDynamicType)dyn.d_tag),
// dyn.d_un.d_val);
@ -553,9 +573,9 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
}
if (dyn.d_tag == kElfDynamicTypeSoName) {
std::strncpy(result->soName,
sceStrtab + static_cast<std::uint32_t>(dyn.d_un.d_val),
sizeof(result->soName));
auto name = patchSoName(sceStrtab + static_cast<std::uint32_t>(dyn.d_un.d_val));
std::memcpy(result->soName, name.data(), name.size());
std::memcpy(result->soName + name.size(), ".prx", sizeof(".prx"));
}
if (dyn.d_tag == kElfDynamicTypeNeeded) {
@ -565,19 +585,7 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
// HACK for broken FWs
result->needed.push_back("libSceDolbyVision");
} else {
if (name.ends_with(".prx")) {
name.remove_suffix(4);
}
if (name.ends_with("-PRX")) {
name.remove_suffix(4); // TODO: implement lib scan
}
if (name.ends_with("-module")) {
name.remove_suffix(7); // TODO: implement lib scan
}
if (name.ends_with("_padebug")) {
name.remove_suffix(8);
}
name = patchSoName(name);
if (name != "libSceFreeTypeOptBm") { // TODO
result->needed.push_back(std::string(name));
result->needed.back() += ".prx";
@ -836,7 +844,7 @@ Ref<orbis::Module> rx::linker::loadModuleFile(const char *path,
static Ref<orbis::Module> createSceFreeTypeFull(orbis::Process *process) {
auto result = orbis::create<orbis::Module>();
std::strncpy(result->soName, "libSceFreeTypeFull-PRX.prx",
std::strncpy(result->soName, "libSceFreeTypeFull.prx",
sizeof(result->soName) - 1);
std::strncpy(result->moduleName, "libSceFreeType",
sizeof(result->moduleName) - 1);
@ -848,7 +856,7 @@ static Ref<orbis::Module> createSceFreeTypeFull(orbis::Process *process) {
{"libSceFreeTypeSubFunc", "libSceFreeTypeOl", "libSceFreeTypeOt",
"libSceFreeTypeOptOl", "libSceFreeTypeHinter"}) {
result->needed.push_back(dep);
result->needed.back() += "-PRX.prx";
result->needed.back() += ".prx";
}
for (auto needed : result->needed) {

2
rpcsx-os/main.cpp
View file

@ -460,7 +460,7 @@ static int ps4Exec(orbis::Process *mainProcess,
std::vector<std::uint64_t> envpOffsets;
auto libkernel = rx::linker::loadModuleFile(
"/system/common/lib/libkernel.sprx", mainProcess);
"/system/common/lib/libkernel_sys.sprx", mainProcess);
// *reinterpret_cast<std::uint32_t *>(
// reinterpret_cast<std::byte *>(libkernel->base) + 0x6c2e4) = ~0;