catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully also run threads via the emulator

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2024-07-08 01:43:13 +03:00
parent 47f4234e81
commit 4503ffde35
4 changed files with 131 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/libraries/kernel/thread_management.cpp
View File

@ -933,7 +933,8 @@ static void* run_thread(void* arg) {
g_pthread_self = thread;
pthread_cleanup_push(cleanup_thread, thread);
thread->is_started = true;
ret = thread->entry(thread->arg);
//ret = thread->entry(thread->arg);
ret = Core::RunThread((VAddr)thread->entry, thread->arg);
pthread_cleanup_pop(1);
return ret;
}

97
src/core/linker.cpp
View File

@ -33,7 +33,7 @@ static PS4_SYSV_ABI void ProgramExitFunc() {
}
void GenerateTrampoline(u64 hle_handler, u64 context_base);
void GenerateTrampoline(u64 hle_handler);
__declspec(align(32)) struct Context {
u64 gpr[16];
@ -45,9 +45,13 @@ __declspec(align(32)) struct Context {
u64 host_rsp;
u64 trampoline_ret;
};
Context thread_context;
auto gen = new Xbyak::CodeGenerator(64 * 1024 * 1024);
typedef PS4_SYSV_ABI u64 (*jit_entry)();
std::unordered_map<u64, std::function<jit_entry(u64)>> trampoline_entries;
thread_local auto gen = new Xbyak::CodeGenerator(64 * 1024 * 1024);
thread_local std::unordered_map<u64, jit_entry> translated_entries;
constexpr auto rip_offs = offsetof(Context, rip);
constexpr auto ymm_offs = offsetof(Context, ymm[0]);
@ -56,7 +60,6 @@ constexpr auto rflags_offs = offsetof(Context, rflags);
constexpr auto host_rsp_offs = offsetof(Context, host_rsp);
constexpr auto trampoline_ret_offs = offsetof(Context, trampoline_ret);
std::unordered_map<u64, PS4_SYSV_ABI u64 (*)()> translated_entries;
void push_abi_regs() {
using namespace Xbyak;
@ -75,9 +78,19 @@ void pop_abi_regs() {
gen->pop(Reg64(i));
}
}
auto TranslateCode(u8* runtime_address, u64 context_base) -> PS4_SYSV_ABI u64 (*)() {
printf("TranslateCode: %p, ctx: %llX\n", runtime_address, context_base);
extern std::map<void*, size_t> addr2module;
auto TranslateCode(u8* runtime_address, u64 context_base) -> PS4_SYSV_ABI u64 (*)() {
LOG_INFO(Core_Linker, "[{:#010x}] TranslateCode: {}, ctx: {:#010x}", GetCurrentThreadId(), (void*)runtime_address, context_base);
{
auto lower = addr2module.lower_bound(runtime_address);
if (lower == addr2module.end() || lower->second < (size_t)runtime_address) {
LOG_ERROR(Core_Linker, "[{:#010x}] TranslateCode: Running host code, aborting...", GetCurrentThreadId());
DebugBreak();
}
}
using namespace Xbyak;
using namespace Xbyak::util;
@ -155,7 +168,7 @@ auto TranslateCode(u8* runtime_address, u64 context_base) -> PS4_SYSV_ABI u64 (*
/* buffer: */ runtime_address,
/* length: */ 15,
/* instruction: */ &instruction))) {
printf("%016" PRIX64 " %s\n", (u64)runtime_address, instruction.text);
LOG_INFO(Core_Linker, "[{:#010x}] {:#010x} {}", GetCurrentThreadId(), (u64)runtime_address, instruction.text);
auto next_address = runtime_address + instruction.info.length;
@ -488,16 +501,17 @@ auto TranslateCode(u8* runtime_address, u64 context_base) -> PS4_SYSV_ABI u64 (*
return Entry;
}
void GenerateTrampoline(u64 hle_handler, u64 context_base) {
printf("Generating trampoline %llX\n", hle_handler);
void GenerateTrampoline(u64 hle_handler) {
LOG_INFO(Core_Linker, "Adding trampoline {:#010x}", hle_handler);
using namespace Xbyak;
using namespace Xbyak::util;
auto entry = translated_entries.find(hle_handler);
if (entry == translated_entries.end()) {
auto entry = trampoline_entries.find(hle_handler);
if (entry == trampoline_entries.end()) {
translated_entries[hle_handler] = gen->getCurr<PS4_SYSV_ABI u64 (*)()>();
trampoline_entries[hle_handler] = [hle_handler](u64 context_base) {
auto rv = gen->getCurr<PS4_SYSV_ABI u64 (*)()>();
push_abi_regs();
@ -549,13 +563,26 @@ void GenerateTrampoline(u64 hle_handler, u64 context_base) {
gen->mov(gen->rax, ptr[gen->rax + trampoline_ret_offs]);
gen->ret();
return rv;
};
}
}
void InstallTrampolines(Context *thread_context) {
for (auto&& trampoline : trampoline_entries) {
translated_entries[trampoline.first] = trampoline.second((u64)thread_context);
}
}
thread_local Context thread_context;
static void RunMainEntry(VAddr addr, EntryParams* params, ExitFunc exit_func) {
// reinterpret_cast<entry_func_t>(addr)(params, exit_func); // can't be used, stack has to have
// a specific layout
LOG_INFO(Core_Linker, "[{:#010x}] Main thread starting {:#010x}", GetCurrentThreadId(), addr);
// Allocate stack for guest thread
auto stack_top =
8 * 1024 * 1024 + (u64)VirtualAlloc(0, 8 * 1024 * 1024, MEM_COMMIT, PAGE_READWRITE);
@ -584,6 +611,8 @@ static void RunMainEntry(VAddr addr, EntryParams* params, ExitFunc exit_func) {
thread_context.rip = addr;
InstallTrampolines(&thread_context);
for (;;) {
auto entry = translated_entries.find(thread_context.rip);
if (entry == translated_entries.end()) {
@ -619,6 +648,46 @@ static void RunMainEntryNative(VAddr addr, EntryParams* params, ExitFunc exit_fu
: "rax", "rsi", "rdi");
}
void* RunThread(VAddr addr, void* arg) {
LOG_INFO(Core_Linker, "[{:#010x}] New thread starting {:#010x}, {}", GetCurrentThreadId(), addr, arg);
auto stack_top =
8 * 1024 * 1024 + (u64)VirtualAlloc(0, 8 * 1024 * 1024, MEM_COMMIT, PAGE_READWRITE);
{
auto& rsp = thread_context.gpr[4];
auto& rsi = thread_context.gpr[6];
auto& rdi = thread_context.gpr[7];
rsp = stack_top;
rdi = (uint64_t)arg;
rsp -= 8;
*(uint64_t*)rsp = 0xDEADBEEFF099EA7;
}
thread_context.rip = addr;
InstallTrampolines(&thread_context);
while (thread_context.rip != 0xDEADBEEFF099EA7) {
auto entry = translated_entries.find(thread_context.rip);
if (entry == translated_entries.end()) {
auto Entry = TranslateCode((u8*)thread_context.rip, (u64)&thread_context);
translated_entries[thread_context.rip] = Entry;
thread_context.rip = Entry();
} else {
thread_context.rip = entry->second();
}
}
auto rv = (void*)thread_context.gpr[0];
LOG_INFO(Core_Linker, "[{:#010x}] Thread Exiting with {}", GetCurrentThreadId(), rv);
return rv;
}
Linker::Linker() : memory{Memory::Instance()} {}
Linker::~Linker() = default;
@ -836,7 +905,7 @@ bool Linker::Resolve(const std::string& name, Loader::SymbolType sym_type, Modul
}
if (record) {
*return_info = *record;
GenerateTrampoline(return_info->virtual_address, (u64)&thread_context);
GenerateTrampoline(return_info->virtual_address);
return true;
}
@ -850,7 +919,7 @@ bool Linker::Resolve(const std::string& name, Loader::SymbolType sym_type, Modul
}
LOG_ERROR(Core_Linker, "Linker: Stub resolved {} as {} (lib: {}, mod: {})", sr.name,
return_info->name, library->name, module->name);
GenerateTrampoline(return_info->virtual_address, (u64)&thread_context);
GenerateTrampoline(return_info->virtual_address);
return false;
}

2
src/core/linker.h
View File

@ -46,6 +46,8 @@ struct EntryParams {
const char* argv[3];
};
void* RunThread(VAddr addr, void* arg);
using HeapApiFunc = PS4_SYSV_ABI void* (*)(size_t);
class Linker {

6
src/core/module.cpp
View File

@ -12,8 +12,12 @@
#include "core/module.h"
#include "core/tls.h"
#include <map>
namespace Core {
std::map<void*, size_t> addr2module;
using EntryFunc = PS4_SYSV_ABI int (*)(size_t args, const void* argp, void* param);
static u64 LoadAddress = SYSTEM_RESERVED + CODE_BASE_OFFSET;
@ -88,6 +92,8 @@ void Module::LoadModuleToMemory(u32& max_tls_index) {
MemoryProt::CpuReadWrite, MemoryMapFlags::Fixed, VMAType::Code, name, true);
LoadAddress += CODE_BASE_INCR * (1 + aligned_base_size / CODE_BASE_INCR);
addr2module.emplace(*out_addr, (size_t)*out_addr + aligned_base_size + TrampolineSize);
// Initialize trampoline generator.
void* trampoline_addr = std::bit_cast<void*>(base_virtual_addr + aligned_base_size);
Xbyak::CodeGenerator c(TrampolineSize, trampoline_addr);