From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72U-0005Fg-VZ for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO72Q-0005vJ-0H for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59675 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72P-0005v5-Qf for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:13 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Mar 2014 15:54:12 +0100 Message-Id: <1394722501-32326-10-git-send-email-afaerber@suse.de> In-Reply-To: <1394722501-32326-1-git-send-email-afaerber@suse.de> References: <1394722501-32326-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 09/58] target-xtensa: Clean up ENV_GET_CPU() usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Max Filippov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Peter Maydell Commits a00817cc4c18b7872e92765a4736fb2227cc237b and fdfba1a298ae26dd44bcfdb0429314139a0bc55a added usages of ENV_GET_CPU() macro in target-specific code. Use xtensa_env_get_cpu() instead. Cc: Max Filippov Cc: Edgar E. Iglesias Cc: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- target-xtensa/cpu.h | 4 +++- target-xtensa/helper.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index 1cf5ea3..3c7fa80 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -493,6 +493,8 @@ static inline int cpu_mmu_index(CPUXtensaState *env) static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulon= g *pc, target_ulong *cs_base, int *flags) { + CPUState *cs =3D CPU(xtensa_env_get_cpu(env)); + *pc =3D env->pc; *cs_base =3D 0; *flags =3D 0; @@ -515,7 +517,7 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaStat= e *env, target_ulong *pc, if (xtensa_option_enabled(env->config, XTENSA_OPTION_COPROCESSOR)) { *flags |=3D env->sregs[CPENABLE] << XTENSA_TBFLAG_CPENABLE_SHIFT= ; } - if (ENV_GET_CPU(env)->singlestep_enabled && env->exception_taken) { + if (cs->singlestep_enabled && env->exception_taken) { *flags |=3D XTENSA_TBFLAG_EXCEPTION; } } diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 60cb055..3cb0bbd 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -552,7 +552,7 @@ static int get_physical_addr_mmu(CPUXtensaState *env,= bool update_tlb, =20 static int get_pte(CPUXtensaState *env, uint32_t vaddr, uint32_t *pte) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(xtensa_env_get_cpu(env)); uint32_t paddr; uint32_t page_size; unsigned access; --=20 1.8.4.5