Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-01 15:06:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove obsolete code (HAVE_STATIC_DATA_EXEC).

Browse Source
This commit is contained in:
gbeauche 2006-07-16 12:18:59 +00:00
parent a2e0cc10c0
commit 6113436ea4
2 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SheepShaver/src/Unix/configure.ac
View File

@ -1447,32 +1447,6 @@ if [[ "x$EMULATED_PPC" = "xyes" ]]; then
else else
WANT_JIT=no WANT_JIT=no
fi fi
if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
AC_CACHE_CHECK([whether static data regions are executable],
ac_cv_have_static_data_exec, [
AC_TRY_RUN([int main(void) {
#if defined(__powerpc__) || defined(__ppc__)
static unsigned int p[8] = {0x4e800020,};
asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
asm volatile("sync" : : : "memory");
asm volatile("icbi 0,%0" : : "r" (p) : "memory");
asm volatile("sync" : : : "memory");
asm volatile("isync" : : : "memory");
((void (*)(void))p)();
return 0;
#endif
return 1;
}], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
dnl When cross-compiling, do not assume anything.
ac_cv_have_static_data_exec=no
)
])
else
ac_cv_use_dyngen=no
fi
AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
[Define if your system marks static data pages as executable.])
if [[ "x$WANT_JIT" = "xyes" ]]; then if [[ "x$WANT_JIT" = "xyes" ]]; then
CPPFLAGS="$CPPFLAGS -DUSE_JIT" CPPFLAGS="$CPPFLAGS -DUSE_JIT"
fi fi

35
SheepShaver/src/kpx_cpu/src/cpu/jit/jit-cache.cpp
View File

@ -25,10 +25,6 @@
#define DEBUG 0 #define DEBUG 0
#include "debug.h" #include "debug.h"
#if KPX_MAX_CPUS == 1 && HAVE_STATIC_DATA_EXEC
#define STATIC_ICACHE_ALLOC 1
#endif
// Default cache size // Default cache size
#if defined(__alpha__) #if defined(__alpha__)
const int JIT_CACHE_SIZE = 2 * 1024 * 1024; const int JIT_CACHE_SIZE = 2 * 1024 * 1024;
@ -39,13 +35,6 @@ const int JIT_CACHE_SIZE = 8 * 1024 * 1024;
#endif #endif
const int JIT_CACHE_SIZE_GUARD = 4096; const int JIT_CACHE_SIZE_GUARD = 4096;
#if STATIC_ICACHE_ALLOC
const int G_TRANSLATION_CACHE_SIZE = 3 * 1024 * 1024; // 3 MB
static uint8 g_translation_cache[G_TRANSLATION_CACHE_SIZE];
static uint8 *g_translation_cache_p;
static uint8 *g_translation_cache_end_p;
#endif
basic_jit_cache::basic_jit_cache(int init_cache_size) basic_jit_cache::basic_jit_cache(int init_cache_size)
: tcode_start(NULL), code_start(NULL), code_p(NULL), code_end(NULL), data(NULL) : tcode_start(NULL), code_start(NULL), code_p(NULL), code_end(NULL), data(NULL)
{ {
@ -69,13 +58,6 @@ basic_jit_cache::~basic_jit_cache()
bool bool
basic_jit_cache::init_translation_cache(int size) basic_jit_cache::init_translation_cache(int size)
{ {
#if STATIC_ICACHE_ALLOC
if (g_translation_cache_p == 0) {
g_translation_cache_p = g_translation_cache;
g_translation_cache_end_p = g_translation_cache_p + G_TRANSLATION_CACHE_SIZE;
}
#endif
if (size == -1) if (size == -1)
size = JIT_CACHE_SIZE; size = JIT_CACHE_SIZE;
@ -84,13 +66,6 @@ basic_jit_cache::init_translation_cache(int size)
cache_size = (size + JIT_CACHE_SIZE_GUARD + roundup - 1) & -roundup; cache_size = (size + JIT_CACHE_SIZE_GUARD + roundup - 1) & -roundup;
assert(cache_size > 0); assert(cache_size > 0);
#if STATIC_ICACHE_ALLOC
if (cache_size <= (g_translation_cache_end_p - g_translation_cache_p)) {
tcode_start = g_translation_cache_p;
g_translation_cache_p += cache_size;
goto done;
}
#endif
tcode_start = (uint8 *)vm_acquire(cache_size, VM_MAP_PRIVATE | VM_MAP_32BIT); tcode_start = (uint8 *)vm_acquire(cache_size, VM_MAP_PRIVATE | VM_MAP_32BIT);
if (tcode_start == VM_MAP_FAILED) { if (tcode_start == VM_MAP_FAILED) {
tcode_start = NULL; tcode_start = NULL;
@ -116,16 +91,6 @@ void
basic_jit_cache::kill_translation_cache() basic_jit_cache::kill_translation_cache()
{ {
if (tcode_start) { if (tcode_start) {
#if STATIC_ICACHE_ALLOC
if ((tcode_start - g_translation_cache) <= G_TRANSLATION_CACHE_SIZE) {
if (tcode_start == g_translation_cache_p - cache_size) {
D(bug("basic_jit_cache: Merge back free translation cache: %d KB at %p\n",
cache_size / 1024, tcode_start));
g_translation_cache_p -= cache_size;
}
return;
}
#endif
D(bug("basic_jit_cache: Release translation cache\n")); D(bug("basic_jit_cache: Release translation cache\n"));
vm_release(tcode_start, cache_size); vm_release(tcode_start, cache_size);
} }