From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qee-0004zI-Ln for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7qe6-0002CK-NP for qemu-devel@nongnu.org; Wed, 14 Mar 2012 12:02:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44479 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7qe6-0002Bf-EI 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:33 +0100 Message-Id: <1331740900-5637-6-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 05/12] target-sh4: Make increment_urc() 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 | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/target-sh4/helper.c b/target-sh4/helper.c index 655faaa..2d5a4e4 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -269,17 +269,18 @@ static int find_tlb_entry(CPUSH4State * env, target= _ulong address, return match; } =20 -static void increment_urc(CPUSH4State * env) +static void increment_urc(SuperHCPU *cpu) { uint8_t urb, urc; =20 /* Increment URC */ - urb =3D ((env->mmucr) >> 18) & 0x3f; - urc =3D ((env->mmucr) >> 10) & 0x3f; + urb =3D ((cpu->env.mmucr) >> 18) & 0x3f; + urc =3D ((cpu->env.mmucr) >> 10) & 0x3f; urc++; - if ((urb > 0 && urc > urb) || urc > (UTLB_SIZE - 1)) + if ((urb > 0 && urc > urb) || urc > (UTLB_SIZE - 1)) { urc =3D 0; - env->mmucr =3D (env->mmucr & 0xffff03ff) | (urc << 10); + } + cpu->env.mmucr =3D (cpu->env.mmucr & 0xffff03ff) | (urc << 10); } =20 /* Copy and utlb entry into itlb @@ -324,7 +325,7 @@ static int find_itlb_entry(CPUSH4State * env, target_= ulong address, static int find_utlb_entry(CPUSH4State * env, target_ulong address, int = use_asid) { /* per utlb access */ - increment_urc(env); + increment_urc(sh_env_get_cpu(env)); =20 /* Return entry */ return find_tlb_entry(env, address, env->utlb, UTLB_SIZE, use_asid); @@ -660,7 +661,7 @@ uint32_t cpu_sh4_read_mmaped_utlb_addr(CPUSH4State *s= , int index =3D (addr & 0x00003f00) >> 8; tlb_t * entry =3D &s->utlb[index]; =20 - increment_urc(s); /* per utlb access */ + increment_urc(sh_env_get_cpu(s)); /* per utlb access */ =20 return (entry->vpn << 10) | (entry->v << 8) | @@ -702,7 +703,7 @@ void cpu_sh4_write_mmaped_utlb_addr(CPUSH4State *s, t= arget_phys_addr_t addr, entry->d =3D d; utlb_match_entry =3D entry; } - increment_urc(s); /* per utlb access */ + increment_urc(sh_env_get_cpu(s)); /* per utlb access */ } =20 /* search ITLB */ @@ -735,7 +736,7 @@ void cpu_sh4_write_mmaped_utlb_addr(CPUSH4State *s, t= arget_phys_addr_t addr, entry->vpn =3D vpn; entry->d =3D d; entry->v =3D v; - increment_urc(s); + increment_urc(sh_env_get_cpu(s)); } } =20 @@ -746,7 +747,7 @@ uint32_t cpu_sh4_read_mmaped_utlb_data(CPUSH4State *s= , int index =3D (addr & 0x00003f00) >> 8; tlb_t * entry =3D &s->utlb[index]; =20 - increment_urc(s); /* per utlb access */ + increment_urc(sh_env_get_cpu(s)); /* per utlb access */ =20 if (array =3D=3D 0) { /* ITLB Data Array 1 */ @@ -773,7 +774,7 @@ void cpu_sh4_write_mmaped_utlb_data(CPUSH4State *s, t= arget_phys_addr_t addr, int index =3D (addr & 0x00003f00) >> 8; tlb_t * entry =3D &s->utlb[index]; =20 - increment_urc(s); /* per utlb access */ + increment_urc(sh_env_get_cpu(s)); /* per utlb access */ =20 if (array =3D=3D 0) { /* UTLB Data Array 1 */ --=20 1.7.7