diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-03-22 19:21:48 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2019-06-10 07:03:42 -0700 |
| commit | dc79e928698567b14e6638c4c9f1e43dc386f1d8 (patch) | |
| tree | 26b73cb1112ea0cee56cf174b566ccefd6717e95 /target/s390x/cc_helper.c | |
| parent | 3109cd98a6c0c618189b38a83a8aa29cb20acbce (diff) | |
| download | qemu-dc79e928698567b14e6638c4c9f1e43dc386f1d8.zip qemu-dc79e928698567b14e6638c4c9f1e43dc386f1d8.tar.gz qemu-dc79e928698567b14e6638c4c9f1e43dc386f1d8.tar.bz2 | |
target/s390x: Use env_cpu, env_archcpu
Cleanup in the boilerplate that each target must define.
Replace s390_env_get_cpu with env_archcpu. The combination
CPU(s390_env_get_cpu) should have used ENV_GET_CPU to begin;
use env_cpu now.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/s390x/cc_helper.c')
| -rw-r--r-- | target/s390x/cc_helper.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/s390x/cc_helper.c b/target/s390x/cc_helper.c index a00294f..cf68792 100644 --- a/target/s390x/cc_helper.c +++ b/target/s390x/cc_helper.c @@ -419,7 +419,6 @@ static uint32_t cc_calc_vc(uint64_t low, uint64_t high) static uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst, uint64_t vr) { - S390CPU *cpu = s390_env_get_cpu(env); uint32_t r = 0; switch (cc_op) { @@ -543,7 +542,7 @@ static uint32_t do_calc_cc(CPUS390XState *env, uint32_t cc_op, break; default: - cpu_abort(CPU(cpu), "Unknown CC operation: %s\n", cc_name(cc_op)); + cpu_abort(env_cpu(env), "Unknown CC operation: %s\n", cc_name(cc_op)); } HELPER_LOG("%s: %15s 0x%016lx 0x%016lx 0x%016lx = %d\n", __func__, @@ -567,7 +566,7 @@ uint32_t HELPER(calc_cc)(CPUS390XState *env, uint32_t cc_op, uint64_t src, void HELPER(load_psw)(CPUS390XState *env, uint64_t mask, uint64_t addr) { load_psw(env, mask, addr); - cpu_loop_exit(CPU(s390_env_get_cpu(env))); + cpu_loop_exit(env_cpu(env)); } void HELPER(sacf)(CPUS390XState *env, uint64_t a1) |