yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libphobos: Handle Darwin Arm and AArch64 in fibre context asm.

Browse Source 
This code currently fails to build because it contains ELF-
specific directives.  This patch excludes those directives when
the platform is Darwin.

We do not expect switching fibres between threads to be safe here
either owing to the possible caching of TLS pointers.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

libphobos/ChangeLog:

	* libdruntime/config/aarch64/switchcontext.S: Exclude ELF-
	specific constructs for Darwin.
	* libdruntime/config/arm/switchcontext.S: Likewise.
	* libdruntime/core/thread/fiber.d: Disable switching fibres
	between threads.

(cherry picked from commit 6757bf86142a61c7b4ebabb713d17231e86e12f7)
This commit is contained in:
Iain Sandoe 2023-07-02 11:14:08 +01:00
parent 025a3f4178
commit 50180d4afc
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libphobos/libdruntime/config/aarch64/switchcontext.S
View File

@ -44,7 +44,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
*/
.text
.global CSYM(fiber_switchContext)
#ifndef __APPLE__
.type CSYM(fiber_switchContext), %function
#endif
.align 4
CSYM(fiber_switchContext):
.cfi_startproc
@ -77,8 +79,9 @@ CSYM(fiber_switchContext):
ldp d15, d14, [sp], #20*8
ret
.cfi_endproc
#ifndef __APPLE__
.size CSYM(fiber_switchContext),.-CSYM(fiber_switchContext)
#endif
/**
* When generating any kind of backtrace (gdb, exception handling) for
* a function called in a Fiber, we need to tell the unwinder to stop
@ -93,11 +96,15 @@ CSYM(fiber_switchContext):
.text
.global CSYM(fiber_trampoline)
.p2align 2
#ifndef __APPLE__
.type CSYM(fiber_trampoline), %function
#endif
CSYM(fiber_trampoline):
.cfi_startproc
.cfi_undefined x30
// fiber_entryPoint never returns
bl CSYM(fiber_entryPoint)
.cfi_endproc
#ifndef __APPLE__
.size CSYM(fiber_trampoline),.-CSYM(fiber_trampoline)
#endif

8
libphobos/libdruntime/config/arm/switchcontext.S
View File

@ -60,11 +60,15 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
*/
.text
#ifndef __APPLE__
#if defined(__ARM_PCS_VFP) || (defined(__ARM_PCS) && !defined(__SOFTFP__))
.fpu vfp
#endif
.global CSYM(fiber_switchContext)
.type CSYM(fiber_switchContext), %function
#else
.global CSYM(fiber_switchContext)
#endif
.align 4
CSYM(fiber_switchContext):
.cfi_sections .debug_frame
@ -111,8 +115,12 @@ CSYM(fiber_switchContext):
mov lr, #0
// return by writing lr into pc
mov pc, r1
#ifndef __APPLE__
.fnend
.cfi_endproc
.size CSYM(fiber_switchContext),.-CSYM(fiber_switchContext)
#else
.cfi_endproc
#endif
#endif

1
libphobos/libdruntime/core/thread/fiber.d
View File

@ -1785,6 +1785,7 @@ version (OSX)
{
version (X86) version = UnsafeFiberMigration;
version (X86_64) version = UnsafeFiberMigration;
version (AArch64) version = UnsafeFiberMigration;
}
version (UnsafeFiberMigration)