raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-21 03:16:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

loader: preserve TLS patch instruction boundaries

Browse Source
This commit is contained in:
nmzik
2026-08-24 07:06:59 +02:00
parent 6eed46b024
commit ffd07dbfce
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loader/runtimeLinker.cpp
+6 -8
View File
@@ -1163,7 +1163,6 @@ static void PatchProgram(Program* program, uint64_t address, uint64_t size) {
prefix_count++; prefix_count++;
} }
const size_t inst_size = prefix_count + Jit::Call9::GetSize();
if (inst_ptr + Jit::Call9::GetSize() > start_ptr + size) { if (inst_ptr + Jit::Call9::GetSize() > start_ptr + size) {
break; break;
} }
@@ -1172,20 +1171,19 @@ static void PatchProgram(Program* program, uint64_t address, uint64_t size) {
if (memcmp(inst_ptr, tls_pattern, 3) == 0 && (modrm & 0xc7u) == 0x04u && if (memcmp(inst_ptr, tls_pattern, 3) == 0 && (modrm & 0xc7u) == 0x04u &&
inst_ptr[4] == tls_pattern[4] && inst_ptr[4] == tls_pattern[4] &&
*reinterpret_cast<const uint32_t*>(inst_ptr + 5) == 0) { *reinterpret_cast<const uint32_t*>(inst_ptr + 5) == 0) {
LOGF("Patch tls at addr: [%016" PRIx64 "]\n", reinterpret_cast<uint64_t>(ptr)); LOGF("Patch tls at addr: [%016" PRIx64 "]\n",
reinterpret_cast<uint64_t>(inst_ptr));
const auto reg = (modrm >> 3u) & 7u; const auto reg = (modrm >> 3u) & 7u;
EXIT_NOT_IMPLEMENTED(reg == 4u); EXIT_NOT_IMPLEMENTED(reg == 4u);
auto* code = new (ptr) Jit::Call9; // Preserve leading 0x66 bytes: a raw scan can encounter one in the preceding
// instruction before reaching the actual fs load.
auto* code = new (inst_ptr) Jit::Call9;
code->SetFunc(reg == 0 code->SetFunc(reg == 0
? program->tls.handler_vaddr ? program->tls.handler_vaddr
: program->tls.handler_vaddr + Jit::TlsRegStub::GetOffset(reg)); : program->tls.handler_vaddr + Jit::TlsRegStub::GetOffset(reg));
if (inst_size > Jit::Call9::GetSize()) { ptr += prefix_count + Jit::Call9::GetSize() - 1;
std::memset(ptr + Jit::Call9::GetSize(), 0x90,
inst_size - Jit::Call9::GetSize());
}
ptr += inst_size - 1;
} }
} }
} }