ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ARM64 rewrites with NO_RWX_PAGES 

Tested on nvidia jetson and Android, so far works great.
This commit is contained in:
David Guillen Fandos 2019-05-13 00:23:18 +02:00
parent aa4fc8dd60
commit 65e2218792
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/hw/sh4/dyna/ngen.h
View File

@ -55,8 +55,8 @@
// sub/add the pointer offset. CodeCache will point to the RW pointer for simplicity.
#ifdef FEAT_NO_RWX_PAGES
extern uintptr_t cc_rx_offset;
#define CC_RW2RX(ptr) (void*)(((uintptr_t)ptr) + cc_rx_offset)
#define CC_RX2RW(ptr) (void*)(((uintptr_t)ptr) - cc_rx_offset)
#define CC_RW2RX(ptr) (void*)(((uintptr_t)(ptr)) + cc_rx_offset)
#define CC_RX2RW(ptr) (void*)(((uintptr_t)(ptr)) - cc_rx_offset)
#else
#define CC_RW2RX(ptr) (ptr)
#define CC_RX2RW(ptr) (ptr)

6
core/linux/common.cpp
View File

@ -59,11 +59,7 @@ void fault_handler (int sn, siginfo_t * si, void *segfault_ctx)
context_from_segfault(&ctx, segfault_ctx);
bool dyna_cde = ((unat)ctx.pc>(unat)CodeCache) && ((unat)ctx.pc<(unat)(CodeCache + CODE_SIZE));
//ucontext_t* ctx=(ucontext_t*)ctxr;
//printf("mprot hit @ ptr 0x%08X @@ code: %08X, %d\n",si->si_addr,ctx->uc_mcontext.arm_pc,dyna_cde);
bool dyna_cde = ((unat)CC_RX2RW(ctx.pc) > (unat)CodeCache) && ((unat)CC_RX2RW(ctx.pc) < (unat)(CodeCache + CODE_SIZE));
if (VramLockedWrite((u8*)si->si_addr) || BM_LockedWrite((u8*)si->si_addr))
return;

5
core/rec-ARM64/rec_arm64.cpp
View File

@ -1442,13 +1442,14 @@ void ngen_CC_Finish(shil_opcode* op)
bool ngen_Rewrite(unat& host_pc, unat, unat)
{
//printf("ngen_Rewrite pc %p\n", host_pc);
void *host_pc_rw = CC_RX2RW(host_pc);
RuntimeBlockInfo *block = bm_GetBlock((void*)host_pc);
if (block == NULL)
{
printf("ngen_Rewrite: Block at %p not found\n", (void *)host_pc);
return false;
}
u32 *code_ptr = (u32*)host_pc;
u32 *code_ptr = (u32*)host_pc_rw;
auto it = block->memory_accesses.find(code_ptr);
if (it == block->memory_accesses.end())
{
@ -1466,7 +1467,7 @@ bool ngen_Rewrite(unat& host_pc, unat, unat)
assembler->GenWriteMemorySlow(op);
assembler->Finalize(true);
delete assembler;
host_pc = (unat)(code_ptr - 2);
host_pc = (unat)CC_RW2RX(code_ptr - 2);
return true;
}