summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/delegate.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/util/delegate.cpp')
-rw-r--r--src/lib/util/delegate.cpp43
1 files changed, 24 insertions, 19 deletions
diff --git a/src/lib/util/delegate.cpp b/src/lib/util/delegate.cpp
index 1ba81916030..8c816928625 100644
--- a/src/lib/util/delegate.cpp
+++ b/src/lib/util/delegate.cpp
@@ -2,17 +2,28 @@
// copyright-holders:Aaron Giles
/***************************************************************************
- delegate.c
+ delegate.cpp
Templates and classes to enable delegates for callbacks.
***************************************************************************/
-#include <cassert>
-#include <cstdint>
-#include <cstdio>
#include "delegate.h"
+#include <cstdio>
+
+
+//**************************************************************************
+// MACROS
+//**************************************************************************
+
+#if defined(LOG_DELEGATES)
+#define LOG(...) printf(__VA_ARGS__)
+#else
+#define LOG(...) do { if (false) printf(__VA_ARGS__); } while (false)
+#endif
+
+
//**************************************************************************
// GLOBAL VARIABLES
@@ -20,7 +31,7 @@
#if (USE_DELEGATE_TYPE == DELEGATE_TYPE_COMPATIBLE)
-delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { {0 }};
+delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { { 0 } };
#endif
@@ -40,10 +51,9 @@ 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__) || 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
+ if ((m_this_delta & 1) == 0)
+ {
+ LOG("Calculated Addr = %p\n", reinterpret_cast<void const *>(uintptr_t(m_function)));
object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object) + m_this_delta);
return reinterpret_cast<delegate_generic_function>(m_function);
}
@@ -51,27 +61,22 @@ delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_clas
// otherwise, it is the byte index into the vtable where the actual function lives
std::uint8_t *vtable_base = *reinterpret_cast<std::uint8_t **>(object);
-#if defined(LOG_DELEGATES)
- printf("Calculated Addr = %08x (VTAB)\n", (uintptr_t)(void*)(*reinterpret_cast<delegate_generic_function *>(vtable_base + m_function + m_this_delta - 1)));
-#endif
+ LOG("Calculated Addr = %p (VTAB)\n", reinterpret_cast<void const *>(uintptr_t(*reinterpret_cast<delegate_generic_function *>(vtable_base + m_function + m_this_delta - 1))));
return *reinterpret_cast<delegate_generic_function *>(vtable_base + m_function + m_this_delta - 1);
#else
// apply the "this" delta to the object first
object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object) + m_this_delta);
// if the low bit of the vtable index is clear, then it is just a raw function pointer
- if (!(m_function & 1)) {
-#if defined(LOG_DELEGATES)
- printf("Calculated Addr = %08x\n", (uintptr_t)(void*)(m_function));
-#endif
+ if (!(m_function & 1))
+ {
+ LOG("Calculated Addr = %p\n", reinterpret_cast<void const *>(uintptr_t(m_function)));
return reinterpret_cast<delegate_generic_function>(m_function);
}
// otherwise, it is the byte index into the vtable where the actual function lives
std::uint8_t *vtable_base = *reinterpret_cast<std::uint8_t **>(object);
-#if defined(LOG_DELEGATES)
- printf("Calculated Addr = %08x (VTAB)\n", (uintptr_t)(void*)(*reinterpret_cast<delegate_generic_function *>(vtable_base + m_function - 1)));
-#endif
+ LOG("Calculated Addr = %p (VTAB)\n", reinterpret_cast<void *>(uintptr_t(*reinterpret_cast<delegate_generic_function *>(vtable_base + m_function - 1))));
return *reinterpret_cast<delegate_generic_function *>(vtable_base + m_function - 1);
#endif
}