Skip to content

Fix for lua 5.3 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crazyjul wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for lua 5.3 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee239d5
Fix for lua 5.3
May 29, 2015
19ae52a
Fix lua_Debug structure access in 5.3
Jun 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/LuaInject/DebugBackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,9 +1751,12 @@ int DebugBackend::IndexChained(unsigned long api, lua_State* L)
// If it wasn't found, get from the global table.
if (lua_isnil_dll(api, L, -1))
{
lua_pop_dll(api, L, 1);
lua_pop_dll( api, L, 1 );
lua_pushglobaltable_dll( api, L );
lua_pushvalue_dll(api, L, key);
lua_gettable_dll(api, L, table[2]);
lua_gettable_dll(api, L, -2);
lua_remove_dll(api, L, -2);

}

// If the value is our nil sentinel, convert it to an actual nil.
Expand Down
81 changes: 65 additions & 16 deletions src/LuaInject/LuaDll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ typedef int (*lua_absindex_cdecl_t) (lua_State*, int);
typedef int (*lua_sethook_cdecl_t) (lua_State*, lua_Hook, int, int);
typedef int (*lua_gethookmask_cdecl_t) (lua_State*);
typedef int (*lua_getinfo_cdecl_t) (lua_State*, const char*, lua_Debug* ar);
typedef void (*lua_remove_cdecl_t) (lua_State*, int);
typedef void (*lua_remove_cdecl_t ) (lua_State*, int);
typedef void (*lua_rotate_cdecl_t ) (lua_State*, int, int);
typedef void (*lua_settable_cdecl_t) (lua_State*, int);
typedef void (*lua_gettable_cdecl_t) (lua_State*, int);
typedef void (*lua_setglobal_cdecl_t) (lua_State*, const char*);
Expand Down Expand Up @@ -133,8 +134,9 @@ typedef int (__stdcall *lua_error_stdcall_t) (lua_State*);
typedef int (__stdcall *lua_absindex_stdcall_t) (lua_State*, int);
typedef int (__stdcall *lua_sethook_stdcall_t) (lua_State*, lua_Hook_stdcall, int, int);
typedef int (__stdcall *lua_gethookmaskstdcall_t) (lua_State*);
typedef int (__stdcall *lua_getinfo_stdcall_t) (lua_State*, const char*, lua_Debug* ar);
typedef int (__stdcall *lua_getinfo_stdcall_t) (lua_State*, const char*, lua_Debug*);
typedef void (__stdcall *lua_remove_stdcall_t) (lua_State*, int);
typedef void (__stdcall *lua_rotate_stdcall_t) (lua_State*, int, int);
typedef void (__stdcall *lua_settable_stdcall_t) (lua_State*, int);
typedef void (__stdcall *lua_gettable_stdcall_t) (lua_State*, int);
typedef void (__stdcall *lua_setglobal_stdcall_t) (lua_State*, const char*);
Expand Down Expand Up @@ -208,7 +210,7 @@ typedef LONG (WINAPI *LdrUnlockLoaderLock_t) (ULONG flags, UL
struct LuaInterface
{

int version; // One of 401, 500, 510, 520
int version; // One of 401, 500, 510, 520, 530
bool finishedLoading;

bool stdcall;
Expand All @@ -227,12 +229,13 @@ struct LuaInterface
lua_close_cdecl_t lua_close_dll_cdecl;
lua_newthread_cdecl_t lua_newthread_dll_cdecl;
lua_error_cdecl_t lua_error_dll_cdecl;
lua_absindex_cdecl_t lua_absindex_dll_cdecl;
lua_absindex_cdecl_t lua_absindex_dll_cdecl;
lua_gettop_cdecl_t lua_gettop_dll_cdecl;
lua_sethook_cdecl_t lua_sethook_dll_cdecl;
lua_gethookmask_cdecl_t lua_gethookmask_dll_cdecl;
lua_getinfo_cdecl_t lua_getinfo_dll_cdecl;
lua_remove_cdecl_t lua_remove_dll_cdecl;
lua_rotate_cdecl_t lua_rotate_dll_cdecl;
lua_settable_cdecl_t lua_settable_dll_cdecl;
lua_gettable_cdecl_t lua_gettable_dll_cdecl;
lua_setglobal_cdecl_t lua_setglobal_dll_cdecl;
Expand Down Expand Up @@ -307,6 +310,7 @@ struct LuaInterface
lua_gethookmaskstdcall_t lua_gethookmask_dll_stdcall;
lua_getinfo_stdcall_t lua_getinfo_dll_stdcall;
lua_remove_stdcall_t lua_remove_dll_stdcall;
lua_rotate_stdcall_t lua_rotate_dll_stdcall;
lua_settable_stdcall_t lua_settable_dll_stdcall;
lua_gettable_stdcall_t lua_gettable_dll_stdcall;
lua_setglobal_stdcall_t lua_setglobal_dll_stdcall;
Expand Down Expand Up @@ -683,6 +687,7 @@ int GetEvent(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.event;
default: return ar->ld51.event;
}
Expand All @@ -692,6 +697,7 @@ int GetNups(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.nups;
default: return ar->ld51.nups;
}
Expand All @@ -701,6 +707,7 @@ int GetCurrentLine(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.currentline;
default: return ar->ld51.currentline;
}
Expand All @@ -710,6 +717,7 @@ int GetLineDefined(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.linedefined;
default: return ar->ld51.linedefined;
}
Expand All @@ -719,6 +727,7 @@ int GetLastLineDefined(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.lastlinedefined;
default: return ar->ld51.lastlinedefined;
}
Expand All @@ -728,6 +737,7 @@ const char* GetSource(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.source;
default: return ar->ld51.source;
}
Expand All @@ -746,6 +756,7 @@ const char* GetName(unsigned long api, const lua_Debug* ar)
{
switch( g_interfaces[api].version)
{
case 530:
case 520: return ar->ld52.name;
default: return ar->ld51.name;
}
Expand Down Expand Up @@ -962,7 +973,7 @@ int GetRegistryIndex(unsigned long api)
int lua_absindex_dll(unsigned long api, lua_State* L, int i)
{
if (g_interfaces[api].lua_absindex_dll_cdecl != NULL)
{
{
return g_interfaces[api].lua_absindex_dll_cdecl(L, i);
}
else if (g_interfaces[api].lua_absindex_dll_stdcall != NULL)
Expand All @@ -983,14 +994,14 @@ int lua_absindex_dll(unsigned long api, lua_State* L, int i)

int lua_upvalueindex_dll(unsigned long api, int i)
{
if( g_interfaces[api].version >= 520)
if( g_interfaces[api].version >= 520)
{
return GetRegistryIndex(api) - i;
}
else
{
return GetGlobalsIndex(api) - i;
}
return GetGlobalsIndex( api ) - i;
}
}

void lua_setglobal_dll(unsigned long api, lua_State* L, const char* s)
Expand Down Expand Up @@ -1132,13 +1143,33 @@ int lua_getinfo_dll(unsigned long api, lua_State* L, const char* what, lua_Debug

void lua_remove_dll(unsigned long api, lua_State* L, int index)
{
if (g_interfaces[api].lua_remove_dll_cdecl != NULL)
if ( g_interfaces[ api ].version >= 530 )
{
lua_rotate_dll( api, L, index, -1 );
lua_pop_dll( api, L, 1 );
}
else
{
g_interfaces[api].lua_remove_dll_cdecl(L, index);
if ( g_interfaces[ api ].lua_remove_dll_cdecl != NULL )
{
g_interfaces[ api ].lua_remove_dll_cdecl(L, index);
}
else
{
g_interfaces[ api ].lua_remove_dll_stdcall(L, index);
}
}
}

void lua_rotate_dll(unsigned long api, lua_State* L, int index, int n )
{
if (g_interfaces[api].lua_rotate_dll_cdecl != NULL)
{
g_interfaces[api].lua_rotate_dll_cdecl(L, index, n);
}
else
{
g_interfaces[api].lua_remove_dll_stdcall(L, index);
g_interfaces[api].lua_rotate_dll_stdcall(L, index, n);
}
}

Expand Down Expand Up @@ -1339,13 +1370,20 @@ int lua_getstack_dll(unsigned long api, lua_State* L, int level, lua_Debug* ar)

void lua_insert_dll(unsigned long api, lua_State* L, int index)
{
if (g_interfaces[api].lua_insert_dll_cdecl != NULL)
if (g_interfaces[ api ].version >= 53)
{
g_interfaces[api].lua_insert_dll_cdecl(L, index);
lua_rotate_dll(api, L, index, 1 );
}
else
{
g_interfaces[api].lua_insert_dll_stdcall(L, index);
if (g_interfaces[ api ].lua_insert_dll_cdecl != NULL)
{
g_interfaces[ api ].lua_insert_dll_cdecl(L, index);
}
else
{
g_interfaces[ api ].lua_insert_dll_stdcall(L, index);
}
}
}

Expand Down Expand Up @@ -2069,6 +2107,7 @@ void FinishLoadingLua(unsigned long api, bool stdcall)
SET_STDCALL(lua_sethook);
SET_STDCALL(lua_getinfo);
SET_STDCALL(lua_remove);
SET_STDCALL(lua_rotate);
SET_STDCALL(lua_settable);
SET_STDCALL(lua_gettable);
SET_STDCALL(lua_setglobal);
Expand Down Expand Up @@ -3213,6 +3252,15 @@ bool LoadLuaFunctions(const stdext::hash_map<std::string, DWORD64>& symbols, HAN
luaInterface.registryIndex = -10000;
luaInterface.globalsIndex = -10001;
}
else if (symbols.find( "lua_rotate" ) != symbols.end())
{
luaInterface.version = 530;
// LUA_REGISTRYINDEX == LUAI_FIRSTPSEUDOIDX with LUAI_FIRSTPSEUDOIDX == (-LUAI_MAXSTACK - 1000) with LUAI_MAXSTACK == 15000 (for 32 bits build...)
luaInterface.registryIndex = -1001000;
// starting with Lua 5.2, there is no longer a LUA_GLOBALSINDEX pseudo-index. Instead the global table is stored in the registry at LUA_RIDX_GLOBALS
luaInterface.globalsIndex = 2;
luaInterface.hookTailCall = LUA_HOOKTAILCALL; // Lua5.2 has LUA_HOOKTAILCALL, but no LUA_HOOKTAILRET
}
else if (symbols.find("lua_callk") != symbols.end())
{
luaInterface.version = 520;
Expand Down Expand Up @@ -3251,7 +3299,8 @@ bool LoadLuaFunctions(const stdext::hash_map<std::string, DWORD64>& symbols, HAN
GET_FUNCTION_OPTIONAL(lua_absindex); // Only present in Lua 5.2+
GET_FUNCTION(lua_sethook);
GET_FUNCTION(lua_getinfo);
GET_FUNCTION(lua_remove);
GET_FUNCTION_OPTIONAL(lua_remove); // Only present up to Lua 5.3
GET_FUNCTION_OPTIONAL(lua_rotate); // Only present in Lua 5.3
GET_FUNCTION(lua_settable);
GET_FUNCTION(lua_gettable);
GET_FUNCTION(lua_rawget);
Expand All @@ -3266,7 +3315,7 @@ bool LoadLuaFunctions(const stdext::hash_map<std::string, DWORD64>& symbols, HAN
GET_FUNCTION(lua_getlocal);
GET_FUNCTION(lua_setlocal);
GET_FUNCTION(lua_getstack);
GET_FUNCTION(lua_insert);
GET_FUNCTION_OPTIONAL(lua_insert); // Only present in Lua < 5.3
GET_FUNCTION(lua_pushnil);
GET_FUNCTION(lua_pushvalue);
GET_FUNCTION(lua_pushcclosure);
Expand Down
1 change: 1 addition & 0 deletions src/LuaInject/LuaDll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ int lua_absindex_dll (unsigned long api, lua_State*, int);
int lua_sethook_dll (unsigned long api, lua_State*, lua_Hook, int, int);
int lua_getinfo_dll (unsigned long api, lua_State*, const char*, lua_Debug* ar);
void lua_remove_dll (unsigned long api, lua_State*, int);
void lua_rotate_dll (unsigned long api, lua_State*, int, int);
void lua_settable_dll (unsigned long api, lua_State*, int);
void lua_gettable_dll (unsigned long api, lua_State*, int);
void lua_rawget_dll (unsigned long api, lua_State*, int idx);
Expand Down