Le 25/10/2019 à 13:39, Richard Henderson a écrit :
> We will need a target-specific hook for adjusting registers
> in the parent during clone. To avoid confusion, rename the
> one we have to make it clear it affects the child.
>
> At the same time, pass in the flags from the clone syscall.
> We will need them for correct behaviour for Sparc.
>
> Reviewed-by: Laurent Vivier <laur...@vivier.eu>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> v2: Add flags parameter.
> ---
> linux-user/aarch64/target_cpu.h | 3 ++-
> linux-user/alpha/target_cpu.h | 3 ++-
> linux-user/arm/target_cpu.h | 3 ++-
> linux-user/cris/target_cpu.h | 3 ++-
> linux-user/hppa/target_cpu.h | 3 ++-
> linux-user/i386/target_cpu.h | 3 ++-
> linux-user/m68k/target_cpu.h | 3 ++-
> linux-user/microblaze/target_cpu.h | 3 ++-
> linux-user/mips/target_cpu.h | 3 ++-
> linux-user/nios2/target_cpu.h | 3 ++-
> linux-user/openrisc/target_cpu.h | 4 +++-
> linux-user/ppc/target_cpu.h | 3 ++-
> linux-user/riscv/target_cpu.h | 3 ++-
> linux-user/s390x/target_cpu.h | 3 ++-
> linux-user/sh4/target_cpu.h | 3 ++-
> linux-user/sparc/target_cpu.h | 3 ++-
> linux-user/tilegx/target_cpu.h | 3 ++-
> linux-user/xtensa/target_cpu.h | 4 +++-
> linux-user/syscall.c | 4 ++--
> 19 files changed, 40 insertions(+), 20 deletions(-)
>
> diff --git a/linux-user/aarch64/target_cpu.h b/linux-user/aarch64/target_cpu.h
> index a021c95fa4..cd012e0dc1 100644
> --- a/linux-user/aarch64/target_cpu.h
> +++ b/linux-user/aarch64/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef AARCH64_TARGET_CPU_H
> #define AARCH64_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUARMState *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->xregs[31] = newsp;
> diff --git a/linux-user/alpha/target_cpu.h b/linux-user/alpha/target_cpu.h
> index ac4d255ae7..37ba00cf41 100644
> --- a/linux-user/alpha/target_cpu.h
> +++ b/linux-user/alpha/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef ALPHA_TARGET_CPU_H
> #define ALPHA_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUAlphaState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUAlphaState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->ir[IR_SP] = newsp;
> diff --git a/linux-user/arm/target_cpu.h b/linux-user/arm/target_cpu.h
> index 3f79356a07..6e2ba8ad4b 100644
> --- a/linux-user/arm/target_cpu.h
> +++ b/linux-user/arm/target_cpu.h
> @@ -41,7 +41,8 @@ static inline unsigned long arm_max_reserved_va(CPUState
> *cs)
> }
> #define MAX_RESERVED_VA arm_max_reserved_va
>
> -static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUARMState *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[13] = newsp;
> diff --git a/linux-user/cris/target_cpu.h b/linux-user/cris/target_cpu.h
> index 2309343979..eacc4d8d13 100644
> --- a/linux-user/cris/target_cpu.h
> +++ b/linux-user/cris/target_cpu.h
> @@ -20,7 +20,8 @@
> #ifndef CRIS_TARGET_CPU_H
> #define CRIS_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUCRISState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUCRISState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[14] = newsp;
> diff --git a/linux-user/hppa/target_cpu.h b/linux-user/hppa/target_cpu.h
> index 1c539bdbd6..f250770790 100644
> --- a/linux-user/hppa/target_cpu.h
> +++ b/linux-user/hppa/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef HPPA_TARGET_CPU_H
> #define HPPA_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUHPPAState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUHPPAState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->gr[30] = newsp;
> diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h
> index ece04d0966..1fadbf57c3 100644
> --- a/linux-user/i386/target_cpu.h
> +++ b/linux-user/i386/target_cpu.h
> @@ -20,7 +20,8 @@
> #ifndef I386_TARGET_CPU_H
> #define I386_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUX86State *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[R_ESP] = newsp;
> diff --git a/linux-user/m68k/target_cpu.h b/linux-user/m68k/target_cpu.h
> index bc7446fbaf..57b647bc07 100644
> --- a/linux-user/m68k/target_cpu.h
> +++ b/linux-user/m68k/target_cpu.h
> @@ -21,7 +21,8 @@
> #ifndef M68K_TARGET_CPU_H
> #define M68K_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUM68KState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->aregs[7] = newsp;
> diff --git a/linux-user/microblaze/target_cpu.h
> b/linux-user/microblaze/target_cpu.h
> index 73e139938c..e9bc0fce65 100644
> --- a/linux-user/microblaze/target_cpu.h
> +++ b/linux-user/microblaze/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef MICROBLAZE_TARGET_CPU_H
> #define MICROBLAZE_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUMBState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUMBState *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[R_SP] = newsp;
> diff --git a/linux-user/mips/target_cpu.h b/linux-user/mips/target_cpu.h
> index 02cf5eeff7..8601f712e0 100644
> --- a/linux-user/mips/target_cpu.h
> +++ b/linux-user/mips/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef MIPS_TARGET_CPU_H
> #define MIPS_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUMIPSState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUMIPSState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->active_tc.gpr[29] = newsp;
> diff --git a/linux-user/nios2/target_cpu.h b/linux-user/nios2/target_cpu.h
> index 5596c05c9c..fe5de7a9e3 100644
> --- a/linux-user/nios2/target_cpu.h
> +++ b/linux-user/nios2/target_cpu.h
> @@ -20,7 +20,8 @@
> #ifndef NIOS2_TARGET_CPU_H
> #define NIOS2_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUNios2State *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUNios2State *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[R_SP] = newsp;
> diff --git a/linux-user/openrisc/target_cpu.h
> b/linux-user/openrisc/target_cpu.h
> index 32ff135089..309cf3eeb7 100644
> --- a/linux-user/openrisc/target_cpu.h
> +++ b/linux-user/openrisc/target_cpu.h
> @@ -20,7 +20,9 @@
> #ifndef OPENRISC_TARGET_CPU_H
> #define OPENRISC_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUOpenRISCState *env,
> + target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> cpu_set_gpr(env, 1, newsp);
> diff --git a/linux-user/ppc/target_cpu.h b/linux-user/ppc/target_cpu.h
> index c4641834e7..028b28312c 100644
> --- a/linux-user/ppc/target_cpu.h
> +++ b/linux-user/ppc/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef PPC_TARGET_CPU_H
> #define PPC_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUPPCState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUPPCState *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->gpr[1] = newsp;
> diff --git a/linux-user/riscv/target_cpu.h b/linux-user/riscv/target_cpu.h
> index 90f9a4171e..26dcafab1c 100644
> --- a/linux-user/riscv/target_cpu.h
> +++ b/linux-user/riscv/target_cpu.h
> @@ -1,7 +1,8 @@
> #ifndef RISCV_TARGET_CPU_H
> #define RISCV_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPURISCVState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPURISCVState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->gpr[xSP] = newsp;
> diff --git a/linux-user/s390x/target_cpu.h b/linux-user/s390x/target_cpu.h
> index aa181ceaee..0b19e42f75 100644
> --- a/linux-user/s390x/target_cpu.h
> +++ b/linux-user/s390x/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef S390X_TARGET_CPU_H
> #define S390X_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUS390XState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUS390XState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[15] = newsp;
> diff --git a/linux-user/sh4/target_cpu.h b/linux-user/sh4/target_cpu.h
> index b0be9a2c1b..857af43ee3 100644
> --- a/linux-user/sh4/target_cpu.h
> +++ b/linux-user/sh4/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef SH4_TARGET_CPU_H
> #define SH4_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUSH4State *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUSH4State *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->gregs[15] = newsp;
> diff --git a/linux-user/sparc/target_cpu.h b/linux-user/sparc/target_cpu.h
> index b30fbc72c4..029b0fc547 100644
> --- a/linux-user/sparc/target_cpu.h
> +++ b/linux-user/sparc/target_cpu.h
> @@ -20,7 +20,8 @@
> #ifndef SPARC_TARGET_CPU_H
> #define SPARC_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUSPARCState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUSPARCState *env, target_ulong
> newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regwptr[22] = newsp;
> diff --git a/linux-user/tilegx/target_cpu.h b/linux-user/tilegx/target_cpu.h
> index d1aa5824f2..0523dc414c 100644
> --- a/linux-user/tilegx/target_cpu.h
> +++ b/linux-user/tilegx/target_cpu.h
> @@ -19,7 +19,8 @@
> #ifndef TILEGX_TARGET_CPU_H
> #define TILEGX_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUTLGState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUTLGState *env, target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[TILEGX_R_SP] = newsp;
> diff --git a/linux-user/xtensa/target_cpu.h b/linux-user/xtensa/target_cpu.h
> index e31efe3ea0..84f67d469e 100644
> --- a/linux-user/xtensa/target_cpu.h
> +++ b/linux-user/xtensa/target_cpu.h
> @@ -4,7 +4,9 @@
> #ifndef XTENSA_TARGET_CPU_H
> #define XTENSA_TARGET_CPU_H
>
> -static inline void cpu_clone_regs(CPUXtensaState *env, target_ulong newsp)
> +static inline void cpu_clone_regs_child(CPUXtensaState *env,
> + target_ulong newsp,
> + unsigned flags)
> {
> if (newsp) {
> env->regs[1] = newsp;
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index f1ab81b917..a07d4b4774 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -5718,7 +5718,7 @@ static int do_fork(CPUArchState *env, unsigned int
> flags, abi_ulong newsp,
> /* we create a new CPU instance. */
> new_env = cpu_copy(env);
> /* Init regs that differ from the parent. */
> - cpu_clone_regs(new_env, newsp);
> + cpu_clone_regs_child(new_env, newsp, flags);
> new_cpu = env_cpu(new_env);
> new_cpu->opaque = ts;
> ts->bprm = parent_ts->bprm;
> @@ -5797,7 +5797,7 @@ static int do_fork(CPUArchState *env, unsigned int
> flags, abi_ulong newsp,
> ret = fork();
> if (ret == 0) {
> /* Child Process. */
> - cpu_clone_regs(env, newsp);
> + cpu_clone_regs_child(env, newsp, flags);
> fork_end(1);
> /* There is a race condition here. The parent process could
> theoretically read the TID in the child process before the
> child
>
Applied to my linux-user branch.
Thanks,
Laurent
