Use the generic env_cpu() macro introduced in the previous commit and remove the few env_cpu_const() uses.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/exec/cpu-common.h | 1 - linux-user/elfload.c | 2 +- linux-user/i386/elfload.c | 2 +- linux-user/x86_64/elfload.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index bffef677607..d67d008236f 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -102,6 +102,5 @@ static inline bool cpu_loop_exit_requested(const CPUState *cpu) (CPUState *)((void *)env - sizeof(CPUState)), \ const CPUArchState: \ (const CPUState *)((const void *)env - sizeof(CPUState))) -#define env_cpu_const(cpu) env_cpu(cpu) #endif /* CPU_COMMON_H */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 88508deac50..c4bdaa146a7 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2128,7 +2128,7 @@ static int wmr_write_region(void *opaque, vaddr start, #endif static int elf_core_dump(int signr, const CPUArchState *env) { - const CPUState *cpu = env_cpu_const(env); + const CPUState *cpu = env_cpu(env); const TaskState *ts = (const TaskState *)get_task_state((CPUState *)cpu); struct rlimit dumpsize; CountAndSizeRegions css; diff --git a/linux-user/i386/elfload.c b/linux-user/i386/elfload.c index 26b12001a3e..2e10f38a412 100644 --- a/linux-user/i386/elfload.c +++ b/linux-user/i386/elfload.c @@ -38,7 +38,7 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CPUX86State *env) r->pt.es = tswapal(env->segs[R_ES].selector & 0xffff); r->pt.fs = tswapal(env->segs[R_FS].selector & 0xffff); r->pt.gs = tswapal(env->segs[R_GS].selector & 0xffff); - r->pt.orig_ax = tswapal(get_task_state(env_cpu_const(env))->orig_ax); + r->pt.orig_ax = tswapal(get_task_state(env_cpu(env))->orig_ax); r->pt.ip = tswapal(env->eip); r->pt.cs = tswapal(env->segs[R_CS].selector & 0xffff); r->pt.flags = tswapal(env->eflags); diff --git a/linux-user/x86_64/elfload.c b/linux-user/x86_64/elfload.c index 49a6f6180e0..121a8167acc 100644 --- a/linux-user/x86_64/elfload.c +++ b/linux-user/x86_64/elfload.c @@ -59,7 +59,7 @@ void elf_core_copy_regs(target_elf_gregset_t *r, const CPUX86State *env) r->pt.dx = tswapal(env->regs[R_EDX]); r->pt.si = tswapal(env->regs[R_ESI]); r->pt.di = tswapal(env->regs[R_EDI]); - r->pt.orig_ax = tswapal(get_task_state(env_cpu_const(env))->orig_ax); + r->pt.orig_ax = tswapal(get_task_state(env_cpu(env))->orig_ax); r->pt.ip = tswapal(env->eip); r->pt.cs = tswapal(env->segs[R_CS].selector & 0xffff); r->pt.flags = tswapal(env->eflags); -- 2.53.0
