From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72S-0005FN-Ln for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO72N-0005oy-0L for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59663 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO72M-0005os-M0 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 10:55:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Mar 2014 15:54:09 +0100 Message-Id: <1394722501-32326-7-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 06/58] target-s390x: 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 , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson Commits f606604f1c10b60ef294f1b9b229426521a365e3, 2c17449b3022ca9623c4a7e2a504a4150ac4ad30 and 5ce5944dc0ffdc43c11b5cad11e526f699aabe4c added usages of ENV_GET_CPU() macro in target-specific code. Use s390_env_get_cpu() instead. Cc: Edgar E. Iglesias Cc: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- target-s390x/helper.c | 6 +++--- target-s390x/mem_helper.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target-s390x/helper.c b/target-s390x/helper.c index aa537e1..0bae0a3 100644 --- a/target-s390x/helper.c +++ b/target-s390x/helper.c @@ -138,7 +138,7 @@ static int trans_bits(CPUS390XState *env, uint64_t mo= de) static void trigger_prot_fault(CPUS390XState *env, target_ulong vaddr, uint64_t mode) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(s390_env_get_cpu(env)); int ilen =3D ILEN_LATER_INC; int bits =3D trans_bits(env, mode) | 4; =20 @@ -152,7 +152,7 @@ static void trigger_prot_fault(CPUS390XState *env, ta= rget_ulong vaddr, static void trigger_page_fault(CPUS390XState *env, target_ulong vaddr, uint32_t type, uint64_t asc, int rw) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(s390_env_get_cpu(env)); int ilen =3D ILEN_LATER; int bits =3D trans_bits(env, asc); =20 @@ -172,7 +172,7 @@ static int mmu_translate_asce(CPUS390XState *env, tar= get_ulong vaddr, uint64_t asc, uint64_t asce, int level, target_ulong *raddr, int *flags, int rw) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(s390_env_get_cpu(env)); uint64_t offs =3D 0; uint64_t origin; uint64_t new_asce; diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 875ea95..db673cf 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -955,7 +955,7 @@ uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1,= uint64_t r2) static uint32_t mvc_asc(CPUS390XState *env, int64_t l, uint64_t a1, uint64_t mode1, uint64_t a2, uint64_t mode2) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(s390_env_get_cpu(env)); target_ulong src, dest; int flags, cc =3D 0, i; =20 @@ -1010,7 +1010,7 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t = l, uint64_t a1, uint64_t a2) /* invalidate pte */ void HELPER(ipte)(CPUS390XState *env, uint64_t pte_addr, uint64_t vaddr) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(s390_env_get_cpu(env)); uint64_t page =3D vaddr & TARGET_PAGE_MASK; uint64_t pte =3D 0; =20 @@ -1043,7 +1043,8 @@ void HELPER(ptlb)(CPUS390XState *env) /* store using real address */ void HELPER(stura)(CPUS390XState *env, uint64_t addr, uint64_t v1) { - CPUState *cs =3D ENV_GET_CPU(env); + CPUState *cs =3D CPU(s390_env_get_cpu(env)); + stw_phys(cs->as, get_address(env, 0, 0, addr), (uint32_t)v1); } =20 --=20 1.8.4.5