From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5rM-0006XV-Pf for qemu-devel@nongnu.org; Tue, 28 Apr 2015 09:47:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yn5rH-0005uQ-KO for qemu-devel@nongnu.org; Tue, 28 Apr 2015 09:47:36 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:56554 helo=imgpgp01.kl.imgtec.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5rH-0005uM-Bl for qemu-devel@nongnu.org; Tue, 28 Apr 2015 09:47:31 -0400 Message-ID: <553F8F6D.8030102@imgtec.com> Date: Tue, 28 Apr 2015 14:47:25 +0100 From: James Hogan MIME-Version: 1.0 References: <1430224874-18513-1-git-send-email-leon.alrae@imgtec.com> <1430224874-18513-3-git-send-email-leon.alrae@imgtec.com> <553F8C8E.2030706@imgtec.com> In-Reply-To: <553F8C8E.2030706@imgtec.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rHcBFhikmtQw1DG49tM8M8lL0wUjdRUoG" Subject: Re: [Qemu-devel] [PATCH 2/7] target-mips: support Page Frame Number Extension field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Leon Alrae , qemu-devel@nongnu.org Cc: aurelien@aurel32.net --rHcBFhikmtQw1DG49tM8M8lL0wUjdRUoG Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 28/04/15 14:35, James Hogan wrote: >=20 >=20 > On 28/04/15 13:41, Leon Alrae wrote: >> Update tlb->PFN to contain PFN concatenated with PFNX. PFNX is 0 if la= rge >> physical address is not supported. >> >> Signed-off-by: Leon Alrae >> --- >> target-mips/op_helper.c | 32 ++++++++++++++++++++++++++------ >> 1 file changed, 26 insertions(+), 6 deletions(-) >> >> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c >> index c9a60bd..6bff927 100644 >> --- a/target-mips/op_helper.c >> +++ b/target-mips/op_helper.c >> @@ -1825,6 +1825,16 @@ static void r4k_mips_tlb_flush_extra (CPUMIPSSt= ate *env, int first) >> } >> } >> =20 >> +static inline uint64_t get_tlb_pfn_from_entrylo(uint64_t entrylo) >> +{ >> +#if defined(TARGET_MIPS64) >> + return extract64(entrylo, 6, 54); >> +#else >> + return extract64(entrylo, 6, 24) | /* PFN */ >> + (extract64(entrylo, 32, 32) << 24); /* PFNX */ >=20 > Where does the 32,32 come from? The PRA I have seems to imply that PFNX= > starts at bit 30 and goes up to bit 54. Ah right, I guess this is from the output of MFHC0/MTHC0 instructions. The specification of those instructions specify the mangling they do: GPR[rt]_31:0 <- data_61..30 GPR[rt]_63..32 <- (data_61)^31 // sign-extend Note how the field it extracts starts at bit 30. IMO the stored values of EntryLo PFN should be continuous rather than split up like the MFHC0/MTHC0 versions. Cheers James >=20 > That would of course also mean that the code for mfc0 EntryLo* needs > tweaking so that PFNX doesn't cause XI/RI bits to be set at bits 30,31 > (haven't looked at other patches yet). >=20 >> +#endif >> +} >> + >> static void r4k_fill_tlb(CPUMIPSState *env, int idx) >> { >> r4k_tlb_t *tlb; >> @@ -1848,13 +1858,13 @@ static void r4k_fill_tlb(CPUMIPSState *env, in= t idx) >> tlb->C0 =3D (env->CP0_EntryLo0 >> 3) & 0x7; >> tlb->XI0 =3D (env->CP0_EntryLo0 >> CP0EnLo_XI) & 1; >> tlb->RI0 =3D (env->CP0_EntryLo0 >> CP0EnLo_RI) & 1; >> - tlb->PFN[0] =3D (env->CP0_EntryLo0 >> 6) << 12; >> + tlb->PFN[0] =3D get_tlb_pfn_from_entrylo(env->CP0_EntryLo0) << 12= ; >> tlb->V1 =3D (env->CP0_EntryLo1 & 2) !=3D 0; >> tlb->D1 =3D (env->CP0_EntryLo1 & 4) !=3D 0; >> tlb->C1 =3D (env->CP0_EntryLo1 >> 3) & 0x7; >> tlb->XI1 =3D (env->CP0_EntryLo1 >> CP0EnLo_XI) & 1; >> tlb->RI1 =3D (env->CP0_EntryLo1 >> CP0EnLo_RI) & 1; >> - tlb->PFN[1] =3D (env->CP0_EntryLo1 >> 6) << 12; >> + tlb->PFN[1] =3D get_tlb_pfn_from_entrylo(env->CP0_EntryLo1) << 12= ; >> } >> =20 >> void r4k_helper_tlbinv(CPUMIPSState *env) >> @@ -1971,6 +1981,16 @@ void r4k_helper_tlbp(CPUMIPSState *env) >> } >> } >> =20 >> +static inline uint64_t get_entrylo_pfn_from_tlb(uint64_t tlb_pfn) >> +{ >> +#if defined(TARGET_MIPS64) >> + return tlb_pfn << 6; >> +#else >> + return (extract64(tlb_pfn, 0, 24) << 6) | /* PFN */ >> + (extract64(tlb_pfn, 24, 32) << 32); /* PFNX */ >=20 > same again. shouldn't it be 25 bits starting at bit 24, shifted to star= t > at bit 30? >=20 > Cheers > James >=20 >> +#endif >> +} >> + >> void r4k_helper_tlbr(CPUMIPSState *env) >> { >> r4k_tlb_t *tlb; >> @@ -1997,12 +2017,12 @@ void r4k_helper_tlbr(CPUMIPSState *env) >> env->CP0_PageMask =3D tlb->PageMask; >> env->CP0_EntryLo0 =3D tlb->G | (tlb->V0 << 1) | (tlb->D0 << 2= ) | >> ((uint64_t)tlb->RI0 << CP0EnLo_RI) | >> - ((uint64_t)tlb->XI0 << CP0EnLo_XI) | >> - (tlb->C0 << 3) | (tlb->PFN[0] >> 6); >> + ((uint64_t)tlb->XI0 << CP0EnLo_XI) | (tlb->C0= << 3) | >> + get_entrylo_pfn_from_tlb(tlb->PFN[0] >> 12); >> env->CP0_EntryLo1 =3D tlb->G | (tlb->V1 << 1) | (tlb->D1 << 2= ) | >> ((uint64_t)tlb->RI1 << CP0EnLo_RI) | >> - ((uint64_t)tlb->XI1 << CP0EnLo_XI) | >> - (tlb->C1 << 3) | (tlb->PFN[1] >> 6); >> + ((uint64_t)tlb->XI1 << CP0EnLo_XI) | (tlb->C1= << 3) | >> + get_entrylo_pfn_from_tlb(tlb->PFN[1] >> 12); >> } >> } >> =20 >> >=20 --rHcBFhikmtQw1DG49tM8M8lL0wUjdRUoG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVP49uAAoJEGwLaZPeOHZ6BsYP/3QrJ2IRXkUm1YQDVaGSB2FF zRpBrdZ7Ku4lUXY3K2T4X8ZUSz1X9/DeV5MoDREtfHFfC9/pctY/FROW7eF0BXjs 5iDmeZGdlaPwYhLybcj79pEd2/O0UdGA3MbrbPHv//Bn4zHMJXvkZYBx1x8ZjPpU IWB+YMiDWgR66WQCpqsrBwUSdvox95Ww50Mo8Y2+Q9DYVdxbNTAYuYRwM+cMW4si 8HDMPPxwNCNErrSPmmG2ByzObKAqvUNycYkpqF1nXulPeOu21nPqJjBMI9S6xtf7 b/kevJ9U5vx33jArSfRBFuxt+FHhzW4ixP0Iye4WeZbERcvgrCgSx972dsKgjbLn P/rKZRCK9l1c9z4TkCnp8snFEeIdixXoYmy164VIr1WGerKr59JBvqwlAKUznRzk i0SKrRhaF745Qq3N4o+b76zKdunOwOBC8TZF2y6nIAjx5yPPn+yCS7Y8LFD3LjLl 1DySmSS3PKCJDzNHI+cFAdibH3KP/eFi815I39ziAqnE4960KLAFkmDDKGYOVeBj QJutGR9XD9cZB+25cqmppRIXcfS6c8ES8+1L97aGdA2CZ7sMI+qwUMjAp9IG7or3 WLPN/37eMC16WQmESHaBK9CR+eNT5vaqO6uv0Vz7B2feJAehXTDUV2vadLg6gopS BD7Neq6r6xgh3JUDampD =PC9q -----END PGP SIGNATURE----- --rHcBFhikmtQw1DG49tM8M8lL0wUjdRUoG--