Re: [qemu-s390x] [PATCH for 2.13 v2 11/20] linux-user: move alpha signal.c parts to alpha directory

[Philippe Mathieu-Daudé]

On 03/23/2018 07:57 PM, Laurent Vivier wrote:
> No code change, only move code from signal.c to
> alpha/signal.c, except adding includes and
> exporting setup_frame() and setup_rt_frame().
> 
> Signed-off-by: Laurent Vivier <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  linux-user/alpha/signal.c        | 262 
> +++++++++++++++++++++++++++++++++++++++
>  linux-user/alpha/target_signal.h |   5 +
>  linux-user/signal.c              | 259 --------------------------------------
>  3 files changed, 267 insertions(+), 259 deletions(-)
> 
> diff --git a/linux-user/alpha/signal.c b/linux-user/alpha/signal.c
> index 02ca338b6c..74ecdc6683 100644
> --- a/linux-user/alpha/signal.c
> +++ b/linux-user/alpha/signal.c
> @@ -16,3 +16,265 @@
>   *  You should have received a copy of the GNU General Public License
>   *  along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
> +#include "qemu/osdep.h"
> +#include "qemu.h"
> +#include "target_signal.h"
> +#include "signal-common.h"
> +#include "linux-user/trace.h"
> +
> +struct target_sigcontext {
> +    abi_long sc_onstack;
> +    abi_long sc_mask;
> +    abi_long sc_pc;
> +    abi_long sc_ps;
> +    abi_long sc_regs[32];
> +    abi_long sc_ownedfp;
> +    abi_long sc_fpregs[32];
> +    abi_ulong sc_fpcr;
> +    abi_ulong sc_fp_control;
> +    abi_ulong sc_reserved1;
> +    abi_ulong sc_reserved2;
> +    abi_ulong sc_ssize;
> +    abi_ulong sc_sbase;
> +    abi_ulong sc_traparg_a0;
> +    abi_ulong sc_traparg_a1;
> +    abi_ulong sc_traparg_a2;
> +    abi_ulong sc_fp_trap_pc;
> +    abi_ulong sc_fp_trigger_sum;
> +    abi_ulong sc_fp_trigger_inst;
> +};
> +
> +struct target_ucontext {
> +    abi_ulong tuc_flags;
> +    abi_ulong tuc_link;
> +    abi_ulong tuc_osf_sigmask;
> +    target_stack_t tuc_stack;
> +    struct target_sigcontext tuc_mcontext;
> +    target_sigset_t tuc_sigmask;
> +};
> +
> +struct target_sigframe {
> +    struct target_sigcontext sc;
> +    unsigned int retcode[3];
> +};
> +
> +struct target_rt_sigframe {
> +    target_siginfo_t info;
> +    struct target_ucontext uc;
> +    unsigned int retcode[3];
> +};
> +
> +#define INSN_MOV_R30_R16        0x47fe0410
> +#define INSN_LDI_R0             0x201f0000
> +#define INSN_CALLSYS            0x00000083
> +
> +static void setup_sigcontext(struct target_sigcontext *sc, CPUAlphaState 
> *env,
> +                             abi_ulong frame_addr, target_sigset_t *set)
> +{
> +    int i;
> +
> +    __put_user(on_sig_stack(frame_addr), &sc->sc_onstack);
> +    __put_user(set->sig[0], &sc->sc_mask);
> +    __put_user(env->pc, &sc->sc_pc);
> +    __put_user(8, &sc->sc_ps);
> +
> +    for (i = 0; i < 31; ++i) {
> +        __put_user(env->ir[i], &sc->sc_regs[i]);
> +    }
> +    __put_user(0, &sc->sc_regs[31]);
> +
> +    for (i = 0; i < 31; ++i) {
> +        __put_user(env->fir[i], &sc->sc_fpregs[i]);
> +    }
> +    __put_user(0, &sc->sc_fpregs[31]);
> +    __put_user(cpu_alpha_load_fpcr(env), &sc->sc_fpcr);
> +
> +    __put_user(0, &sc->sc_traparg_a0); /* FIXME */
> +    __put_user(0, &sc->sc_traparg_a1); /* FIXME */
> +    __put_user(0, &sc->sc_traparg_a2); /* FIXME */
> +}
> +
> +static void restore_sigcontext(CPUAlphaState *env,
> +                               struct target_sigcontext *sc)
> +{
> +    uint64_t fpcr;
> +    int i;
> +
> +    __get_user(env->pc, &sc->sc_pc);
> +
> +    for (i = 0; i < 31; ++i) {
> +        __get_user(env->ir[i], &sc->sc_regs[i]);
> +    }
> +    for (i = 0; i < 31; ++i) {
> +        __get_user(env->fir[i], &sc->sc_fpregs[i]);
> +    }
> +
> +    __get_user(fpcr, &sc->sc_fpcr);
> +    cpu_alpha_store_fpcr(env, fpcr);
> +}
> +
> +static inline abi_ulong get_sigframe(struct target_sigaction *sa,
> +                                     CPUAlphaState *env,
> +                                     unsigned long framesize)
> +{
> +    abi_ulong sp = env->ir[IR_SP];
> +
> +    /* This is the X/Open sanctioned signal stack switching.  */
> +    if ((sa->sa_flags & TARGET_SA_ONSTACK) != 0 && !sas_ss_flags(sp)) {
> +        sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
> +    }
> +    return (sp - framesize) & -32;
> +}
> +
> +void setup_frame(int sig, struct target_sigaction *ka,
> +                 target_sigset_t *set, CPUAlphaState *env)
> +{
> +    abi_ulong frame_addr, r26;
> +    struct target_sigframe *frame;
> +    int err = 0;
> +
> +    frame_addr = get_sigframe(ka, env, sizeof(*frame));
> +    trace_user_setup_frame(env, frame_addr);
> +    if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
> +        goto give_sigsegv;
> +    }
> +
> +    setup_sigcontext(&frame->sc, env, frame_addr, set);
> +
> +    if (ka->sa_restorer) {
> +        r26 = ka->sa_restorer;
> +    } else {
> +        __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
> +        __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn,
> +                   &frame->retcode[1]);
> +        __put_user(INSN_CALLSYS, &frame->retcode[2]);
> +        /* imb() */
> +        r26 = frame_addr;
> +    }
> +
> +    unlock_user_struct(frame, frame_addr, 1);
> +
> +    if (err) {
> +give_sigsegv:
> +        force_sigsegv(sig);
> +        return;
> +    }
> +
> +    env->ir[IR_RA] = r26;
> +    env->ir[IR_PV] = env->pc = ka->_sa_handler;
> +    env->ir[IR_A0] = sig;
> +    env->ir[IR_A1] = 0;
> +    env->ir[IR_A2] = frame_addr + offsetof(struct target_sigframe, sc);
> +    env->ir[IR_SP] = frame_addr;
> +}
> +
> +void setup_rt_frame(int sig, struct target_sigaction *ka,
> +                    target_siginfo_t *info,
> +                    target_sigset_t *set, CPUAlphaState *env)
> +{
> +    abi_ulong frame_addr, r26;
> +    struct target_rt_sigframe *frame;
> +    int i, err = 0;
> +
> +    frame_addr = get_sigframe(ka, env, sizeof(*frame));
> +    trace_user_setup_rt_frame(env, frame_addr);
> +    if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
> +        goto give_sigsegv;
> +    }
> +
> +    tswap_siginfo(&frame->info, info);
> +
> +    __put_user(0, &frame->uc.tuc_flags);
> +    __put_user(0, &frame->uc.tuc_link);
> +    __put_user(set->sig[0], &frame->uc.tuc_osf_sigmask);
> +    __put_user(target_sigaltstack_used.ss_sp,
> +               &frame->uc.tuc_stack.ss_sp);
> +    __put_user(sas_ss_flags(env->ir[IR_SP]),
> +               &frame->uc.tuc_stack.ss_flags);
> +    __put_user(target_sigaltstack_used.ss_size,
> +               &frame->uc.tuc_stack.ss_size);
> +    setup_sigcontext(&frame->uc.tuc_mcontext, env, frame_addr, set);
> +    for (i = 0; i < TARGET_NSIG_WORDS; ++i) {
> +        __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]);
> +    }
> +
> +    if (ka->sa_restorer) {
> +        r26 = ka->sa_restorer;
> +    } else {
> +        __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
> +        __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn,
> +                   &frame->retcode[1]);
> +        __put_user(INSN_CALLSYS, &frame->retcode[2]);
> +        /* imb(); */
> +        r26 = frame_addr;
> +    }
> +
> +    if (err) {
> +give_sigsegv:
> +        force_sigsegv(sig);
> +        return;
> +    }
> +
> +    env->ir[IR_RA] = r26;
> +    env->ir[IR_PV] = env->pc = ka->_sa_handler;
> +    env->ir[IR_A0] = sig;
> +    env->ir[IR_A1] = frame_addr + offsetof(struct target_rt_sigframe, info);
> +    env->ir[IR_A2] = frame_addr + offsetof(struct target_rt_sigframe, uc);
> +    env->ir[IR_SP] = frame_addr;
> +}
> +
> +long do_sigreturn(CPUAlphaState *env)
> +{
> +    struct target_sigcontext *sc;
> +    abi_ulong sc_addr = env->ir[IR_A0];
> +    target_sigset_t target_set;
> +    sigset_t set;
> +
> +    if (!lock_user_struct(VERIFY_READ, sc, sc_addr, 1)) {
> +        goto badframe;
> +    }
> +
> +    target_sigemptyset(&target_set);
> +    __get_user(target_set.sig[0], &sc->sc_mask);
> +
> +    target_to_host_sigset_internal(&set, &target_set);
> +    set_sigmask(&set);
> +
> +    restore_sigcontext(env, sc);
> +    unlock_user_struct(sc, sc_addr, 0);
> +    return -TARGET_QEMU_ESIGRETURN;
> +
> +badframe:
> +    force_sig(TARGET_SIGSEGV);
> +    return -TARGET_QEMU_ESIGRETURN;
> +}
> +
> +long do_rt_sigreturn(CPUAlphaState *env)
> +{
> +    abi_ulong frame_addr = env->ir[IR_A0];
> +    struct target_rt_sigframe *frame;
> +    sigset_t set;
> +
> +    trace_user_do_rt_sigreturn(env, frame_addr);
> +    if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) {
> +        goto badframe;
> +    }
> +    target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
> +    set_sigmask(&set);
> +
> +    restore_sigcontext(env, &frame->uc.tuc_mcontext);
> +    if (do_sigaltstack(frame_addr + offsetof(struct target_rt_sigframe,
> +                                             uc.tuc_stack),
> +                       0, env->ir[IR_SP]) == -EFAULT) {
> +        goto badframe;
> +    }
> +
> +    unlock_user_struct(frame, frame_addr, 0);
> +    return -TARGET_QEMU_ESIGRETURN;
> +
> +
> +badframe:
> +    unlock_user_struct(frame, frame_addr, 0);
> +    force_sig(TARGET_SIGSEGV);
> +    return -TARGET_QEMU_ESIGRETURN;
> +}
> diff --git a/linux-user/alpha/target_signal.h 
> b/linux-user/alpha/target_signal.h
> index f1ed00d50e..42343a1ae6 100644
> --- a/linux-user/alpha/target_signal.h
> +++ b/linux-user/alpha/target_signal.h
> @@ -55,4 +55,9 @@ static inline abi_ulong get_sp_from_cpustate(CPUAlphaState 
> *state)
>  #define TARGET_GEN_SUBRNG6     -24
>  #define TARGET_GEN_SUBRNG7     -25
>  
> +void setup_frame(int sig, struct target_sigaction *ka,
> +                 target_sigset_t *set, CPUAlphaState *env);
> +void setup_rt_frame(int sig, struct target_sigaction *ka,
> +                    target_siginfo_t *info,
> +                    target_sigset_t *set, CPUAlphaState *env);
>  #endif /* ALPHA_TARGET_SIGNAL_H */
> diff --git a/linux-user/signal.c b/linux-user/signal.c
> index e211ef6ff0..dab405fb43 100644
> --- a/linux-user/signal.c
> +++ b/linux-user/signal.c
> @@ -3032,265 +3032,6 @@ sigsegv:
>      return -TARGET_QEMU_ESIGRETURN;
>  }
>  
> -#elif defined(TARGET_ALPHA)
> -
> -struct target_sigcontext {
> -    abi_long sc_onstack;
> -    abi_long sc_mask;
> -    abi_long sc_pc;
> -    abi_long sc_ps;
> -    abi_long sc_regs[32];
> -    abi_long sc_ownedfp;
> -    abi_long sc_fpregs[32];
> -    abi_ulong sc_fpcr;
> -    abi_ulong sc_fp_control;
> -    abi_ulong sc_reserved1;
> -    abi_ulong sc_reserved2;
> -    abi_ulong sc_ssize;
> -    abi_ulong sc_sbase;
> -    abi_ulong sc_traparg_a0;
> -    abi_ulong sc_traparg_a1;
> -    abi_ulong sc_traparg_a2;
> -    abi_ulong sc_fp_trap_pc;
> -    abi_ulong sc_fp_trigger_sum;
> -    abi_ulong sc_fp_trigger_inst;
> -};
> -
> -struct target_ucontext {
> -    abi_ulong tuc_flags;
> -    abi_ulong tuc_link;
> -    abi_ulong tuc_osf_sigmask;
> -    target_stack_t tuc_stack;
> -    struct target_sigcontext tuc_mcontext;
> -    target_sigset_t tuc_sigmask;
> -};
> -
> -struct target_sigframe {
> -    struct target_sigcontext sc;
> -    unsigned int retcode[3];
> -};
> -
> -struct target_rt_sigframe {
> -    target_siginfo_t info;
> -    struct target_ucontext uc;
> -    unsigned int retcode[3];
> -};
> -
> -#define INSN_MOV_R30_R16        0x47fe0410
> -#define INSN_LDI_R0             0x201f0000
> -#define INSN_CALLSYS            0x00000083
> -
> -static void setup_sigcontext(struct target_sigcontext *sc, CPUAlphaState 
> *env,
> -                             abi_ulong frame_addr, target_sigset_t *set)
> -{
> -    int i;
> -
> -    __put_user(on_sig_stack(frame_addr), &sc->sc_onstack);
> -    __put_user(set->sig[0], &sc->sc_mask);
> -    __put_user(env->pc, &sc->sc_pc);
> -    __put_user(8, &sc->sc_ps);
> -
> -    for (i = 0; i < 31; ++i) {
> -        __put_user(env->ir[i], &sc->sc_regs[i]);
> -    }
> -    __put_user(0, &sc->sc_regs[31]);
> -
> -    for (i = 0; i < 31; ++i) {
> -        __put_user(env->fir[i], &sc->sc_fpregs[i]);
> -    }
> -    __put_user(0, &sc->sc_fpregs[31]);
> -    __put_user(cpu_alpha_load_fpcr(env), &sc->sc_fpcr);
> -
> -    __put_user(0, &sc->sc_traparg_a0); /* FIXME */
> -    __put_user(0, &sc->sc_traparg_a1); /* FIXME */
> -    __put_user(0, &sc->sc_traparg_a2); /* FIXME */
> -}
> -
> -static void restore_sigcontext(CPUAlphaState *env,
> -                               struct target_sigcontext *sc)
> -{
> -    uint64_t fpcr;
> -    int i;
> -
> -    __get_user(env->pc, &sc->sc_pc);
> -
> -    for (i = 0; i < 31; ++i) {
> -        __get_user(env->ir[i], &sc->sc_regs[i]);
> -    }
> -    for (i = 0; i < 31; ++i) {
> -        __get_user(env->fir[i], &sc->sc_fpregs[i]);
> -    }
> -
> -    __get_user(fpcr, &sc->sc_fpcr);
> -    cpu_alpha_store_fpcr(env, fpcr);
> -}
> -
> -static inline abi_ulong get_sigframe(struct target_sigaction *sa,
> -                                     CPUAlphaState *env,
> -                                     unsigned long framesize)
> -{
> -    abi_ulong sp = env->ir[IR_SP];
> -
> -    /* This is the X/Open sanctioned signal stack switching.  */
> -    if ((sa->sa_flags & TARGET_SA_ONSTACK) != 0 && !sas_ss_flags(sp)) {
> -        sp = target_sigaltstack_used.ss_sp + target_sigaltstack_used.ss_size;
> -    }
> -    return (sp - framesize) & -32;
> -}
> -
> -static void setup_frame(int sig, struct target_sigaction *ka,
> -                        target_sigset_t *set, CPUAlphaState *env)
> -{
> -    abi_ulong frame_addr, r26;
> -    struct target_sigframe *frame;
> -    int err = 0;
> -
> -    frame_addr = get_sigframe(ka, env, sizeof(*frame));
> -    trace_user_setup_frame(env, frame_addr);
> -    if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
> -        goto give_sigsegv;
> -    }
> -
> -    setup_sigcontext(&frame->sc, env, frame_addr, set);
> -
> -    if (ka->sa_restorer) {
> -        r26 = ka->sa_restorer;
> -    } else {
> -        __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
> -        __put_user(INSN_LDI_R0 + TARGET_NR_sigreturn,
> -                   &frame->retcode[1]);
> -        __put_user(INSN_CALLSYS, &frame->retcode[2]);
> -        /* imb() */
> -        r26 = frame_addr;
> -    }
> -
> -    unlock_user_struct(frame, frame_addr, 1);
> -
> -    if (err) {
> -give_sigsegv:
> -        force_sigsegv(sig);
> -        return;
> -    }
> -
> -    env->ir[IR_RA] = r26;
> -    env->ir[IR_PV] = env->pc = ka->_sa_handler;
> -    env->ir[IR_A0] = sig;
> -    env->ir[IR_A1] = 0;
> -    env->ir[IR_A2] = frame_addr + offsetof(struct target_sigframe, sc);
> -    env->ir[IR_SP] = frame_addr;
> -}
> -
> -static void setup_rt_frame(int sig, struct target_sigaction *ka,
> -                           target_siginfo_t *info,
> -                           target_sigset_t *set, CPUAlphaState *env)
> -{
> -    abi_ulong frame_addr, r26;
> -    struct target_rt_sigframe *frame;
> -    int i, err = 0;
> -
> -    frame_addr = get_sigframe(ka, env, sizeof(*frame));
> -    trace_user_setup_rt_frame(env, frame_addr);
> -    if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
> -        goto give_sigsegv;
> -    }
> -
> -    tswap_siginfo(&frame->info, info);
> -
> -    __put_user(0, &frame->uc.tuc_flags);
> -    __put_user(0, &frame->uc.tuc_link);
> -    __put_user(set->sig[0], &frame->uc.tuc_osf_sigmask);
> -    __put_user(target_sigaltstack_used.ss_sp,
> -               &frame->uc.tuc_stack.ss_sp);
> -    __put_user(sas_ss_flags(env->ir[IR_SP]),
> -               &frame->uc.tuc_stack.ss_flags);
> -    __put_user(target_sigaltstack_used.ss_size,
> -               &frame->uc.tuc_stack.ss_size);
> -    setup_sigcontext(&frame->uc.tuc_mcontext, env, frame_addr, set);
> -    for (i = 0; i < TARGET_NSIG_WORDS; ++i) {
> -        __put_user(set->sig[i], &frame->uc.tuc_sigmask.sig[i]);
> -    }
> -
> -    if (ka->sa_restorer) {
> -        r26 = ka->sa_restorer;
> -    } else {
> -        __put_user(INSN_MOV_R30_R16, &frame->retcode[0]);
> -        __put_user(INSN_LDI_R0 + TARGET_NR_rt_sigreturn,
> -                   &frame->retcode[1]);
> -        __put_user(INSN_CALLSYS, &frame->retcode[2]);
> -        /* imb(); */
> -        r26 = frame_addr;
> -    }
> -
> -    if (err) {
> -give_sigsegv:
> -        force_sigsegv(sig);
> -        return;
> -    }
> -
> -    env->ir[IR_RA] = r26;
> -    env->ir[IR_PV] = env->pc = ka->_sa_handler;
> -    env->ir[IR_A0] = sig;
> -    env->ir[IR_A1] = frame_addr + offsetof(struct target_rt_sigframe, info);
> -    env->ir[IR_A2] = frame_addr + offsetof(struct target_rt_sigframe, uc);
> -    env->ir[IR_SP] = frame_addr;
> -}
> -
> -long do_sigreturn(CPUAlphaState *env)
> -{
> -    struct target_sigcontext *sc;
> -    abi_ulong sc_addr = env->ir[IR_A0];
> -    target_sigset_t target_set;
> -    sigset_t set;
> -
> -    if (!lock_user_struct(VERIFY_READ, sc, sc_addr, 1)) {
> -        goto badframe;
> -    }
> -
> -    target_sigemptyset(&target_set);
> -    __get_user(target_set.sig[0], &sc->sc_mask);
> -
> -    target_to_host_sigset_internal(&set, &target_set);
> -    set_sigmask(&set);
> -
> -    restore_sigcontext(env, sc);
> -    unlock_user_struct(sc, sc_addr, 0);
> -    return -TARGET_QEMU_ESIGRETURN;
> -
> -badframe:
> -    force_sig(TARGET_SIGSEGV);
> -    return -TARGET_QEMU_ESIGRETURN;
> -}
> -
> -long do_rt_sigreturn(CPUAlphaState *env)
> -{
> -    abi_ulong frame_addr = env->ir[IR_A0];
> -    struct target_rt_sigframe *frame;
> -    sigset_t set;
> -
> -    trace_user_do_rt_sigreturn(env, frame_addr);
> -    if (!lock_user_struct(VERIFY_READ, frame, frame_addr, 1)) {
> -        goto badframe;
> -    }
> -    target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
> -    set_sigmask(&set);
> -
> -    restore_sigcontext(env, &frame->uc.tuc_mcontext);
> -    if (do_sigaltstack(frame_addr + offsetof(struct target_rt_sigframe,
> -                                             uc.tuc_stack),
> -                       0, env->ir[IR_SP]) == -EFAULT) {
> -        goto badframe;
> -    }
> -
> -    unlock_user_struct(frame, frame_addr, 0);
> -    return -TARGET_QEMU_ESIGRETURN;
> -
> -
> -badframe:
> -    unlock_user_struct(frame, frame_addr, 0);
> -    force_sig(TARGET_SIGSEGV);
> -    return -TARGET_QEMU_ESIGRETURN;
> -}
> -
>  #elif defined(TARGET_TILEGX)
>  
>  struct target_sigcontext {
>