From 7b31374183d7399b9bc8ca8e4455bf05b14693ed Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Fri, 7 Nov 2025 13:25:51 +0100 Subject: [PATCH 1/2] Adjust OFFSETOF__Thread__m_pInterpThreadContext for Apple mobile simulators --- src/coreclr/vm/amd64/asmconstants.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/coreclr/vm/amd64/asmconstants.h b/src/coreclr/vm/amd64/asmconstants.h index d22f5d93a12639..d5b2ac6e90bff0 100644 --- a/src/coreclr/vm/amd64/asmconstants.h +++ b/src/coreclr/vm/amd64/asmconstants.h @@ -569,7 +569,11 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadLocalInfo__m_pThread == offsetof(ThreadLoc ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod, pCallStub)) #ifdef TARGET_UNIX +#ifdef _DEBUG #define OFFSETOF__Thread__m_pInterpThreadContext 0xb08 +#else +#define OFFSETOF__Thread__m_pInterpThreadContext 0x2a0 +#endif #else // TARGET_UNIX #define OFFSETOF__Thread__m_pInterpThreadContext 0xb60 #endif // TARGET_UNIX From b31dfc33a725a7dc70872ceff4190dee312a45db Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Fri, 14 Nov 2025 11:20:00 +0100 Subject: [PATCH 2/2] Update src/coreclr/vm/amd64/asmconstants.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/coreclr/vm/amd64/asmconstants.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/vm/amd64/asmconstants.h b/src/coreclr/vm/amd64/asmconstants.h index d5b2ac6e90bff0..8e508b9cc716fb 100644 --- a/src/coreclr/vm/amd64/asmconstants.h +++ b/src/coreclr/vm/amd64/asmconstants.h @@ -571,9 +571,9 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__InterpMethod__pCallStub == offsetof(InterpMethod #ifdef TARGET_UNIX #ifdef _DEBUG #define OFFSETOF__Thread__m_pInterpThreadContext 0xb08 -#else +#else // _DEBUG #define OFFSETOF__Thread__m_pInterpThreadContext 0x2a0 -#endif +#endif // _DEBUG #else // TARGET_UNIX #define OFFSETOF__Thread__m_pInterpThreadContext 0xb60 #endif // TARGET_UNIX