thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

smlua reduce key collisions and sanity check them

Browse source
This commit is contained in:
Isaac0-dev 2025-02-27 15:43:26 +10:00
parent f238b3d0f5
commit d6ce716809
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/pc/lua/smlua_utils.c
View file

@ -355,13 +355,16 @@ void smlua_push_object(lua_State* L, u16 lot, void* p, void *extraInfo) {
}
LUA_STACK_CHECK_BEGIN_NUM(1);
uintptr_t key = lot ^ (uintptr_t) p;
uintptr_t key = (lot * 0x9E3779B97F4A7C15) ^ ((uintptr_t)p >> 3);
lua_rawgeti(L, LUA_REGISTRYINDEX, gSmLuaCObjects);
lua_pushinteger(L, key);
lua_gettable(L, -2);
if (lua_isuserdata(L, -1)) {
lua_remove(L, -2); // Remove gSmLuaCObjects table
return;
const CObject *cobj = lua_touserdata(L, -1);
if (cobj && cobj->lot == lot && cobj->pointer == p) {
lua_remove(L, -2); // Remove gSmLuaCObjects table
return;
}
}
lua_pop(L, 1);
@ -387,13 +390,16 @@ void smlua_push_pointer(lua_State* L, u16 lvt, void* p, void *extraInfo) {
}
LUA_STACK_CHECK_BEGIN_NUM(1);
uintptr_t key = lvt ^ (uintptr_t) p;
uintptr_t key = (lvt * 0x9E3779B97F4A7C15) ^ ((uintptr_t)p >> 3);
lua_rawgeti(L, LUA_REGISTRYINDEX, gSmLuaCPointers);
lua_pushinteger(L, key);
lua_gettable(L, -2);
if (lua_isuserdata(L, -1)) {
lua_remove(L, -2); // Remove gSmLuaCPointers table
return;
const CPointer *cptr = lua_touserdata(L, 1);
if (cptr && cptr->lvt == lvt && cptr->pointer == p) {
lua_remove(L, -2); // Remove gSmLuaCPointers table
return;
}
}
lua_pop(L, 1);