summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/delegate.cpp
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-21 08:27:06 +0100
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-21 08:27:06 +0100
commita99df788017c2bf5a56034d4f9152bf8ab95a168 (patch)
tree3beec27b413c75b8f9f88199519e45fd07959bf8 /src/lib/util/delegate.cpp
parentb224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff)
parent3afd990226a2c647290579bebb5537bd0fd3faac (diff)
Merge with master
Diffstat (limited to 'src/lib/util/delegate.cpp')
-rw-r--r--src/lib/util/delegate.cpp9
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));