| Message ID | 20241212185341.2857-16-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | accel/tcg: Extract user APIs out of 'exec/[cpu, exec]-all.h' | expand |
On 12/12/24 10:53, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > linux-user/cpu_loop-common.h | 5 ++++- > linux-user/aarch64/cpu_loop.c | 2 +- > linux-user/alpha/cpu_loop.c | 2 +- > linux-user/arm/cpu_loop.c | 2 +- > linux-user/hexagon/cpu_loop.c | 2 +- > linux-user/hppa/cpu_loop.c | 2 +- > linux-user/i386/cpu_loop.c | 2 +- > linux-user/loongarch64/cpu_loop.c | 2 +- > linux-user/m68k/cpu_loop.c | 2 +- > linux-user/microblaze/cpu_loop.c | 2 +- > linux-user/mips/cpu_loop.c | 2 +- > linux-user/openrisc/cpu_loop.c | 2 +- > linux-user/ppc/cpu_loop.c | 2 +- > linux-user/riscv/cpu_loop.c | 2 +- > linux-user/s390x/cpu_loop.c | 2 +- > linux-user/sh4/cpu_loop.c | 2 +- > linux-user/sparc/cpu_loop.c | 2 +- > linux-user/xtensa/cpu_loop.c | 2 +- > 18 files changed, 21 insertions(+), 18 deletions(-) > > diff --git a/linux-user/cpu_loop-common.h b/linux-user/cpu_loop-common.h > index e644d2ef909..aca51f53238 100644 > --- a/linux-user/cpu_loop-common.h > +++ b/linux-user/cpu_loop-common.h > @@ -27,5 +27,8 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code); > #define EXCP_DUMP(env, fmt, code) \ > target_exception_dump(env, fmt, code) > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs); > +typedef struct target_pt_regs target_pt_regs; > + > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs); > + > #endif > diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c > index 71cdc8be50c..77f857a8216 100644 > --- a/linux-user/aarch64/cpu_loop.c > +++ b/linux-user/aarch64/cpu_loop.c > @@ -185,7 +185,7 @@ void cpu_loop(CPUARMState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > ARMCPU *cpu = env_archcpu(env); > CPUState *cs = env_cpu(env); > diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c > index 2ea039aa71f..b5403ed0e46 100644 > --- a/linux-user/alpha/cpu_loop.c > +++ b/linux-user/alpha/cpu_loop.c > @@ -173,7 +173,7 @@ void cpu_loop(CPUAlphaState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > > diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c > index 709f718a99d..be1f11022a7 100644 > --- a/linux-user/arm/cpu_loop.c > +++ b/linux-user/arm/cpu_loop.c > @@ -513,7 +513,7 @@ void cpu_loop(CPUARMState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > CPUState *cpu = env_cpu(env); > TaskState *ts = get_task_state(cpu); > diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c > index d41159e52ad..a1794470113 100644 > --- a/linux-user/hexagon/cpu_loop.c > +++ b/linux-user/hexagon/cpu_loop.c > @@ -79,7 +79,7 @@ void cpu_loop(CPUHexagonState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > env->gpr[HEX_REG_PC] = regs->sepc; > env->gpr[HEX_REG_SP] = regs->sp; > diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c > index 23b38ff9b28..503a204460e 100644 > --- a/linux-user/hppa/cpu_loop.c > +++ b/linux-user/hppa/cpu_loop.c > @@ -188,7 +188,7 @@ void cpu_loop(CPUHPPAState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > for (i = 1; i < 32; i++) { > diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c > index 7a35215278a..e06aa23de4c 100644 > --- a/linux-user/i386/cpu_loop.c > +++ b/linux-user/i386/cpu_loop.c > @@ -331,7 +331,7 @@ static void target_cpu_free(void *obj) > g_free(obj); > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > CPUState *cpu = env_cpu(env); > bool is64 = (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) != 0; > diff --git a/linux-user/loongarch64/cpu_loop.c b/linux-user/loongarch64/cpu_loop.c > index 73d7b6796a4..935d5bcf2c8 100644 > --- a/linux-user/loongarch64/cpu_loop.c > +++ b/linux-user/loongarch64/cpu_loop.c > @@ -97,7 +97,7 @@ void cpu_loop(CPULoongArchState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > > diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c > index f79b8e4ab05..69cdce95518 100644 > --- a/linux-user/m68k/cpu_loop.c > +++ b/linux-user/m68k/cpu_loop.c > @@ -92,7 +92,7 @@ void cpu_loop(CPUM68KState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > CPUState *cpu = env_cpu(env); > TaskState *ts = get_task_state(cpu); > diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c > index 212e62d0a62..ee4ba768691 100644 > --- a/linux-user/microblaze/cpu_loop.c > +++ b/linux-user/microblaze/cpu_loop.c > @@ -127,7 +127,7 @@ void cpu_loop(CPUMBState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > env->regs[0] = regs->r0; > env->regs[1] = regs->r1; > diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c > index 462387a0737..1331a9a2b8d 100644 > --- a/linux-user/mips/cpu_loop.c > +++ b/linux-user/mips/cpu_loop.c > @@ -211,7 +211,7 @@ done_syscall: > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > CPUState *cpu = env_cpu(env); > TaskState *ts = get_task_state(cpu); > diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c > index a7aa586c8f9..1bf9542d16a 100644 > --- a/linux-user/openrisc/cpu_loop.c > +++ b/linux-user/openrisc/cpu_loop.c > @@ -83,7 +83,7 @@ void cpu_loop(CPUOpenRISCState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > > diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c > index 02204ad8beb..e168f1ce947 100644 > --- a/linux-user/ppc/cpu_loop.c > +++ b/linux-user/ppc/cpu_loop.c > @@ -378,7 +378,7 @@ void cpu_loop(CPUPPCState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > > diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c > index 0af533e186f..a72bc76da3d 100644 > --- a/linux-user/riscv/cpu_loop.c > +++ b/linux-user/riscv/cpu_loop.c > @@ -94,7 +94,7 @@ void cpu_loop(CPURISCVState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > CPUState *cpu = env_cpu(env); > TaskState *ts = get_task_state(cpu); > diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c > index 8b7ac2879ef..42e4d24102e 100644 > --- a/linux-user/s390x/cpu_loop.c > +++ b/linux-user/s390x/cpu_loop.c > @@ -180,7 +180,7 @@ void cpu_loop(CPUS390XState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > for (i = 0; i < 16; i++) { > diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c > index c805f9db110..937d9fa265d 100644 > --- a/linux-user/sh4/cpu_loop.c > +++ b/linux-user/sh4/cpu_loop.c > @@ -81,7 +81,7 @@ void cpu_loop(CPUSH4State *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > > diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c > index 50424a54df5..58a2464da9f 100644 > --- a/linux-user/sparc/cpu_loop.c > +++ b/linux-user/sparc/cpu_loop.c > @@ -357,7 +357,7 @@ void cpu_loop (CPUSPARCState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > env->pc = regs->pc; > diff --git a/linux-user/xtensa/cpu_loop.c b/linux-user/xtensa/cpu_loop.c > index d51ce053926..7564e25a966 100644 > --- a/linux-user/xtensa/cpu_loop.c > +++ b/linux-user/xtensa/cpu_loop.c > @@ -238,7 +238,7 @@ void cpu_loop(CPUXtensaState *env) > } > } > > -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) > +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) > { > int i; > for (i = 0; i < 16; ++i) { Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/linux-user/cpu_loop-common.h b/linux-user/cpu_loop-common.h index e644d2ef909..aca51f53238 100644 --- a/linux-user/cpu_loop-common.h +++ b/linux-user/cpu_loop-common.h @@ -27,5 +27,8 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code); #define EXCP_DUMP(env, fmt, code) \ target_exception_dump(env, fmt, code) -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs); +typedef struct target_pt_regs target_pt_regs; + +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs); + #endif diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index 71cdc8be50c..77f857a8216 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -185,7 +185,7 @@ void cpu_loop(CPUARMState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { ARMCPU *cpu = env_archcpu(env); CPUState *cs = env_cpu(env); diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c index 2ea039aa71f..b5403ed0e46 100644 --- a/linux-user/alpha/cpu_loop.c +++ b/linux-user/alpha/cpu_loop.c @@ -173,7 +173,7 @@ void cpu_loop(CPUAlphaState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index 709f718a99d..be1f11022a7 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -513,7 +513,7 @@ void cpu_loop(CPUARMState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { CPUState *cpu = env_cpu(env); TaskState *ts = get_task_state(cpu); diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c index d41159e52ad..a1794470113 100644 --- a/linux-user/hexagon/cpu_loop.c +++ b/linux-user/hexagon/cpu_loop.c @@ -79,7 +79,7 @@ void cpu_loop(CPUHexagonState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { env->gpr[HEX_REG_PC] = regs->sepc; env->gpr[HEX_REG_SP] = regs->sp; diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c index 23b38ff9b28..503a204460e 100644 --- a/linux-user/hppa/cpu_loop.c +++ b/linux-user/hppa/cpu_loop.c @@ -188,7 +188,7 @@ void cpu_loop(CPUHPPAState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; for (i = 1; i < 32; i++) { diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c index 7a35215278a..e06aa23de4c 100644 --- a/linux-user/i386/cpu_loop.c +++ b/linux-user/i386/cpu_loop.c @@ -331,7 +331,7 @@ static void target_cpu_free(void *obj) g_free(obj); } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { CPUState *cpu = env_cpu(env); bool is64 = (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) != 0; diff --git a/linux-user/loongarch64/cpu_loop.c b/linux-user/loongarch64/cpu_loop.c index 73d7b6796a4..935d5bcf2c8 100644 --- a/linux-user/loongarch64/cpu_loop.c +++ b/linux-user/loongarch64/cpu_loop.c @@ -97,7 +97,7 @@ void cpu_loop(CPULoongArchState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c index f79b8e4ab05..69cdce95518 100644 --- a/linux-user/m68k/cpu_loop.c +++ b/linux-user/m68k/cpu_loop.c @@ -92,7 +92,7 @@ void cpu_loop(CPUM68KState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { CPUState *cpu = env_cpu(env); TaskState *ts = get_task_state(cpu); diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c index 212e62d0a62..ee4ba768691 100644 --- a/linux-user/microblaze/cpu_loop.c +++ b/linux-user/microblaze/cpu_loop.c @@ -127,7 +127,7 @@ void cpu_loop(CPUMBState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { env->regs[0] = regs->r0; env->regs[1] = regs->r1; diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c index 462387a0737..1331a9a2b8d 100644 --- a/linux-user/mips/cpu_loop.c +++ b/linux-user/mips/cpu_loop.c @@ -211,7 +211,7 @@ done_syscall: } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { CPUState *cpu = env_cpu(env); TaskState *ts = get_task_state(cpu); diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c index a7aa586c8f9..1bf9542d16a 100644 --- a/linux-user/openrisc/cpu_loop.c +++ b/linux-user/openrisc/cpu_loop.c @@ -83,7 +83,7 @@ void cpu_loop(CPUOpenRISCState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c index 02204ad8beb..e168f1ce947 100644 --- a/linux-user/ppc/cpu_loop.c +++ b/linux-user/ppc/cpu_loop.c @@ -378,7 +378,7 @@ void cpu_loop(CPUPPCState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c index 0af533e186f..a72bc76da3d 100644 --- a/linux-user/riscv/cpu_loop.c +++ b/linux-user/riscv/cpu_loop.c @@ -94,7 +94,7 @@ void cpu_loop(CPURISCVState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { CPUState *cpu = env_cpu(env); TaskState *ts = get_task_state(cpu); diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c index 8b7ac2879ef..42e4d24102e 100644 --- a/linux-user/s390x/cpu_loop.c +++ b/linux-user/s390x/cpu_loop.c @@ -180,7 +180,7 @@ void cpu_loop(CPUS390XState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; for (i = 0; i < 16; i++) { diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c index c805f9db110..937d9fa265d 100644 --- a/linux-user/sh4/cpu_loop.c +++ b/linux-user/sh4/cpu_loop.c @@ -81,7 +81,7 @@ void cpu_loop(CPUSH4State *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c index 50424a54df5..58a2464da9f 100644 --- a/linux-user/sparc/cpu_loop.c +++ b/linux-user/sparc/cpu_loop.c @@ -357,7 +357,7 @@ void cpu_loop (CPUSPARCState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; env->pc = regs->pc; diff --git a/linux-user/xtensa/cpu_loop.c b/linux-user/xtensa/cpu_loop.c index d51ce053926..7564e25a966 100644 --- a/linux-user/xtensa/cpu_loop.c +++ b/linux-user/xtensa/cpu_loop.c @@ -238,7 +238,7 @@ void cpu_loop(CPUXtensaState *env) } } -void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) +void target_cpu_copy_regs(CPUArchState *env, target_pt_regs *regs) { int i; for (i = 0; i < 16; ++i) {
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- linux-user/cpu_loop-common.h | 5 ++++- linux-user/aarch64/cpu_loop.c | 2 +- linux-user/alpha/cpu_loop.c | 2 +- linux-user/arm/cpu_loop.c | 2 +- linux-user/hexagon/cpu_loop.c | 2 +- linux-user/hppa/cpu_loop.c | 2 +- linux-user/i386/cpu_loop.c | 2 +- linux-user/loongarch64/cpu_loop.c | 2 +- linux-user/m68k/cpu_loop.c | 2 +- linux-user/microblaze/cpu_loop.c | 2 +- linux-user/mips/cpu_loop.c | 2 +- linux-user/openrisc/cpu_loop.c | 2 +- linux-user/ppc/cpu_loop.c | 2 +- linux-user/riscv/cpu_loop.c | 2 +- linux-user/s390x/cpu_loop.c | 2 +- linux-user/sh4/cpu_loop.c | 2 +- linux-user/sparc/cpu_loop.c | 2 +- linux-user/xtensa/cpu_loop.c | 2 +- 18 files changed, 21 insertions(+), 18 deletions(-)