Revert "[ARM JIT] Enable relative branches by default"

This reverts commit f5d5780.
nspire-emus · May 4, 2017 · 91f1f56 · 91f1f56
1 parent 3160e05
commit 91f1f56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/core/os/os-linux.c b/core/os/os-linux.c
@@ -95,12 +95,7 @@ void *os_alloc_executable(size_t size)
     // Has to be in 32-bit space for the JIT
     void *ptr = mmap((void*)0x30000000, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANON|MAP_32BIT, -1, 0);
 #else
-    // Try to be as close to .text as possible to utilize relative branches
-    uintptr_t pref = (uintptr_t)(&os_alloc_executable);
-    pref += 0x800000;
-    pref &= ~(0xFFFF);
-
-    void *ptr = mmap((void*)pref, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANON, -1, 0);
+    void *ptr = mmap((void*)0x0, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANON, -1, 0);
 #endif
 
     if(ptr == MAP_FAILED)

diff --git a/core/translate_arm.cpp b/core/translate_arm.cpp
@@ -20,7 +20,7 @@
 
 // Uncomment the following line to support relative jumps if possible,
 // it doesn't work that often as the mmaped section is too far away.
-#define REL_BRANCH
+// #define REL_BRANCH
 
 #include "asmcode.h"
 #include "cpu.h"