[17/35] target/moxie: Use env_cpu, env_archcpu

Message ID	20190323190925.21324-18-richard.henderson@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Date: Sat, 23 Mar 2019 12:09:07 -0700 Message-Id: <20190323190925.21324-18-richard.henderson@linaro.org> In-Reply-To: <20190323190925.21324-1-richard.henderson@linaro.org> References: <20190323190925.21324-1-richard.henderson@linaro.org> Subject: [Qemu-devel] [PATCH 17/35] target/moxie: Use env_cpu, env_archcpu Precedence: list Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	tcg: Move the softmmu tlb to CPUNegativeOffsetState \| expand [for-4.1,00/35] tcg: Move the softmmu tlb to CPUNegativeOffsetState [01/35] tcg: Fold CPUTLBWindow into CPUTLBDesc [02/35] tcg: Split out target/arch/cpu-param.h [03/35] tcg: Create struct CPUTLB [04/35] cpu: Define CPUArchState with typedef [05/35] cpu: Define ArchCPU [06/35] cpu: Replace ENV_GET_CPU with env_cpu [07/35] cpu: Introduce env_archcpu [08/35] target/alpha: Use env_cpu, env_archcpu [09/35] target/arm: Use env_cpu, env_archcpu [10/35] target/cris: Use env_cpu, env_archcpu [11/35] target/hppa: Use env_cpu, env_archcpu [12/35] target/i386: Use env_cpu, env_archcpu [13/35] target/lm32: Use env_cpu, env_archcpu [14/35] target/m68k: Use env_cpu, env_archcpu [15/35] target/microblaze: Use env_cpu, env_archcpu [16/35] target/mips: Use env_cpu, env_archcpu [17/35] target/moxie: Use env_cpu, env_archcpu [18/35] target/nios2: Use env_cpu, env_archcpu [19/35] target/openrisc: Use env_cpu, env_archcpu [20/35] target/ppc: Use env_cpu, env_archcpu [21/35] target/riscv: Use env_cpu, env_archcpu [22/35] target/s390x: Use env_cpu, env_archcpu [23/35] target/sh4: Use env_cpu, env_archcpu [24/35] target/sparc: Use env_cpu, env_archcpu [25/35] target/tilegx: Use env_cpu [26/35] target/tricore: Use env_cpu [27/35] target/unicore32: Use env_cpu, env_archcpu [28/35] target/xtensa: Use env_cpu, env_archcpu [29/35] cpu: Move ENV_OFFSET to exec/gen-icount.h [30/35] cpu: Introduce CPUNegativeOffsetState [31/35] cpu: Move icount_decr to CPUNegativeOffsetState [32/35] cpu: Move the softmmu tlb to CPUNegativeOffsetState [33/35] cpu: Remove CPU_COMMON [34/35] tcg/aarch64: Use LDP to load tlb mask+table [35/35] tcg/arm: Use LDRD to load tlb mask+table

Message ID

20190323190925.21324-18-richard.henderson@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	209.51.188.17 as permitted sender) client-ip=209.51.188.17; 
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Date: Sat, 23 Mar 2019 12:09:07 -0700
Message-Id: <20190323190925.21324-18-richard.henderson@linaro.org>
In-Reply-To: <20190323190925.21324-1-richard.henderson@linaro.org>
References: <20190323190925.21324-1-richard.henderson@linaro.org>
Subject: [Qemu-devel] [PATCH 17/35] target/moxie: Use env_cpu, env_archcpu
Precedence: list
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

tcg: Move the softmmu tlb to CPUNegativeOffsetState | expand

Commit Message

Richard Henderson March 23, 2019, 7:09 p.m. UTC

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/moxie/cpu.h       | 5 -----
 target/moxie/helper.c    | 6 +++---
 target/moxie/translate.c | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

-- 
2.17.1

diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h
index c050d6e15d..71e7cf0f08 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 f3d8ee7d6b..a22870228c 100644
--- a/target/moxie/helper.c
+++ b/target/moxie/helper.c
@@ -42,7 +42,7 @@  void tlb_fill(CPUState *cs, target_ulong addr, int size,
 
 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.  */
@@ -79,7 +79,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);
@@ -89,7 +89,7 @@  void helper_debug(CPUMoxieState *env)
 
 void moxie_cpu_do_interrupt(CPUState *cs)
 {
-    CPUState *cs = CPU(moxie_env_get_cpu(env));
+    CPUState *cs = env_cpu(env);
 
     cs->exception_index = -1;
 }
diff --git a/target/moxie/translate.c b/target/moxie/translate.c
index 68ca223e22..bb25a3dee7 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, struct TranslationBlock *tb)
 {
     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, max_insns;

[17/35] target/moxie: Use env_cpu, env_archcpu

Commit Message

Patch