x64: Allow building with LUAJIT_USE_SYSMALLOC and LUAJIT_USE_VALGRIND.

Valgrind 3.9 killed MAP_32BIT support. Ugh. So now we have to rely on
undocumented behavior where Valgrind always allocates from the bottom
of memory. Alas, such a binary won't run properly without Valgrind.

diff --git a/src/Makefile b/src/Makefile
index 9551781a78f4ff7ca76feee335b5ad9cdd01b3e1..c558003c05d8e8e9fc686e3ffce14a454129be86 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -122,8 +122,10 @@ XCFLAGS=
 #
 # Use the system provided memory allocator (realloc) instead of the
 # bundled memory allocator. This is slower, but sometimes helpful for
-# debugging. It's helpful for Valgrind's memcheck tool, too. This option
-# cannot be enabled on x64, since the built-in allocator is mandatory.
+# debugging. This option cannot be enabled on x64, since realloc usually
+# doesn't return addresses in the right address range.
+# OTOH this option is mandatory for Valgrind's memcheck tool on x64 and
+# the only way to get useful results from it for all other architectures.
 #XCFLAGS+= -DLUAJIT_USE_SYSMALLOC
 #
 # This define is required to run LuaJIT under Valgrind. The Valgrind

diff --git a/src/lib_aux.c b/src/lib_aux.c
index 1b01fe0705fd0297a701316c5b7a2bcdf9a71c5e..e88dc7c28b4d7eaac71f9cd3a794f384133392e0 100644 (file)
--- a/src/lib_aux.c
+++ b/src/lib_aux.c
@@ -302,7 +302,7 @@ static int panic(lua_State *L)
 
 #ifdef LUAJIT_USE_SYSMALLOC
 
-#if LJ_64
+#if LJ_64 && !defined(LUAJIT_USE_VALGRIND)
 #error "Must use builtin allocator for 64 bit target"
 #endif
 

diff --git a/src/lj_state.c b/src/lj_state.c
index f972fdcedf61459523c1e714e89ba07497a2f518..b9eaef4614c7c9b65ed058049e5def247fef9c89 100644 (file)
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -175,7 +175,7 @@ static void close_state(lua_State *L)
     g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0);
 }
 
-#if LJ_64
+#if LJ_64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC))
 lua_State *lj_state_newstate(lua_Alloc f, void *ud)
 #else
 LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)