[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 19/39] target/moxie: Use env_cpu, env_archcpu
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v4 19/39] target/moxie: Use env_cpu, env_archcpu |
Date: |
Tue, 4 Jun 2019 15:33:31 -0500 |
Cleanup in the boilerplate that each target must define.
Replace moxie_env_get_cpu with env_archcpu. The combination
CPU(moxie_env_get_cpu) should have used ENV_GET_CPU to begin;
use env_cpu now.
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
target/moxie/cpu.h | 5 -----
target/moxie/helper.c | 4 ++--
target/moxie/translate.c | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h
index 275fb9bfbb..b9f5635e50 100644
--- a/target/moxie/cpu.h
+++ b/target/moxie/cpu.h
@@ -90,11 +90,6 @@ typedef struct MoxieCPU {
CPUMoxieState env;
} MoxieCPU;
-static inline MoxieCPU *moxie_env_get_cpu(CPUMoxieState *env)
-{
- return container_of(env, MoxieCPU, env);
-}
-
#define ENV_OFFSET offsetof(MoxieCPU, env)
void moxie_cpu_do_interrupt(CPUState *cs);
diff --git a/target/moxie/helper.c b/target/moxie/helper.c
index f5c1d4181c..b1919f62b3 100644
--- a/target/moxie/helper.c
+++ b/target/moxie/helper.c
@@ -28,7 +28,7 @@
void helper_raise_exception(CPUMoxieState *env, int ex)
{
- CPUState *cs = CPU(moxie_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
cs->exception_index = ex;
/* Stash the exception type. */
@@ -65,7 +65,7 @@ uint32_t helper_udiv(CPUMoxieState *env, uint32_t a, uint32_t
b)
void helper_debug(CPUMoxieState *env)
{
- CPUState *cs = CPU(moxie_env_get_cpu(env));
+ CPUState *cs = env_cpu(env);
cs->exception_index = EXCP_DEBUG;
cpu_loop_exit(cs);
diff --git a/target/moxie/translate.c b/target/moxie/translate.c
index c668178f2c..c87e9ec2b1 100644
--- a/target/moxie/translate.c
+++ b/target/moxie/translate.c
@@ -816,7 +816,7 @@ static int decode_opc(MoxieCPU *cpu, DisasContext *ctx)
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns)
{
CPUMoxieState *env = cs->env_ptr;
- MoxieCPU *cpu = moxie_env_get_cpu(env);
+ MoxieCPU *cpu = env_archcpu(env);
DisasContext ctx;
target_ulong pc_start;
int num_insns;
--
2.17.1
- [Qemu-devel] [PATCH v4 09/39] target/arm: Use env_cpu, env_archcpu, (continued)
- [Qemu-devel] [PATCH v4 09/39] target/arm: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 12/39] target/cris: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 11/39] target/cris: Reindent op_helper.c, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 13/39] target/hppa: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 06/39] cpu: Replace ENV_GET_CPU with env_cpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 15/39] target/lm32: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 14/39] target/i386: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 16/39] target/m68k: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 17/39] target/microblaze: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 19/39] target/moxie: Use env_cpu, env_archcpu,
Richard Henderson <=
- [Qemu-devel] [PATCH v4 18/39] target/mips: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 20/39] target/nios2: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 21/39] target/openrisc: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 23/39] target/riscv: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 25/39] target/sh4: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 22/39] target/ppc: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 24/39] target/s390x: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 26/39] target/sparc: Use env_cpu, env_archcpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 27/39] target/tilegx: Use env_cpu, Richard Henderson, 2019/06/04
- [Qemu-devel] [PATCH v4 28/39] target/tricore: Use env_cpu, Richard Henderson, 2019/06/04