Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-27 22:54:42 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed delegates for ARM and MIPS (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-03-20 14:04:04 +01:00
parent e0221f47d7
commit 13453b312f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/util/delegate.cpp
View File

@ -40,14 +40,11 @@ delegate_mfp::raw_mfp_data delegate_mfp::s_null_mfp = { {0 }};
delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const delegate_generic_function delegate_mfp::convert_to_generic(delegate_generic_class *&object) const
{ {
#if defined(__arm__) || defined(__ARMEL__) || defined(__aarch64__) #if defined(__arm__) || defined(__ARMEL__) || defined(__aarch64__)
// apply the "this" delta to the object first if ((m_this_delta & 1) == 0) {
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(LOG_DELEGATES) #if defined(LOG_DELEGATES)
printf("Calculated Addr = %08x\n", (uintptr_t)(void*)(m_function)); printf("Calculated Addr = %08x\n", (uintptr_t)(void*)(m_function));
#endif #endif
object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object) + m_this_delta);
return reinterpret_cast<delegate_generic_function>(m_function); return reinterpret_cast<delegate_generic_function>(m_function);
} }
object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object)); object = reinterpret_cast<delegate_generic_class *>(reinterpret_cast<std::uint8_t *>(object));