On Tue, May 7, 2019 at 5:28 PM Richard Henderson
<richard.hender...@linaro.org> wrote:
>
> Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> target/tilegx/cpu.h | 5 -----
> linux-user/tilegx/cpu_loop.c | 2 +-
> target/tilegx/helper.c | 2 +-
> 3 files changed, 2 insertions(+), 7 deletions(-)
>
> 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);
> --
> 2.17.1
>
>
