diff mbox series

[v3,28/39] target/tricore: Use env_cpu

Message ID 20190508000641.19090-29-richard.henderson@linaro.org
State New
Headers show
Series tcg: Move the softmmu tlb to CPUNegativeOffsetState | expand

Commit Message

Richard Henderson May 8, 2019, 12:06 a.m. UTC 
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/tricore/cpu.h       | 5 -----
 target/tricore/op_helper.c | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Alistair Francis May 9, 2019, 8:16 p.m. UTC | #1 
On Tue, May 7, 2019 at 5:31 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  target/tricore/cpu.h       | 5 -----
>  target/tricore/op_helper.c | 4 ++--
>  2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
> index 4c997b6d30..fc3328fdf5 100644
> --- a/target/tricore/cpu.h
> +++ b/target/tricore/cpu.h
> @@ -208,11 +208,6 @@ struct TriCoreCPU {
>      CPUTriCoreState env;
>  };
>
> -static inline TriCoreCPU *tricore_env_get_cpu(CPUTriCoreState *env)
> -{
> -    return TRICORE_CPU(container_of(env, TriCoreCPU, env));
> -}
> -
>  #define ENV_OFFSET offsetof(TriCoreCPU, env)
>
>  hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
> diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c
> index ed9dc0c83e..ba2f21a6c3 100644
> --- a/target/tricore/op_helper.c
> +++ b/target/tricore/op_helper.c
> @@ -29,7 +29,7 @@ static void QEMU_NORETURN
>  raise_exception_sync_internal(CPUTriCoreState *env, uint32_t class, int tin,
>                                uintptr_t pc, uint32_t fcd_pc)
>  {
> -    CPUState *cs = CPU(tricore_env_get_cpu(env));
> +    CPUState *cs = env_cpu(env);
>      /* in case we come from a helper-call we need to restore the PC */
>      cpu_restore_state(cs, pc, true);
>
> @@ -2800,7 +2800,7 @@ static inline void QEMU_NORETURN do_raise_exception_err(CPUTriCoreState *env,
>                                                          int error_code,
>                                                          uintptr_t pc)
>  {
> -    CPUState *cs = CPU(tricore_env_get_cpu(env));
> +    CPUState *cs = env_cpu(env);
>      cs->exception_index = exception;
>      env->error_code = error_code;
>      /* now we have a real cpu fault */
> --
> 2.17.1
>
>
diff mbox series

Patch

diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index 4c997b6d30..fc3328fdf5 100644
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -208,11 +208,6 @@  struct TriCoreCPU {
     CPUTriCoreState env;
 };
 
-static inline TriCoreCPU *tricore_env_get_cpu(CPUTriCoreState *env)
-{
-    return TRICORE_CPU(container_of(env, TriCoreCPU, env));
-}
-
 #define ENV_OFFSET offsetof(TriCoreCPU, env)
 
 hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c
index ed9dc0c83e..ba2f21a6c3 100644
--- a/target/tricore/op_helper.c
+++ b/target/tricore/op_helper.c
@@ -29,7 +29,7 @@  static void QEMU_NORETURN
 raise_exception_sync_internal(CPUTriCoreState *env, uint32_t class, int tin,
                               uintptr_t pc, uint32_t fcd_pc)
 {
-    CPUState *cs = CPU(tricore_env_get_cpu(env));
+    CPUState *cs = env_cpu(env);
     /* in case we come from a helper-call we need to restore the PC */
     cpu_restore_state(cs, pc, true);
 
@@ -2800,7 +2800,7 @@  static inline void QEMU_NORETURN do_raise_exception_err(CPUTriCoreState *env,
                                                         int error_code,
                                                         uintptr_t pc)
 {
-    CPUState *cs = CPU(tricore_env_get_cpu(env));
+    CPUState *cs = env_cpu(env);
     cs->exception_index = exception;
     env->error_code = error_code;
     /* now we have a real cpu fault */