From 74d84d84dfab47cf84bff8827009cbf001ec195b Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Sat, 2 Dec 2023 22:12:00 +0900 Subject: [PATCH 1/3] gh-112535: Update _Py_ThreadId() to support PowerPC --- Include/object.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Include/object.h b/Include/object.h index 81f777ad21f2f9..8fd74b1160b1c9 100644 --- a/Include/object.h +++ b/Include/object.h @@ -261,6 +261,22 @@ _Py_ThreadId(void) __asm__ ("mrs %0, tpidrro_el0" : "=r" (tid)); #elif defined(__aarch64__) __asm__ ("mrs %0, tpidr_el0" : "=r" (tid)); +#elif defined(__powerpc64__) + #if defined(__clang__) && __has_builtin(__builtin_thread_pointer) + tid = __builtin_thread_pointer(); + #else + register uintptr_t tp __asm__ ("r13"); + __asm__("" : "=r" (tp)); + tid = tp; + #endif +#elif defined(__powerpc__) + #if defined(__clang__) && __has_builtin(__builtin_thread_pointer) + tid = __builtin_thread_pointer(); + #else + register uintptr_t tp __asm__ ("r2"); + __asm__ ("" : "=r" (tp)); + tid = tp; + #endif #else # error "define _Py_ThreadId for this platform" #endif From fd4c844b1d282bd1691d7dbd9b0b0608e5e6432b Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Sun, 3 Dec 2023 09:22:55 +0900 Subject: [PATCH 2/3] Address code review --- Include/object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/object.h b/Include/object.h index 8fd74b1160b1c9..25610441cdc78f 100644 --- a/Include/object.h +++ b/Include/object.h @@ -262,7 +262,7 @@ _Py_ThreadId(void) #elif defined(__aarch64__) __asm__ ("mrs %0, tpidr_el0" : "=r" (tid)); #elif defined(__powerpc64__) - #if defined(__clang__) && __has_builtin(__builtin_thread_pointer) + #if defined(__clang__) && _Py__has_builtin(__builtin_thread_pointer) tid = __builtin_thread_pointer(); #else register uintptr_t tp __asm__ ("r13"); @@ -270,7 +270,7 @@ _Py_ThreadId(void) tid = tp; #endif #elif defined(__powerpc__) - #if defined(__clang__) && __has_builtin(__builtin_thread_pointer) + #if defined(__clang__) && _Py__has_builtin(__builtin_thread_pointer) tid = __builtin_thread_pointer(); #else register uintptr_t tp __asm__ ("r2"); From faac7b969672a573fd75e0a8f6f1aae2cbefbc4b Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Tue, 5 Dec 2023 06:17:19 +0900 Subject: [PATCH 3/3] Address code review --- Include/object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/object.h b/Include/object.h index 25610441cdc78f..dfeb43bda7d841 100644 --- a/Include/object.h +++ b/Include/object.h @@ -263,7 +263,7 @@ _Py_ThreadId(void) __asm__ ("mrs %0, tpidr_el0" : "=r" (tid)); #elif defined(__powerpc64__) #if defined(__clang__) && _Py__has_builtin(__builtin_thread_pointer) - tid = __builtin_thread_pointer(); + tid = (uintptr_t)__builtin_thread_pointer(); #else register uintptr_t tp __asm__ ("r13"); __asm__("" : "=r" (tp)); @@ -271,7 +271,7 @@ _Py_ThreadId(void) #endif #elif defined(__powerpc__) #if defined(__clang__) && _Py__has_builtin(__builtin_thread_pointer) - tid = __builtin_thread_pointer(); + tid = (uintptr_t)__builtin_thread_pointer(); #else register uintptr_t tp __asm__ ("r2"); __asm__ ("" : "=r" (tp));