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

JIT (ARM): Make the code a little more portable, and also silence a couple compiler warnings.

This commit is contained in:
rogerman 2022-05-23 16:08:06 -07:00
parent 356fe47df7
commit 3632142547
2 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
desmume/src/utils/arm_jit/arm_jit_arm.cpp
View File

@ -53,17 +53,25 @@ t_bytes *g_out = NULL;
#include <pthread.h>
static int g_jitWrite = 0;
void jit_exec() {
if (g_jitWrite) {
(void)pthread_jit_write_protect_np(1);
g_jitWrite = 0;
}
if (g_jitWrite) {
#if defined(MAC_OS_VERSION_11_0) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0)
if (__builtin_available(macOS 11.0, *)) {
pthread_jit_write_protect_np(1);
}
#endif
g_jitWrite = 0;
}
}
void jit_write() {
if (! g_jitWrite) {
(void)pthread_jit_write_protect_np(0);
g_jitWrite = 1;
}
if (! g_jitWrite) {
#if defined(MAC_OS_VERSION_11_0) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0)
if (__builtin_available(macOS 11.0, *)) {
pthread_jit_write_protect_np(0);
}
#endif
g_jitWrite = 1;
}
}
#else
#define jit_write(...)

40
desmume/src/utils/arm_jit/emit_core.cpp
View File

@ -16,6 +16,10 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef __APPLE__
#include <libkern/OSCacheControl.h>
#endif
#define CHUNK_SIZE 6048*4
struct s_bytes {
@ -42,17 +46,23 @@ t_bytes *g_currBlock = NULL;
std::map<JittedFunc, u_int> allFuncs;
static void* alloc_executable_memory(size_t size) {
#ifdef __APPLE__
void* ptr = mmap (NULL, size,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_JIT,
-1, 0);
#else
void* ptr = mmap(0, size,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
#ifndef MAP_ANONYMOUS
#ifdef MAP_ANON
#define MAP_ANONYMOUS MAP_ANON
#else
#define MAP_ANONYMOUS 0
#endif
#endif
#ifndef MAP_JIT
#define MAP_JIT 0
#endif
static void* alloc_executable_memory(size_t size) {
void *ptr = mmap(NULL, size,
PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS | MAP_JIT, -1, 0);
if (ptr == (void*)-1) {
return NULL;
}
@ -174,10 +184,10 @@ void releaseBytes(t_bytes *bytes) {
}
JittedFunc createFunc(t_bytes *bytes) {
for (auto const& lbl : g_LABELS) {
int nj = lbl.second.jumps.size();
for (std::map<int, t_labelmap>::iterator lbl = g_LABELS.begin(); lbl != g_LABELS.end(); lbl++) {
int nj = lbl->second.jumps.size();
for (int i = 0; i < nj; i++) {
MOD_JUMP(lbl.second.jumps[i].instruct_ptr, lbl.second.jumps[i].cond, lbl.second.num_bytes, lbl.second.jumps[i].num_bytes)
MOD_JUMP(lbl->second.jumps[i].instruct_ptr, lbl->second.jumps[i].cond, lbl->second.num_bytes, lbl->second.jumps[i].num_bytes)
}
}
@ -201,7 +211,11 @@ JittedFunc createFunc(t_bytes *bytes) {
curr_bytes = curr_bytes->next;
}
#ifdef __APPLE__
sys_icache_invalidate(fn, g_TOTALBYTES);
#else
__builtin___clear_cache(fn, fn+g_TOTALBYTES);
#endif
return (JittedFunc)fn;
}