diff --git a/source/texk/web2c/luatexdir/luaffi/call_arm.dasc b/source/texk/web2c/luatexdir/luaffi/call_arm.dasc index a92bd1637d78ba8ff40b7fad49945c1315b8f427..f85753255fb2b191f3121af863b9cb3c99281407 100644 --- a/source/texk/web2c/luatexdir/luaffi/call_arm.dasc +++ b/source/texk/web2c/luatexdir/luaffi/call_arm.dasc @@ -217,7 +217,7 @@ cfunction compile_callback(lua_State* L, int fidx, int ct_usr, const struct ctyp | load32 r3, mt | mov r2, #0 // -1 - ct_usr | mvn r1, #1 // -2 - val - | lcall extern check_typed_pointer + | lcall extern to_typed_pointer | mov DATA, r0 | mvn r1, #3 // -4 - remove 3 (upval table, ret val, usr value) | lcall extern lua_settop @@ -235,7 +235,7 @@ cfunction compile_callback(lua_State* L, int fidx, int ct_usr, const struct ctyp | load32 r3, mt | mvn r2, #0 // -1 - ct_usr | mvn r1, #1 // -2 - val - | lcall extern check_enum + | lcall extern to_enum | mov DATA, r0 | mvn r1, #3 // -4 - remove 3 (upval table, ret val, usr value) | lcall extern lua_settop @@ -271,7 +271,7 @@ cfunction compile_callback(lua_State* L, int fidx, int ct_usr, const struct ctyp case INTPTR_TYPE: | mvn r1, #0 // -1 - | lcall extern check_uintptr + | lcall extern check_intptr goto single; case FLOAT_TYPE: @@ -393,11 +393,11 @@ void compile_function(lua_State* L, cfunction func, int ct_usr, const struct cty | mov r0, L_ARG if (mt->pointers || mt->is_reference) { - | bl extern check_typed_pointer + | bl extern to_typed_pointer } else if (mt->type == FUNCTION_PTR_TYPE) { - | bl extern check_typed_cfunction + | bl extern to_typed_function } else if (mt->type == ENUM_TYPE) { - | bl extern check_enum + | bl extern to_enum } | str r0, [DATA], #4 @@ -456,7 +456,7 @@ void compile_function(lua_State* L, cfunction func, int ct_usr, const struct cty break; case INTPTR_TYPE: - | lcall extern check_uintptr + | lcall extern check_intptr | str r0, [DATA], #4 break; diff --git a/source/texk/web2c/luatexdir/luaffi/call_arm.h b/source/texk/web2c/luatexdir/luaffi/call_arm.h index d6d5a01c6dd25369cb1b354e9bddaf7283c6eba2..efe7f9567e37c2b003d058edc3dea35fe98eadb6 100644 --- a/source/texk/web2c/luatexdir/luaffi/call_arm.h +++ b/source/texk/web2c/luatexdir/luaffi/call_arm.h @@ -579,19 +579,19 @@ static const char *const extnames[] = { "push_float", "lua_pushnumber", "lua_callk", - "check_typed_pointer", + "to_typed_pointer", "lua_settop", - "check_enum", + "to_enum", "check_uint32", "check_int32", "check_uint64", "check_int64", - "check_uintptr", + "check_intptr", "check_float", "check_double", "lua_gettop", "luaL_error", - "check_typed_cfunction", + "to_typed_function", "unpack_varargs_stack", "SetLastError", "FUNCTION", diff --git a/source/texk/web2c/luatexdir/luaffi/ffi.h b/source/texk/web2c/luatexdir/luaffi/ffi.h index 8611409252ca37c94676c4653aa9d5e71881faf4..8190a973892794c9cfd89feb1fbda026cedb1c52 100644 --- a/source/texk/web2c/luatexdir/luaffi/ffi.h +++ b/source/texk/web2c/luatexdir/luaffi/ffi.h @@ -148,7 +148,7 @@ static void (lua_remove)(lua_State *L, int idx) { /* See ffi.c: replace luaopen_ffi with a stub */ /* if FFI_ENABLE_LUATEX_INTERFACE is not defined */ -#if (defined ARCH_X86 || defined ARCH_X64 ||defined ARCH_ARM) && (defined OS_CE || defined OS_WIN || defined OS_LINUX || defined OS_BSD || defined OS_POSIX || defined OS_OSX) +#if (defined ARCH_X86 || defined ARCH_X64) && (defined OS_CE || defined OS_WIN || defined OS_LINUX || defined OS_BSD || defined OS_POSIX || defined OS_OSX) #define FFI_ENABLE_LUATEX_INTERFACE #endif /* for the moment */