mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/s390x: Prefer fast cpu_env() over slower CPU QOM cast macro

Browse Source 
Mechanical patch produced running the command documented
in scripts/coccinelle/cpu_env.cocci_template header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240129164514.73104-25-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-01-29 17:45:06 +01:00 committed by Thomas Huth
parent eb14b021f8
commit d0143fa9ee
7 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/s390x/cpu-dump.c
View File

@ -27,8 +27,7 @@
void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags) void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
int i; int i;
qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64, qemu_fprintf(f, "PSW=mask %016" PRIx64 " addr %016" PRIx64,

6
target/s390x/gdbstub.c
View File

@ -30,8 +30,7 @@
int s390_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) int s390_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
switch (n) { switch (n) {
case S390_PSWM_REGNUM: case S390_PSWM_REGNUM:
@ -46,8 +45,7 @@ int s390_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
target_ulong tmpl = ldtul_p(mem_buf); target_ulong tmpl = ldtul_p(mem_buf);
switch (n) { switch (n) {

3
target/s390x/helper.c
View File

@ -139,8 +139,7 @@ void do_restart_interrupt(CPUS390XState *env)
void s390_cpu_recompute_watchpoints(CPUState *cs) void s390_cpu_recompute_watchpoints(CPUState *cs)
{ {
const int wp_flags = BP_CPU | BP_MEM_WRITE | BP_STOP_BEFORE_ACCESS; const int wp_flags = BP_CPU | BP_MEM_WRITE | BP_STOP_BEFORE_ACCESS;
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
/* We are called when the watchpoints have changed. First /* We are called when the watchpoints have changed. First
remove them all. */ remove them all. */

6
target/s390x/kvm/kvm.c
View File

@ -474,8 +474,7 @@ static int can_sync_regs(CPUState *cs, int regs)
int kvm_arch_put_registers(CPUState *cs, int level) int kvm_arch_put_registers(CPUState *cs, int level)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
struct kvm_fpu fpu = {}; struct kvm_fpu fpu = {};
int r; int r;
int i; int i;
@ -601,8 +600,7 @@ int kvm_arch_put_registers(CPUState *cs, int level)
int kvm_arch_get_registers(CPUState *cs) int kvm_arch_get_registers(CPUState *cs)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
struct kvm_fpu fpu; struct kvm_fpu fpu;
int i, r; int i, r;

11
target/s390x/tcg/excp_helper.c
View File

@ -90,10 +90,7 @@ void HELPER(data_exception)(CPUS390XState *env, uint32_t dxc)
static G_NORETURN static G_NORETURN
void do_unaligned_access(CPUState *cs, uintptr_t retaddr) void do_unaligned_access(CPUState *cs, uintptr_t retaddr)
{ {
S390CPU *cpu = S390_CPU(cs); tcg_s390_program_interrupt(cpu_env(cs), PGM_SPECIFICATION, retaddr);
CPUS390XState *env = &cpu->env;
tcg_s390_program_interrupt(env, PGM_SPECIFICATION, retaddr);
} }
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
@ -146,8 +143,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
MMUAccessType access_type, int mmu_idx, MMUAccessType access_type, int mmu_idx,
bool probe, uintptr_t retaddr) bool probe, uintptr_t retaddr)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
target_ulong vaddr, raddr; target_ulong vaddr, raddr;
uint64_t asc, tec; uint64_t asc, tec;
int prot, excp; int prot, excp;
@ -600,8 +596,7 @@ bool s390_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
void s390x_cpu_debug_excp_handler(CPUState *cs) void s390x_cpu_debug_excp_handler(CPUState *cs)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
CPUWatchpoint *wp_hit = cs->watchpoint_hit; CPUWatchpoint *wp_hit = cs->watchpoint_hit;
if (wp_hit && wp_hit->flags & BP_CPU) { if (wp_hit && wp_hit->flags & BP_CPU) {

4
target/s390x/tcg/misc_helper.c
View File

@ -214,9 +214,7 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t ckc)
void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque)
{ {
S390CPU *cpu = S390_CPU(cs); update_ckc_timer(cpu_env(cs));
update_ckc_timer(&cpu->env);
} }
/* Set Clock */ /* Set Clock */

3
target/s390x/tcg/translate.c
View File

@ -6582,8 +6582,7 @@ void s390x_restore_state_to_opc(CPUState *cs,
const TranslationBlock *tb, const TranslationBlock *tb,
const uint64_t *data) const uint64_t *data)
{ {
S390CPU *cpu = S390_CPU(cs); CPUS390XState *env = cpu_env(cs);
CPUS390XState *env = &cpu->env;
int cc_op = data[1]; int cc_op = data[1];
env->psw.addr = data[0]; env->psw.addr = data[0];