diff options
| author | Richard Henderson | 2019-03-23 00:07:18 +0100 |
|---|---|---|
| committer | Richard Henderson | 2019-06-10 16:03:34 +0200 |
| commit | 29a0af618ddd21f55df5753c3e16b0625f534b3c (patch) | |
| tree | 18b00b62ec94b2c90d4f0594b1bbc8c992a3b777 /target/hppa | |
| parent | cpu: Define ArchCPU (diff) | |
| download | qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.tar.gz qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.tar.xz qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.zip | |
cpu: Replace ENV_GET_CPU with env_cpu
Now that we have both ArchCPU and CPUArchState, we can define
this generically instead of via macro in each target's cpu.h.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/hppa')
| -rw-r--r-- | target/hppa/cpu.h | 1 | ||||
| -rw-r--r-- | target/hppa/op_helper.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 6eef107370..0cb1fc8800 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -227,7 +227,6 @@ static inline HPPACPU *hppa_env_get_cpu(CPUHPPAState *env) return container_of(env, HPPACPU, env); } -#define ENV_GET_CPU(e) CPU(hppa_env_get_cpu(e)) #define ENV_OFFSET offsetof(HPPACPU, env) typedef CPUHPPAState CPUArchState; diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index a55a5dfc02..952e97a7d7 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -77,7 +77,7 @@ static void atomic_store_3(CPUHPPAState *env, target_ulong addr, uint32_t val, } #else /* FIXME -- we can do better. */ - cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); + cpu_loop_exit_atomic(env_cpu(env), ra); #endif } |