Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'mamedev:master' into master
Some checks are pending
CI (Emscripten) / build-linux (emscripten, 3.1.25, mame-web, mame) (push) Waiting to run
Details
CI (Windows) / build-windows (gcc, gcc, g++, mame, mame) (push) Waiting to run
Details

Browse Source
This commit is contained in:
holub 2025-01-13 14:18:59 -05:00 committed by GitHub
commit f193ce03ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/cpu/drcbearm64.cpp
View File

@ -8,6 +8,8 @@
#include "emuopts.h"
#include "uml.h"
#include "mfpresolve.h"
#include <cstddef>

3
src/lib/util/mfpresolve.h
View File

@ -15,6 +15,7 @@
#include "abi.h"
#include <cassert>
#include <cstddef>
#include <cstdint>
#include <utility>
@ -66,7 +67,7 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T:
{
if (MAME_ABI_CXX_TYPE == MAME_ABI_CXX_ITANIUM)
{
struct { uintptr_t ptr; ptrdiff_t adj; } equiv;
struct { std::uintptr_t ptr; std::ptrdiff_t adj; } equiv;
static_assert(sizeof(function) == sizeof(equiv));
*reinterpret_cast<decltype(function) *>(&equiv) = function;
return detail::resolve_member_function_itanium(equiv.ptr, equiv.adj, object);