From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72Q-0005F0-BA for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO72K-0005oG-U1 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59653 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72K-0005o4-OX for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Mar 2014 15:54:06 +0100 Message-Id: <1394722501-32326-4-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 03/58] target-arm: 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" , Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= Commits ab1da85791340e504d10487e1add81b9988afa98, fdfba1a298ae26dd44bcfdb0429314139a0bc55a, 2c17449b3022ca9623c4a7e2a504a4150ac4ad30 added usages of ENV_GET_CPU() macro to target-specific code. Use arm_env_get_cpu() instead and enforce separating variable declarations. Cc: Edgar E. Iglesias Cc: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- target-arm/helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index f65cbac..a40f60f 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2762,15 +2762,17 @@ void switch_mode(CPUARMState *env, int mode) =20 static void v7m_push(CPUARMState *env, uint32_t val) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(arm_env_get_cpu(env)); + env->regs[13] -=3D 4; stl_phys(cs->as, env->regs[13], val); } =20 static uint32_t v7m_pop(CPUARMState *env) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(arm_env_get_cpu(env)); uint32_t val; + val =3D ldl_phys(cs->as, env->regs[13]); env->regs[13] +=3D 4; return val; @@ -3134,7 +3136,7 @@ static int get_phys_addr_v5(CPUARMState *env, uint3= 2_t address, int access_type, int is_user, hwaddr *phys_ptr, int *prot, target_ulong *page_size) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(arm_env_get_cpu(env)); int code; uint32_t table; uint32_t desc; @@ -3230,7 +3232,7 @@ static int get_phys_addr_v6(CPUARMState *env, uint3= 2_t address, int access_type, int is_user, hwaddr *phys_ptr, int *prot, target_ulong *page_size) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(arm_env_get_cpu(env)); int code; uint32_t table; uint32_t desc; @@ -3353,7 +3355,7 @@ static int get_phys_addr_lpae(CPUARMState *env, uin= t32_t address, hwaddr *phys_ptr, int *prot, target_ulong *page_size_ptr) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(arm_env_get_cpu(env)); /* Read an LPAE long-descriptor translation table. */ MMUFaultType fault_type =3D translation_fault; uint32_t level =3D 1; --=20 1.8.4.5