@@ -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 */
@@ -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) {
@@ -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);