[25/35] target/tilegx: Use env_cpu

Message ID	20190323190925.21324-26-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:15 -0700 Message-Id: <20190323190925.21324-26-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 25/35] target/tilegx: Use env_cpu 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-26-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:15 -0700
Message-Id: <20190323190925.21324-26-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 25/35] target/tilegx: Use env_cpu
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/tilegx/cpu.h          | 5 -----
 linux-user/tilegx/cpu_loop.c | 2 +-
 target/tilegx/helper.c       | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

-- 
2.17.1

diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h
index 135df63523..7f8fe7c513 100644
--- a/target/tilegx/cpu.h
+++ b/target/tilegx/cpu.h
@@ -138,11 +138,6 @@  typedef struct TileGXCPU {
     CPUTLGState env;
 } TileGXCPU;
 
-static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState *env)
-{
-    return container_of(env, TileGXCPU, env);
-}
-
 #define ENV_OFFSET offsetof(TileGXCPU, env)
 
 /* TILE-Gx memory attributes */
diff --git a/linux-user/tilegx/cpu_loop.c b/linux-user/tilegx/cpu_loop.c
index 4f39eb9ad3..d4abe29dcd 100644
--- a/linux-user/tilegx/cpu_loop.c
+++ b/linux-user/tilegx/cpu_loop.c
@@ -206,7 +206,7 @@  static void do_fetch(CPUTLGState *env, int trapnr, bool quad)
 
 void cpu_loop(CPUTLGState *env)
 {
-    CPUState *cs = CPU(tilegx_env_get_cpu(env));
+    CPUState *cs = env_cpu(env);
     int trapnr;
 
     while (1) {
diff --git a/target/tilegx/helper.c b/target/tilegx/helper.c
index 4964bb9111..a57a679825 100644
--- a/target/tilegx/helper.c
+++ b/target/tilegx/helper.c
@@ -28,7 +28,7 @@ 
 
 void helper_exception(CPUTLGState *env, uint32_t excp)
 {
-    CPUState *cs = CPU(tilegx_env_get_cpu(env));
+    CPUState *cs = env_cpu(env);
 
     cs->exception_index = excp;
     cpu_loop_exit(cs);

[25/35] target/tilegx: Use env_cpu

Commit Message

Patch