Commit 8a3ae910 authored by Michael Matz's avatar Michael Matz Committed by Riku Voipio
Browse files

linux-user: AArch64: Implement SA_RESTORER for signal handlers 



Implement support for signal handlers with the SA_RESTORER
flag set.

Signed-off-by: default avatarMichael Matz <matz@suse.de>
[PMM: minor tweaks to make patch apply to current master]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent 4cf23480

linux-user/signal.c

+10 −6
Original line number Diff line number Diff line
@@ -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);

    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;