[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/5] linux-user: AArch64: Implement SA_RESTORER for
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 2/5] linux-user: AArch64: Implement SA_RESTORER for signal handlers |
Date: |
Sun, 2 Mar 2014 19:36:39 +0000 |
From: Michael Matz <address@hidden>
Implement support for signal handlers with the SA_RESTORER
flag set.
Signed-off-by: Michael Matz <address@hidden>
[PMM: minor tweaks to make patch apply to current master]
Signed-off-by: Peter Maydell <address@hidden>
---
linux-user/signal.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 29734b2..c8a1da0 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -1273,7 +1273,7 @@ static void target_setup_frame(int usig, struct
target_sigaction *ka,
CPUARMState *env)
{
struct target_rt_sigframe *frame;
- abi_ulong frame_addr;
+ abi_ulong frame_addr, return_addr;
frame_addr = get_sigframe(ka, env);
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
@@ -1290,15 +1290,19 @@ static void target_setup_frame(int usig, struct
target_sigaction *ka,
__put_user(target_sigaltstack_used.ss_size,
&frame->uc.tuc_stack.ss_size);
target_setup_sigframe(frame, env, set);
- /* mov x8,#__NR_rt_sigreturn; svc #0 */
- __put_user(0xd2801168, &frame->tramp[0]);
- __put_user(0xd4000001, &frame->tramp[1]);
+ if (ka->sa_flags & TARGET_SA_RESTORER) {
+ return_addr = ka->sa_restorer;
+ } else {
+ /* mov x8,#__NR_rt_sigreturn; svc #0 */
+ __put_user(0xd2801168, &frame->tramp[0]);
+ __put_user(0xd4000001, &frame->tramp[1]);
+ return_addr = frame_addr + offsetof(struct target_rt_sigframe, tramp);
+ }
env->xregs[0] = usig;
env->xregs[31] = frame_addr;
env->xregs[29] = env->xregs[31] + offsetof(struct target_rt_sigframe, fp);
env->pc = ka->_sa_handler;
- env->xregs[30] = env->xregs[31] +
- offsetof(struct target_rt_sigframe, tramp);
+ env->xregs[30] = return_addr;
if (info) {
if (copy_siginfo_to_user(&frame->info, info)) {
goto give_sigsegv;
--
1.9.0
- [Qemu-devel] [PATCH 0/5] linux-user: various fixes for AArch64, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 2/5] linux-user: AArch64: Implement SA_RESTORER for signal handlers,
Peter Maydell <=
- [Qemu-devel] [PATCH 1/5] linux-user/signal.c: Fix AArch64 big-endian FP register restore, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 3/5] linux-user: Don't use UID16 on AArch64, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 4/5] linux-user: Fix getresuid, getresgid if !USE_UID16, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 5/5] linux-user: Implement sendmmsg syscall, Peter Maydell, 2014/03/02
- Re: [Qemu-devel] [PATCH 0/5] linux-user: various fixes for AArch64, Richard Henderson, 2014/03/03
- Re: [Qemu-devel] [PATCH 0/5] linux-user: various fixes for AArch64, Riku Voipio, 2014/03/03