From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qeZ-0004gp-48 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-0002C6-LF for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44484 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qe6-0002Bk-F1 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:39 +0100 Message-Id: <1331740900-5637-12-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 11/12] target-sh4: Make itlb_replacement() use 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 | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/target-sh4/helper.c b/target-sh4/helper.c index c5c0593..c291eee 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -227,17 +227,21 @@ static void update_itlb_use(SuperHCPU *cpu, int itl= bnb) cpu->env.mmucr |=3D (or_mask << 24); } =20 -static int itlb_replacement(CPUSH4State * env) +static int itlb_replacement(SuperHCPU *cpu) { - if ((env->mmucr & 0xe0000000) =3D=3D 0xe0000000) + if ((cpu->env.mmucr & 0xe0000000) =3D=3D 0xe0000000) { return 0; - if ((env->mmucr & 0x98000000) =3D=3D 0x18000000) + } + if ((cpu->env.mmucr & 0x98000000) =3D=3D 0x18000000) { return 1; - if ((env->mmucr & 0x54000000) =3D=3D 0x04000000) + } + if ((cpu->env.mmucr & 0x54000000) =3D=3D 0x04000000) { return 2; - if ((env->mmucr & 0x2c000000) =3D=3D 0x00000000) + } + if ((cpu->env.mmucr & 0x2c000000) =3D=3D 0x00000000) { return 3; - cpu_abort(env, "Unhandled itlb_replacement"); + } + cpu_abort(&cpu->env, "Unhandled itlb_replacement"); } =20 /* Find the corresponding entry in the right TLB @@ -291,7 +295,7 @@ static int copy_utlb_entry_itlb(SuperHCPU *cpu, int u= tlb) int itlb; =20 tlb_t * ientry; - itlb =3D itlb_replacement(&cpu->env); + itlb =3D itlb_replacement(cpu); ientry =3D &cpu->env.itlb[itlb]; if (ientry->v) { tlb_flush_page(&cpu->env, ientry->vpn << 10); --=20 1.7.7