mirror of
https://github.com/love2d/love.git
synced 2026-08-17 19:23:38 +02:00
Workaround alignment issue in Linux 32-bit platforms.
Apparently geting alignment right pre-C++17 is not easy. Well, 2^32 fits entirely in Lua "double" 2^53 so it's fine to assume alignment of 1. Fixes #1916.
This commit is contained in:
+13
-3
@@ -30,6 +30,7 @@
|
|||||||
// C++
|
// C++
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <cstdint>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
@@ -136,16 +137,25 @@ static ObjectKey luax_computeloveobjectkey(lua_State *L, love::Object *object)
|
|||||||
// use more than 53 bits if their alignment is guaranteed to be more than 1.
|
// use more than 53 bits if their alignment is guaranteed to be more than 1.
|
||||||
// For example an alignment requirement of 8 means we can shift the
|
// For example an alignment requirement of 8 means we can shift the
|
||||||
// pointer's bits by 3.
|
// pointer's bits by 3.
|
||||||
const size_t minalign = LOVE_ALIGNOF(std::max_align_t);
|
#if UINTPTR_MAX == 0xffffffff
|
||||||
|
// https://github.com/love2d/love/issues/1916
|
||||||
|
// This appears to be ABI violation on 32-bit platforms. However it seems
|
||||||
|
// there's no reliable way to get the correct alignment pre-C++17. Consider
|
||||||
|
// that 32-bit still fits in 2^53 range, it's perfectly fine to assume
|
||||||
|
// alignment of 1.
|
||||||
|
constexpr size_t minalign = 1;
|
||||||
|
#else
|
||||||
|
constexpr size_t minalign = LOVE_ALIGNOF(std::max_align_t);
|
||||||
|
#endif
|
||||||
uintptr_t key = (uintptr_t) object;
|
uintptr_t key = (uintptr_t) object;
|
||||||
|
|
||||||
if ((key & (minalign - 1)) != 0)
|
if ((key & (minalign - 1)) != 0)
|
||||||
{
|
{
|
||||||
luaL_error(L, "Cannot push love object to Lua: unexpected alignment "
|
luaL_error(L, "Cannot push love object to Lua: unexpected alignment "
|
||||||
"(pointer is %p but alignment should be %d)", object, minalign);
|
"(pointer is %p but alignment should be %d)", object, (int) minalign);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const size_t shift = (size_t) log2(LOVE_ALIGNOF(std::max_align_t));
|
static const size_t shift = (size_t) log2(minalign);
|
||||||
|
|
||||||
key >>= shift;
|
key >>= shift;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user