|
 |
5de29b |
Backport
|
|
|
5de29b |
|
|
|
5de29b |
37d350073888887637aa67dddf988d9c4b226032 \
|
|
|
5de29b |
aarch64: Re-implement setcontext without rt_sigreturn syscall
|
|
|
5de29b |
03ea4d9b6916857e3c2a021f55d2a853cb837398 \
|
|
|
5de29b |
[AArch64] Simplify getcontext pstate initialization.
|
|
|
5de29b |
6e445a3d2bdf152ebf57d1c92bfea1828e070743 \
|
|
|
5de29b |
[AArch64] Ensure getcontext() initializes PSTATE.
|
|
|
5de29b |
|
|
|
5de29b |
|
|
|
12745e |
diff --git glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/getcontext.S glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/getcontext.S
|
|
|
5de29b |
index aff2e32..70b2e32 100644
|
|
|
12745e |
--- glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/getcontext.S
|
|
|
12745e |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/getcontext.S
|
|
|
5de29b |
@@ -1,6 +1,6 @@
|
|
|
5de29b |
/* Save current context.
|
|
|
5de29b |
|
|
|
5de29b |
- Copyright (C) 2009-2012 Free Software Foundation, Inc.
|
|
|
5de29b |
+ Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
|
|
5de29b |
|
|
|
5de29b |
This file is part of the GNU C Library.
|
|
|
5de29b |
|
|
|
5de29b |
@@ -53,6 +53,9 @@ ENTRY(__getcontext)
|
|
|
5de29b |
mov x2, sp
|
|
|
5de29b |
str x2, [x0, oSP]
|
|
|
5de29b |
|
|
|
5de29b |
+ /* Initialize the pstate. */
|
|
|
5de29b |
+ str xzr, [x0, oPSTATE]
|
|
|
5de29b |
+
|
|
|
5de29b |
/* Figure out where to place the first context extension
|
|
|
5de29b |
block. */
|
|
|
5de29b |
add x2, x0, #oEXTENSION
|
|
|
12745e |
diff --git glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/setcontext.S glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/setcontext.S
|
|
|
5de29b |
index a98f67f..f45a655 100644
|
|
|
12745e |
--- glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/setcontext.S
|
|
|
12745e |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/setcontext.S
|
|
|
5de29b |
@@ -1,6 +1,6 @@
|
|
|
5de29b |
/* Set current context.
|
|
|
5de29b |
|
|
|
5de29b |
- Copyright (C) 2009-2012 Free Software Foundation, Inc.
|
|
|
5de29b |
+ Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
|
|
5de29b |
|
|
|
5de29b |
This file is part of the GNU C Library.
|
|
|
5de29b |
|
|
|
5de29b |
@@ -22,68 +22,108 @@
|
|
|
5de29b |
#include "ucontext_i.h"
|
|
|
5de29b |
#include "ucontext-internal.h"
|
|
|
5de29b |
|
|
|
5de29b |
-/* int setcontext (const ucontext_t *ucp) */
|
|
|
5de29b |
+/* int __setcontext (const ucontext_t *ucp)
|
|
|
5de29b |
|
|
|
5de29b |
- .text
|
|
|
5de29b |
-
|
|
|
5de29b |
-ENTRY(__setcontext)
|
|
|
5de29b |
-
|
|
|
5de29b |
- /* Create a signal frame on the stack:
|
|
|
5de29b |
-
|
|
|
5de29b |
- fp
|
|
|
5de29b |
- lr
|
|
|
5de29b |
- ...
|
|
|
5de29b |
- sp-> rt_sigframe
|
|
|
5de29b |
- */
|
|
|
5de29b |
-
|
|
|
5de29b |
- stp x29, x30, [sp, -16]!
|
|
|
5de29b |
- cfi_adjust_cfa_offset (16)
|
|
|
5de29b |
- cfi_rel_offset (x29, 0)
|
|
|
5de29b |
- cfi_rel_offset (x30, 8)
|
|
|
5de29b |
-
|
|
|
5de29b |
- mov x29, sp
|
|
|
5de29b |
- cfi_def_cfa_register (x29)
|
|
|
5de29b |
-
|
|
|
5de29b |
- /* Allocate space for the sigcontext. */
|
|
|
5de29b |
- mov w3, #((RT_SIGFRAME_SIZE + SP_ALIGN_SIZE) & SP_ALIGN_MASK)
|
|
|
5de29b |
- sub sp, sp, x3
|
|
|
5de29b |
+ Restores the machine context in UCP and thereby resumes execution
|
|
|
5de29b |
+ in that context.
|
|
|
5de29b |
|
|
|
5de29b |
- /* Compute the base address of the ucontext structure. */
|
|
|
5de29b |
- add x1, sp, #RT_SIGFRAME_UCONTEXT
|
|
|
5de29b |
+ This implementation is intended to be used for *synchronous* context
|
|
|
5de29b |
+ switches only. Therefore, it does not have to restore anything
|
|
|
5de29b |
+ other than the PRESERVED state. */
|
|
|
5de29b |
|
|
|
5de29b |
- /* Only ucontext is required in the frame, *copy* it in. */
|
|
|
5de29b |
-
|
|
|
5de29b |
-#if UCONTEXT_SIZE % 16
|
|
|
5de29b |
-#error The implementation of setcontext.S assumes sizeof(ucontext_t) % 16 == 0
|
|
|
5de29b |
-#endif
|
|
|
5de29b |
-
|
|
|
5de29b |
- mov x2, #UCONTEXT_SIZE / 16
|
|
|
5de29b |
-0:
|
|
|
5de29b |
- ldp x3, x4, [x0], #16
|
|
|
5de29b |
- stp x3, x4, [x1], #16
|
|
|
5de29b |
- sub x2, x2, 1
|
|
|
5de29b |
- cbnz x2, 0b
|
|
|
5de29b |
+ .text
|
|
|
5de29b |
|
|
|
5de29b |
- /* rt_sigreturn () -- no arguments, sp points to struct rt_sigframe. */
|
|
|
5de29b |
- mov x8, SYS_ify (rt_sigreturn)
|
|
|
5de29b |
+ENTRY (__setcontext)
|
|
|
5de29b |
+ /* Save a copy of UCP. */
|
|
|
5de29b |
+ mov x9, x0
|
|
|
5de29b |
+
|
|
|
5de29b |
+ /* Set the signal mask with
|
|
|
5de29b |
+ rt_sigprocmask (SIG_SETMASK, mask, NULL, _NSIG/8). */
|
|
|
5de29b |
+ mov x0, #SIG_SETMASK
|
|
|
5de29b |
+ add x1, x9, #UCONTEXT_SIGMASK
|
|
|
5de29b |
+ mov x2, #0
|
|
|
5de29b |
+ mov x3, #_NSIG8
|
|
|
5de29b |
+ mov x8, SYS_ify (rt_sigprocmask)
|
|
|
5de29b |
svc 0
|
|
|
5de29b |
-
|
|
|
5de29b |
- /* Ooops we failed. Recover the stack */
|
|
|
5de29b |
-
|
|
|
5de29b |
- mov sp, x29
|
|
|
5de29b |
- cfi_def_cfa_register (sp)
|
|
|
5de29b |
-
|
|
|
5de29b |
- ldp x29, x30, [sp], 16
|
|
|
5de29b |
- cfi_adjust_cfa_offset (16)
|
|
|
5de29b |
- cfi_restore (x29)
|
|
|
5de29b |
- cfi_restore (x30)
|
|
|
5de29b |
- b C_SYMBOL_NAME(__syscall_error)
|
|
|
5de29b |
-
|
|
|
5de29b |
+ cbz x0, 1f
|
|
|
5de29b |
+ b C_SYMBOL_NAME (__syscall_error)
|
|
|
5de29b |
+1:
|
|
|
5de29b |
+ /* Restore the general purpose registers. */
|
|
|
5de29b |
+ mov x0, x9
|
|
|
5de29b |
+ cfi_def_cfa (x0, 0)
|
|
|
5de29b |
+ cfi_offset (x18, oX0 + 18 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x19, oX0 + 19 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x20, oX0 + 20 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x21, oX0 + 21 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x22, oX0 + 22 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x23, oX0 + 23 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x24, oX0 + 24 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x25, oX0 + 25 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x26, oX0 + 26 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x27, oX0 + 27 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x28, oX0 + 28 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x29, oX0 + 29 * SZREG)
|
|
|
5de29b |
+ cfi_offset (x30, oX0 + 30 * SZREG)
|
|
|
5de29b |
+
|
|
|
5de29b |
+ cfi_offset ( d8, oV0 + 8 * SZVREG)
|
|
|
5de29b |
+ cfi_offset ( d9, oV0 + 9 * SZVREG)
|
|
|
5de29b |
+ cfi_offset (d10, oV0 + 10 * SZVREG)
|
|
|
5de29b |
+ cfi_offset (d11, oV0 + 11 * SZVREG)
|
|
|
5de29b |
+ cfi_offset (d12, oV0 + 12 * SZVREG)
|
|
|
5de29b |
+ cfi_offset (d13, oV0 + 13 * SZVREG)
|
|
|
5de29b |
+ cfi_offset (d14, oV0 + 14 * SZVREG)
|
|
|
5de29b |
+ cfi_offset (d15, oV0 + 15 * SZVREG)
|
|
|
5de29b |
+ ldp x18, x19, [x0, oX0 + 18 * SZREG]
|
|
|
5de29b |
+ ldp x20, x21, [x0, oX0 + 20 * SZREG]
|
|
|
5de29b |
+ ldp x22, x23, [x0, oX0 + 22 * SZREG]
|
|
|
5de29b |
+ ldp x24, x25, [x0, oX0 + 24 * SZREG]
|
|
|
5de29b |
+ ldp x26, x27, [x0, oX0 + 26 * SZREG]
|
|
|
5de29b |
+ ldp x28, x29, [x0, oX0 + 28 * SZREG]
|
|
|
5de29b |
+ ldr x30, [x0, oX0 + 30 * SZREG]
|
|
|
5de29b |
+ ldr x2, [x0, oSP]
|
|
|
5de29b |
+ mov sp, x2
|
|
|
5de29b |
+
|
|
|
5de29b |
+ /* Check for FP SIMD context. We don't support restoring
|
|
|
5de29b |
+ contexts created by the kernel, so this context must have
|
|
|
5de29b |
+ been created by getcontext. Hence we can rely on the
|
|
|
5de29b |
+ first extension block being the FP SIMD context. */
|
|
|
5de29b |
+ add x2, x0, #oEXTENSION
|
|
|
5de29b |
+
|
|
|
5de29b |
+ mov w3, #(FPSIMD_MAGIC & 0xffff)
|
|
|
5de29b |
+ movk w3, #(FPSIMD_MAGIC >> 16), lsl #16
|
|
|
5de29b |
+ ldr w1, [x2, #oHEAD + oMAGIC]
|
|
|
5de29b |
+ cmp w1, w3
|
|
|
5de29b |
+ b.ne 2f
|
|
|
5de29b |
+
|
|
|
5de29b |
+ /* Restore the FP SIMD context. */
|
|
|
5de29b |
+ add x3, x2, #oV0 + 8 * SZVREG
|
|
|
5de29b |
+ ldp d8, d9, [x3], #2 * SZVREG
|
|
|
5de29b |
+ ldp d10, d11, [x3], #2 * SZVREG
|
|
|
5de29b |
+ ldp d12, d13, [x3], #2 * SZVREG
|
|
|
5de29b |
+ ldp d14, d15, [x3], #2 * SZVREG
|
|
|
5de29b |
+
|
|
|
5de29b |
+ add x3, x2, oFPSR
|
|
|
5de29b |
+
|
|
|
5de29b |
+ ldr w4, [x3]
|
|
|
5de29b |
+ msr fpsr, x4
|
|
|
5de29b |
+
|
|
|
5de29b |
+ ldr w4, [x3, oFPCR - oFPSR]
|
|
|
5de29b |
+ msr fpcr, x4
|
|
|
5de29b |
+
|
|
|
5de29b |
+2:
|
|
|
5de29b |
+ ldr x16, [x0, oPC]
|
|
|
5de29b |
+ /* Restore arg registers. */
|
|
|
5de29b |
+ ldp x2, x3, [x0, oX0 + 2 * SZREG]
|
|
|
5de29b |
+ ldp x4, x5, [x0, oX0 + 4 * SZREG]
|
|
|
5de29b |
+ ldp x6, x7, [x0, oX0 + 6 * SZREG]
|
|
|
5de29b |
+ ldp x0, x1, [x0, oX0 + 0 * SZREG]
|
|
|
5de29b |
+ /* Jump to the new pc value. */
|
|
|
5de29b |
+ br x16
|
|
|
5de29b |
PSEUDO_END (__setcontext)
|
|
|
5de29b |
weak_alias (__setcontext, setcontext)
|
|
|
5de29b |
|
|
|
5de29b |
-ENTRY(__startcontext)
|
|
|
5de29b |
+ENTRY (__startcontext)
|
|
|
5de29b |
mov x0, x19
|
|
|
5de29b |
cbnz x0, __setcontext
|
|
|
5de29b |
-1: b HIDDEN_JUMPTARGET(_exit)
|
|
|
5de29b |
-END(__startcontext)
|
|
|
5de29b |
+1: b HIDDEN_JUMPTARGET (_exit)
|
|
|
5de29b |
+END (__startcontext)
|
|
|
12745e |
diff --git glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/ucontext_i.sym glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/ucontext_i.sym
|
|
|
5de29b |
index 1afff78..ab3930c 100644
|
|
|
12745e |
--- glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/ucontext_i.sym
|
|
|
12745e |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/ucontext_i.sym
|
|
|
5de29b |
@@ -37,6 +37,7 @@ STACK_FLAGS stack (ss_flags)
|
|
|
5de29b |
oX0 mcontext (regs)
|
|
|
5de29b |
oSP mcontext (sp)
|
|
|
5de29b |
oPC mcontext (pc)
|
|
|
5de29b |
+oPSTATE mcontext (pstate)
|
|
|
5de29b |
oEXTENSION mcontext (__reserved)
|
|
|
5de29b |
|
|
|
5de29b |
#define fpsimd_context(member) offsetof (struct fpsimd_context, member)
|