Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 07:52:35 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed MinGW AArch64 issues: (#11521)

Browse Source 
* 3rdparty/bimg: Don't enable SSE on MinGW arm64 targets.
* diagnostics/diagnostics_win32.cpp: Added Windows arm64 support.
This commit is contained in:
invertego 2023-09-01 09:06:21 -07:00 committed by GitHub
parent 39b639d058
commit 20a8b896ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/src/3rdparty.lua
View File

@ -1285,7 +1285,7 @@ project "bimg"
"BX_CONFIG_DEBUG=0",
}
configuration { "x64", "mingw*" }
configuration { "x64", "mingw*", "not arm64" }
defines {
"ASTCENC_AVX=0",
"ASTCENC_SSE=20",

69
src/osd/modules/diagnostics/diagnostics_win32.cpp
View File

@ -216,14 +216,18 @@ bool stack_walker::reset()
m_stackframe.AddrStack.Mode = AddrModeFlat;
// pull architecture-specific fields from the context
#ifdef PTR64
#if defined(__x86_64__) || defined(_M_X64)
m_stackframe.AddrPC.Offset = m_context.Rip;
m_stackframe.AddrFrame.Offset = m_context.Rsp;
m_stackframe.AddrStack.Offset = m_context.Rsp;
#else
#elif defined(__i386__) || defined(_M_IX86)
m_stackframe.AddrPC.Offset = m_context.Eip;
m_stackframe.AddrFrame.Offset = m_context.Ebp;
m_stackframe.AddrStack.Offset = m_context.Esp;
#elif defined(__aarch64__) || defined(_M_ARM64)
m_stackframe.AddrPC.Offset = m_context.Pc;
m_stackframe.AddrFrame.Offset = m_context.Fp;
m_stackframe.AddrStack.Offset = m_context.Sp;
#endif
return true;
}
@ -242,14 +246,18 @@ void stack_walker::reset(CONTEXT &initial, HANDLE thread)
m_stackframe.AddrStack.Mode = AddrModeFlat;
// pull architecture-specific fields from the context
#ifdef PTR64
#if defined(__x86_64__) || defined(_M_X64)
m_stackframe.AddrPC.Offset = m_context.Rip;
m_stackframe.AddrFrame.Offset = m_context.Rsp;
m_stackframe.AddrStack.Offset = m_context.Rsp;
#else
#elif defined(__i386__) || defined(_M_IX86)
m_stackframe.AddrPC.Offset = m_context.Eip;
m_stackframe.AddrFrame.Offset = m_context.Ebp;
m_stackframe.AddrStack.Offset = m_context.Esp;
#elif defined(__aarch64__) || defined(_M_ARM64)
m_stackframe.AddrPC.Offset = m_context.Pc;
m_stackframe.AddrFrame.Offset = m_context.Fp;
m_stackframe.AddrStack.Offset = m_context.Sp;
#endif
}
@ -263,10 +271,14 @@ bool stack_walker::unwind()
// if we were able to initialize, then we have everything we need
if (s_initialized)
{
#ifdef PTR64
#if defined(__x86_64__) || defined(_M_X64)
return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_AMD64, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
#else
#elif defined(__i386__) || defined(_M_IX86)
return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_I386, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
#elif defined(__aarch64__) || defined(_M_ARM64)
return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_ARM64, m_process, m_thread, &m_stackframe, &m_context, nullptr, *m_sym_function_table_access_64, *m_sym_get_module_base_64, nullptr);
#else
return false;
#endif
}
@ -997,7 +1009,7 @@ private:
// print the state of the CPU
fprintf(stderr, "-----------------------------------------------------\n");
#ifdef PTR64
#if defined(__x86_64__) || defined(_M_X64)
fprintf(stderr, "RAX=%p RBX=%p RCX=%p RDX=%p\n",
(void *)info->ContextRecord->Rax,
(void *)info->ContextRecord->Rbx,
@ -1018,7 +1030,7 @@ private:
(void *)info->ContextRecord->R13,
(void *)info->ContextRecord->R14,
(void *)info->ContextRecord->R15);
#else
#elif defined(__i386__) || defined(_M_IX86)
fprintf(stderr, "EAX=%p EBX=%p ECX=%p EDX=%p\n",
(void *)info->ContextRecord->Eax,
(void *)info->ContextRecord->Ebx,
@ -1029,6 +1041,47 @@ private:
(void *)info->ContextRecord->Edi,
(void *)info->ContextRecord->Ebp,
(void *)info->ContextRecord->Esp);
#elif defined(__aarch64__) || defined(_M_ARM64)
fprintf(stderr, " X0=%p X1=%p X2=%p X3=%p\n",
(void *)info->ContextRecord->X0,
(void *)info->ContextRecord->X1,
(void *)info->ContextRecord->X2,
(void *)info->ContextRecord->X3);
fprintf(stderr, " X4=%p X5=%p X6=%p X7=%p\n",
(void *)info->ContextRecord->X4,
(void *)info->ContextRecord->X5,
(void *)info->ContextRecord->X6,
(void *)info->ContextRecord->X7);
fprintf(stderr, " X8=%p X9=%p X10=%p X11=%p\n",
(void *)info->ContextRecord->X8,
(void *)info->ContextRecord->X9,
(void *)info->ContextRecord->X10,
(void *)info->ContextRecord->X11);
fprintf(stderr, "X12=%p X13=%p X14=%p X15=%p\n",
(void *)info->ContextRecord->X12,
(void *)info->ContextRecord->X13,
(void *)info->ContextRecord->X14,
(void *)info->ContextRecord->X15);
fprintf(stderr, "X16=%p X17=%p X18=%p X19=%p\n",
(void *)info->ContextRecord->X16,
(void *)info->ContextRecord->X17,
(void *)info->ContextRecord->X18,
(void *)info->ContextRecord->X19);
fprintf(stderr, "X20=%p X21=%p X22=%p X23=%p\n",
(void *)info->ContextRecord->X20,
(void *)info->ContextRecord->X21,
(void *)info->ContextRecord->X22,
(void *)info->ContextRecord->X23);
fprintf(stderr, "X24=%p X25=%p X26=%p X27=%p\n",
(void *)info->ContextRecord->X24,
(void *)info->ContextRecord->X25,
(void *)info->ContextRecord->X26,
(void *)info->ContextRecord->X27);
fprintf(stderr, "X28=%p FP=%p LR=%p SP=%p\n",
(void *)info->ContextRecord->X28,
(void *)info->ContextRecord->Fp,
(void *)info->ContextRecord->Lr,
(void *)info->ContextRecord->Sp);
#endif
// reprint the actual exception address