From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qeY-0004g9-QV for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7qe6-0002C0-LB for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44482 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qe6-0002Bi-Ea for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:01:50 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 14 Mar 2012 17:01:37 +0100 Message-Id: <1331740900-5637-10-git-send-email-afaerber@suse.de> In-Reply-To: <1331740900-5637-1-git-send-email-afaerber@suse.de> References: <1330893156-26569-1-git-send-email-afaerber@suse.de> <1331740900-5637-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] [PATCH 09/12] target-sh4: Make copy_utlb_entry_itlb() take SuperHCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Signed-off-by: Andreas F=C3=A4rber --- target-sh4/helper.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target-sh4/helper.c b/target-sh4/helper.c index d273097..ffe79ec 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -286,18 +286,18 @@ static void increment_urc(SuperHCPU *cpu) /* Copy and utlb entry into itlb Return entry */ -static int copy_utlb_entry_itlb(CPUSH4State *env, int utlb) +static int copy_utlb_entry_itlb(SuperHCPU *cpu, int utlb) { int itlb; =20 tlb_t * ientry; - itlb =3D itlb_replacement(env); - ientry =3D &env->itlb[itlb]; + itlb =3D itlb_replacement(&cpu->env); + ientry =3D &cpu->env.itlb[itlb]; if (ientry->v) { - tlb_flush_page(env, ientry->vpn << 10); + tlb_flush_page(&cpu->env, ientry->vpn << 10); } - *ientry =3D env->utlb[utlb]; - update_itlb_use(env, itlb); + *ientry =3D cpu->env.utlb[utlb]; + update_itlb_use(&cpu->env, itlb); return itlb; } =20 @@ -360,7 +360,7 @@ static int get_mmu_address(SuperHCPU *cpu, target_ulo= ng *physical, } else { n =3D find_utlb_entry(cpu, address, use_asid); if (n >=3D 0) { - n =3D copy_utlb_entry_itlb(&cpu->env, n); + n =3D copy_utlb_entry_itlb(cpu, n); matching =3D &cpu->env.itlb[n]; if (!(cpu->env.sr & SR_MD) && !(matching->pr & 2)) { n =3D MMU_ITLB_VIOLATION; --=20 1.7.7