diff options
| author | sfan5 <sfan5@live.de> | 2020-04-08 20:14:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 20:14:08 +0200 |
| commit | 659245acc7dcc28e345b8dfa50571102f4f07728 (patch) | |
| tree | a0bcb88e12627c01e1858c9dc52ecff0326d7675 /src/script/lua_api/l_base.cpp | |
| parent | de73f989eb1397b1103236031fd91309b294583c (diff) | |
| download | minetest-659245acc7dcc28e345b8dfa50571102f4f07728.tar.gz minetest-659245acc7dcc28e345b8dfa50571102f4f07728.tar.bz2 minetest-659245acc7dcc28e345b8dfa50571102f4f07728.zip | |
Work around LuaJIT issues on aarch64 (#9614)
- Move the text segment below the 47-bit limit, needed for script_exception_wrapper which must be lightuserdata
- Replace CUSTOM_RIDX_SCRIPTAPI with full userdata
Diffstat (limited to 'src/script/lua_api/l_base.cpp')
| -rw-r--r-- | src/script/lua_api/l_base.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp index 8486fc7bc..c980bba39 100644 --- a/src/script/lua_api/l_base.cpp +++ b/src/script/lua_api/l_base.cpp @@ -30,7 +30,12 @@ ScriptApiBase *ModApiBase::getScriptApiBase(lua_State *L) { // Get server from registry lua_rawgeti(L, LUA_REGISTRYINDEX, CUSTOM_RIDX_SCRIPTAPI); - ScriptApiBase *sapi_ptr = (ScriptApiBase*) lua_touserdata(L, -1); + ScriptApiBase *sapi_ptr; +#if INDIRECT_SCRIPTAPI_RIDX + sapi_ptr = (ScriptApiBase*) *(void**)(lua_touserdata(L, -1)); +#else + sapi_ptr = (ScriptApiBase*) lua_touserdata(L, -1); +#endif lua_pop(L, 1); return sapi_ptr; } |