On 25/01/2024 17.56, Philippe Mathieu-Daudé wrote:
Mechanical patch produced running the command documented
in scripts/coccinelle/cpu_env.cocci_template header.
Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
---
target/i386/hvf/vmx.h | 9 +++----
hw/i386/vmmouse.c | 6 ++---
hw/i386/xen/xen-hvm.c | 3 +--
hw/intc/arm_gicv3_cpuif_common.c | 3 +--
hw/ppc/mpc8544_guts.c | 3 +--
hw/ppc/pnv.c | 3 +--
hw/ppc/pnv_xscom.c | 3 +--
hw/ppc/ppce500_spin.c | 3 +--
hw/ppc/spapr.c | 3 +--
hw/ppc/spapr_caps.c | 6 ++---
target/alpha/cpu.c | 21 +++++----------
target/alpha/gdbstub.c | 6 ++---
target/alpha/helper.c | 12 +++------
target/alpha/mem_helper.c | 9 +++----
target/arm/cpu.c | 15 ++++-------
target/arm/debug_helper.c | 6 ++---
target/arm/gdbstub.c | 6 ++---
target/arm/gdbstub64.c | 6 ++---
target/arm/helper.c | 9 +++----
target/arm/hvf/hvf.c | 12 +++------
target/arm/kvm.c | 3 +--
target/arm/ptw.c | 3 +--
target/arm/tcg/cpu32.c | 3 +--
target/avr/cpu.c | 21 +++++----------
target/avr/gdbstub.c | 6 ++---
target/avr/helper.c | 9 +++----
target/cris/cpu.c | 3 +--
target/cris/gdbstub.c | 9 +++----
target/cris/helper.c | 12 +++------
target/cris/translate.c | 3 +--
target/hppa/cpu.c | 6 ++---
target/hppa/int_helper.c | 6 ++---
target/hppa/mem_helper.c | 3 +--
target/i386/arch_memory_mapping.c | 3 +--
target/i386/cpu-dump.c | 3 +--
target/i386/cpu.c | 36 +++++++++----------------
target/i386/helper.c | 30 +++++++--------------
target/i386/hvf/hvf.c | 6 ++---
target/i386/hvf/x86.c | 3 +--
target/i386/hvf/x86_emu.c | 6 ++---
target/i386/hvf/x86_task.c | 10 +++----
target/i386/hvf/x86hvf.c | 6 ++---
target/i386/kvm/kvm.c | 6 ++---
target/i386/kvm/xen-emu.c | 30 +++++++--------------
target/i386/tcg/sysemu/bpt_helper.c | 3 +--
target/i386/tcg/tcg-cpu.c | 12 +++------
target/i386/tcg/user/excp_helper.c | 3 +--
target/i386/tcg/user/seg_helper.c | 3 +--
target/m68k/cpu.c | 30 +++++++--------------
target/m68k/gdbstub.c | 6 ++---
target/m68k/helper.c | 3 +--
target/m68k/m68k-semi.c | 6 ++---
target/m68k/op_helper.c | 9 +++----
target/m68k/translate.c | 3 +--
target/microblaze/helper.c | 3 +--
target/microblaze/translate.c | 3 +--
target/mips/cpu.c | 9 +++----
target/mips/gdbstub.c | 6 ++---
target/mips/kvm.c | 27 +++++++------------
target/mips/sysemu/physaddr.c | 3 +--
target/mips/tcg/exception.c | 3 +--
target/mips/tcg/op_helper.c | 3 +--
target/mips/tcg/sysemu/special_helper.c | 3 +--
target/mips/tcg/sysemu/tlb_helper.c | 6 ++---
target/mips/tcg/translate.c | 3 +--
target/nios2/cpu.c | 9 +++----
target/nios2/helper.c | 3 +--
target/nios2/nios2-semi.c | 6 ++---
target/openrisc/gdbstub.c | 3 +--
target/openrisc/interrupt.c | 6 ++---
target/openrisc/translate.c | 3 +--
target/ppc/cpu_init.c | 9 +++----
target/ppc/excp_helper.c | 3 +--
target/ppc/gdbstub.c | 12 +++------
target/ppc/kvm.c | 6 ++---
target/ppc/ppc-qmp-cmds.c | 3 +--
target/ppc/user_only_helper.c | 3 +--
target/riscv/arch_dump.c | 6 ++---
target/riscv/cpu.c | 15 ++++-------
target/riscv/cpu_helper.c | 13 +++------
target/riscv/debug.c | 9 +++----
target/riscv/gdbstub.c | 6 ++---
target/riscv/kvm/kvm-cpu.c | 6 ++---
target/riscv/tcg/tcg-cpu.c | 9 +++----
target/riscv/translate.c | 3 +--
target/rx/gdbstub.c | 6 ++---
target/rx/helper.c | 6 ++---
target/rx/translate.c | 3 +--
target/s390x/cpu-dump.c | 3 +--
target/s390x/gdbstub.c | 6 ++---
target/s390x/helper.c | 3 +--
target/s390x/kvm/kvm.c | 6 ++---
target/s390x/tcg/excp_helper.c | 9 +++----
target/s390x/tcg/translate.c | 3 +--
target/sh4/cpu.c | 15 ++++-------
target/sh4/gdbstub.c | 6 ++---
target/sh4/helper.c | 9 +++----
target/sh4/translate.c | 3 +--
target/sparc/cpu.c | 12 +++------
target/sparc/gdbstub.c | 3 +--
target/sparc/int32_helper.c | 3 +--
target/sparc/int64_helper.c | 3 +--
target/sparc/ldst_helper.c | 6 ++---
target/sparc/mmu_helper.c | 15 ++++-------
target/sparc/translate.c | 3 +--
target/tricore/cpu.c | 12 +++------
target/tricore/gdbstub.c | 6 ++---
target/tricore/helper.c | 3 +--
target/tricore/translate.c | 3 +--
target/xtensa/dbg_helper.c | 3 +--
target/xtensa/exc_helper.c | 3 +--
target/xtensa/gdbstub.c | 6 ++---
target/xtensa/helper.c | 9 +++----
target/xtensa/translate.c | 3 +--
114 files changed, 273 insertions(+), 548 deletions(-)
A huge patch ... I wonder whether it would make sense to split it up by
target architecture to ease the review?
...
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index a8d014d09a..eb0613bfbe 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -74,8 +74,7 @@ struct VMMouseState {
static void vmmouse_get_data(uint32_t *data)
{
- X86CPU *cpu = X86_CPU(current_cpu);
- CPUX86State *env = &cpu->env;
+ CPUX86State *env = cpu_env(CPU(current_cpu));
No need for the CPU() cast here, current_cpu is already
of type "CPUState *".
data[0] = env->regs[R_EAX]; data[1] = env->regs[R_EBX];
data[2] = env->regs[R_ECX]; data[3] = env->regs[R_EDX];
@@ -84,8 +83,7 @@ static void vmmouse_get_data(uint32_t *data)
static void vmmouse_set_data(const uint32_t *data)
{
- X86CPU *cpu = X86_CPU(current_cpu);
- CPUX86State *env = &cpu->env;
+ CPUX86State *env = cpu_env(CPU(current_cpu));
dito.
env->regs[R_EAX] = data[0]; env->regs[R_EBX] = data[1];
env->regs[R_ECX] = data[2]; env->regs[R_EDX] = data[3];
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index f42621e674..3d3ae49be5 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -487,8 +487,7 @@ static void regs_to_cpu(vmware_regs_t *vmport_regs, ioreq_t *req)
static void regs_from_cpu(vmware_regs_t *vmport_regs)
{
- X86CPU *cpu = X86_CPU(current_cpu);
- CPUX86State *env = &cpu->env;
+ CPUX86State *env = cpu_env(CPU(current_cpu));
dito.
vmport_regs->ebx = env->regs[R_EBX];
vmport_regs->ecx = env->regs[R_ECX];
...
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index a26e83d048..3c6a852ad4 100644
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -71,8 +71,7 @@ static uint64_t mpc8544_guts_read(void *opaque, hwaddr addr,
unsigned size)
{
uint32_t value = 0;
- PowerPCCPU *cpu = POWERPC_CPU(current_cpu);
- CPUPPCState *env = &cpu->env;
+ CPUPPCState *env = cpu_env(CPU(current_cpu));
dito ...
I'll stop here, please respin with the cpu_env(CPU(current_cpu)) fixed to
cpu_env(current_cpu), and please split the patch by target CPU types.
Thanks,
Thomas
