From 4bf84095b5c57fc1dd9d50b85a19c7c1c342f3b7 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sat, 30 Aug 2025 23:08:31 +0000 Subject: [PATCH] [nce] fix thread kill Signed-off-by: lizzie --- src/core/arm/nce/arm_nce.s | 4 ++-- src/dynarmic/src/dynarmic/common/context.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/arm/nce/arm_nce.s b/src/core/arm/nce/arm_nce.s index f075e7dfc6..58337e7e74 100644 --- a/src/core/arm/nce/arm_nce.s +++ b/src/core/arm/nce/arm_nce.s @@ -71,8 +71,8 @@ _ZN4Core6ArmNce37ReturnToRunCodeByExceptionLevelChangeEiPv: mov x1, #(ReturnToRunCodeByExceptionLevelChangeSignal) #ifdef __APPLE__ /* I can never be happy, why no tkill in mach kernel? Ugh ... */ - /* Signature: 328 AUE_PTHREADKILL ALL { int __pthread_kill(int thread_port, int sig); } */ - mov x16, #328 + /* Signature: 43040 AUE_PTHREADKILL ALL { int __pthread_kill(int thread_port, int sig); } */ + mov x16, #(43040) #else /* Signature: int tgkill(pid_t tgid, pid_t tid, int sig); */ mov x8, #(__NR_tkill) diff --git a/src/dynarmic/src/dynarmic/common/context.h b/src/dynarmic/src/dynarmic/common/context.h index b9b78ee937..1e1e9f3545 100644 --- a/src/dynarmic/src/dynarmic/common/context.h +++ b/src/dynarmic/src/dynarmic/common/context.h @@ -97,7 +97,7 @@ inline _STRUCT_ARM_NEON_STATE64* GetFloatingPointState(mcontext_t& host_ctx) { return &(host_ctx->__ns); } -#else +#elif defined(__linux__) inline fpsimd_context* GetFloatingPointState(mcontext_t& host_ctx) { _aarch64_ctx* header = reinterpret_cast<_aarch64_ctx*>(&host_ctx.__reserved); while (header->magic != FPSIMD_MAGIC) {