80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge dynarec fixes from Cacodemon345's branch

Browse Source 
Get rid of mprotect call entirely on x64 dynamic recompiler
Use mmap whenever possible on old dynamic recompiler
This commit is contained in:
Laci bá
2021-10-16 18:38:32 +02:00
committed by GitHub
parent ada51b18e0
commit 8b5e39ceed
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/codegen/codegen_x86-64.c
View File

@@ -21,7 +21,7 @@
#include "codegen_ops.h"
#include "codegen_ops_x86-64.h"
#if defined(__linux__) || defined(__APPLE__)
#if defined(__unix__) || defined(__APPLE__)
#include <sys/mman.h>
#include <unistd.h>
#endif
@@ -63,16 +63,11 @@ static int last_ssegs;
void codegen_init()
{
int c;
#if defined(__linux__) || defined(__APPLE__)
void *start;
size_t len;
long pagesize = sysconf(_SC_PAGESIZE);
long pagemask = ~(pagesize - 1);
#endif
#if _WIN64
codeblock = VirtualAlloc(NULL, BLOCK_SIZE * sizeof(codeblock_t), MEM_COMMIT, PAGE_EXECUTE_READWRITE);
#elif defined(__unix__) || defined(__APPLE__)
codeblock = mmap(NULL, BLOCK_SIZE * sizeof(codeblock_t), PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE, 0, 0);
#else
codeblock = malloc(BLOCK_SIZE * sizeof(codeblock_t));
#endif
@@ -83,16 +78,6 @@ void codegen_init()
for (c = 0; c < BLOCK_SIZE; c++)
codeblock[c].valid = 0;
#if defined(__linux__) || defined(__APPLE__)
start = (void *)((long)codeblock & pagemask);
len = ((BLOCK_SIZE * sizeof(codeblock_t)) + pagesize) & pagemask;
if (mprotect(start, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
{
perror("mprotect");
exit(-1);
}
#endif
}
void codegen_reset()

8
src/codegen/codegen_x86.c
View File

@@ -61,7 +61,7 @@
#include "codegen_ops.h"
#include "codegen_ops_x86.h"
#ifdef __linux__
#ifdef __unix__
#include <sys/mman.h>
#include <unistd.h>
#endif
@@ -1173,7 +1173,7 @@ static uint32_t gen_MEM_CHECK_WRITE_L()
void codegen_init()
{
#ifdef __linux__
#ifdef __unix__
void *start;
size_t len;
long pagesize = sysconf(_SC_PAGESIZE);
@@ -1182,6 +1182,8 @@ void codegen_init()
#ifdef _WIN32
codeblock = VirtualAlloc(NULL, (BLOCK_SIZE+1) * sizeof(codeblock_t), MEM_COMMIT, PAGE_EXECUTE_READWRITE);
#elif defined __unix__
codeblock = mmap(NULL, (BLOCK_SIZE+1) * sizeof(codeblock_t), PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, 0, 0);
#else
codeblock = malloc((BLOCK_SIZE+1) * sizeof(codeblock_t));
#endif
@@ -1190,7 +1192,7 @@ void codegen_init()
memset(codeblock, 0, (BLOCK_SIZE+1) * sizeof(codeblock_t));
memset(codeblock_hash, 0, HASH_SIZE * sizeof(codeblock_t *));
#ifdef __linux__
#ifdef __unix__
start = (void *)((long)codeblock & pagemask);
len = (((BLOCK_SIZE+1) * sizeof(codeblock_t)) + pagesize) & pagemask;
if (mprotect(start, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)