From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qeW-0004WV-1X for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7qe6-0002C7-Lq for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44483 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qe6-0002Bj-Eq 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:38 +0100 Message-Id: <1331740900-5637-11-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 10/12] target-sh4: Make update_itlb_use() 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 | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-sh4/helper.c b/target-sh4/helper.c index ffe79ec..c5c0593 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -202,7 +202,7 @@ void do_interrupt(CPUSH4State * env) } } =20 -static void update_itlb_use(CPUSH4State * env, int itlbnb) +static void update_itlb_use(SuperHCPU *cpu, int itlbnb) { uint8_t or_mask =3D 0, and_mask =3D (uint8_t) - 1; =20 @@ -223,8 +223,8 @@ static void update_itlb_use(CPUSH4State * env, int it= lbnb) break; } =20 - env->mmucr &=3D (and_mask << 24) | 0x00ffffff; - env->mmucr |=3D (or_mask << 24); + cpu->env.mmucr &=3D (and_mask << 24) | 0x00ffffff; + cpu->env.mmucr |=3D (or_mask << 24); } =20 static int itlb_replacement(CPUSH4State * env) @@ -297,7 +297,7 @@ static int copy_utlb_entry_itlb(SuperHCPU *cpu, int u= tlb) tlb_flush_page(&cpu->env, ientry->vpn << 10); } *ientry =3D cpu->env.utlb[utlb]; - update_itlb_use(&cpu->env, itlb); + update_itlb_use(cpu, itlb); return itlb; } =20 @@ -315,7 +315,7 @@ static int find_itlb_entry(SuperHCPU *cpu, target_ulo= ng address, } else if (e =3D=3D MMU_DTLB_MISS) { e =3D MMU_ITLB_MISS; } else if (e >=3D 0) { - update_itlb_use(&cpu->env, e); + update_itlb_use(cpu, e); } return e; } --=20 1.7.7