RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-20 15:40:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[orbis-os] Fix freetype initialization

Browse source
This commit is contained in:
DH 2023-07-19 23:28:23 +03:00
parent 81adffbddc
commit 2ca090345a
3 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
orbis-kernel/include/orbis/module/Module.hpp
View file

@ -18,7 +18,7 @@ struct Process;
struct ModuleNeeded {
utils::kstring name;
std::uint16_t version;
std::uint16_t attr;
std::uint64_t attr;
bool isExport;
};
@ -92,8 +92,8 @@ struct Module final {
ptr<uint64_t> pltGot{};
uint64_t attributes{};
uint16_t version{};
uint16_t attributes{};
uint16_t type{};
uint16_t flags{};
uint64_t entryPoint{};

35
rpcsx-os/linker.cpp
View file

@ -571,6 +571,8 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
std::strncpy(result->moduleName,
sceStrtab + static_cast<std::uint32_t>(dyn.d_un.d_val),
sizeof(result->moduleName));
} else if (dyn.d_tag == kElfDynamicTypeSceModuleAttr) {
result->attributes = dyn.d_un.d_val;
}
if (dyn.d_tag == kElfDynamicTypeSoName) {
@ -585,7 +587,7 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
sceStrtab + static_cast<std::uint32_t>(dyn.d_un.d_val));
if (name == "STREQUAL") {
// HACK for broken FWs
result->needed.push_back("libSceDolbyVision");
result->needed.push_back("libSceDolbyVision.prx");
} else {
name = patchSoName(name);
if (name != "libSceFreeTypeOptBm") { // TODO
@ -609,6 +611,7 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
auto &mod = result->neededModules[it->second];
mod.name = sceStrtab + static_cast<std::uint32_t>(dyn.d_un.d_val);
mod.attr = static_cast<std::uint16_t>(dyn.d_un.d_val >> 32);
mod.isExport = false;
} else if (dyn.d_tag == kElfDynamicTypeSceImportLib ||
dyn.d_tag == kElfDynamicTypeSceExportLib) {
@ -623,6 +626,18 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
lib.name = sceStrtab + static_cast<std::uint32_t>(dyn.d_un.d_val);
lib.isExport = dyn.d_tag == kElfDynamicTypeSceExportLib;
} else if (dyn.d_tag == kElfDynamicTypeSceExportLibAttr ||
dyn.d_tag == kElfDynamicTypeSceImportLibAttr) {
auto [it, inserted] = idToLibraryIndex.try_emplace(
dyn.d_un.d_val >> 48, result->neededLibraries.size());
if (inserted) {
result->neededLibraries.emplace_back();
}
auto &lib = result->neededLibraries[it->second];
lib.attr = dyn.d_un.d_val & ((static_cast<std::uint64_t>(1) << 48) - 1);
}
switch (dyn.d_tag) {
@ -800,9 +815,20 @@ Ref<orbis::Module> rx::linker::loadModule(std::span<std::byte> image,
result->proc = process;
std::printf("Loaded module '%s' from object '%s', id: %u, address: %p - %p\n",
result->moduleName, result->soName, (unsigned)result->id,
result->base, (char *)result->base + result->size);
std::printf("Loaded module '%s' (%lx) from object '%s', address: %p - %p\n",
result->moduleName, (unsigned long)result->attributes,
result->soName, result->base,
(char *)result->base + result->size);
for (auto mod : result->neededModules) {
std::printf(" needed module '%s' (%lx)\n", mod.name.c_str(),
(unsigned long)mod.attr);
}
for (auto lib : result->neededLibraries) {
std::printf(" needed library '%s' (%lx), kind %s\n", lib.name.c_str(),
(unsigned long)lib.attr, lib.isExport ? "export" : "import");
}
if (tlsPhdrIndex >= 0 /* result->tlsSize != 0 */) {
result->tlsIndex = process->nextTlsSlot++;
@ -877,7 +903,6 @@ static Ref<orbis::Module> createSceFreeTypeFull(orbis::Process *process) {
result->initProc = reinterpret_cast<void *>(+[] {});
result->finiProc = reinterpret_cast<void *>(+[] {});
result->id = process->modulesMap.insert(result);
result->proc = process;
return result;

9
rpcsx-os/ops.cpp
View file

@ -62,10 +62,11 @@ loadPrx(orbis::Thread *thread, std::string_view name, bool relocate,
}
}
std::printf("Loaded '%s'\n", module->soName);
loadedObjects[module->soName] = module.get();
loadedModules[module->moduleName] = module.get();
if (loadedModules.try_emplace(module->moduleName, module.get()).second) {
std::printf("Setting '%s' as '%s' module\n", module->soName,
module->moduleName);
}
for (auto &needed : module->needed) {
auto [result, neededModule] =
@ -98,6 +99,8 @@ loadPrx(orbis::Thread *thread, std::string_view name, bool relocate,
}
module->id = thread->tproc->modulesMap.insert(module);
std::fprintf(stderr, "'%s' ('%s') was loaded with id '%u'\n",
module->moduleName, module->soName, (unsigned)module->id);
return {{}, module};
}