diff options
Diffstat (limited to 'src/lib/util/delegate.cpp')
-rw-r--r-- | src/lib/util/delegate.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/util/delegate.cpp b/src/lib/util/delegate.cpp index 9c9e0fd3bf7..c8633633325 100644 --- a/src/lib/util/delegate.cpp +++ b/src/lib/util/delegate.cpp @@ -39,15 +39,12 @@ delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { {0 }}; delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const { -#if defined(__arm__) || defined(__ARMEL__) || defined(__aarch64__) - // apply the "this" delta to the object first - object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object)); - - // if the low bit of the vtable index is clear, then it is just a raw function pointer - if (m_this_delta==0) { +#if defined(__arm__) || defined(__ARMEL__) || defined(__aarch64__) || defined(__MIPSEL__) || defined(__mips_isa_rev) || defined(__mips64) || defined(EMSCRIPTEN) + if ((m_this_delta & 1) == 0) { #if defined(LOG_DELEGATES) printf("Calculated Addr = %08x\n", (uintptr_t)(void*)(m_function)); #endif + object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object) + m_this_delta); return reinterpret_cast<delegate_generic_function>(m_function); } object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object)); |