From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs6Ee-0000ll-Vm for qemu-devel@nongnu.org; Fri, 30 Oct 2015 05:44:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zs6Eb-0003yt-O4 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 05:44:36 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:32081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs6Eb-0003yV-Hh for qemu-devel@nongnu.org; Fri, 30 Oct 2015 05:44:33 -0400 References: <1446139072-39608-1-git-send-email-yongbok.kim@imgtec.com> From: Leon Alrae Message-ID: <56333BF0.1070508@imgtec.com> Date: Fri, 30 Oct 2015 09:44:16 +0000 MIME-Version: 1.0 In-Reply-To: <1446139072-39608-1-git-send-email-yongbok.kim@imgtec.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4] target-mips: fix updating XContext on mmu exception List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yongbok Kim , qemu-devel@nongnu.org Cc: aurelien@aurel32.net On 29/10/15 17:17, Yongbok Kim wrote: > Correct updating XContext.Region field on mmu exceptions. > If Config3.CTXTC = 0 then the R field of XContext has to be updated > with the value of bits 63..62 of the virtual address upon a TLB > exception. > Also fixed the below line which overs 80 characters. > > Signed-off-by: Yongbok Kim > --- > target-mips/helper.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/target-mips/helper.c b/target-mips/helper.c > index 2d86323..b3fe816 100644 > --- a/target-mips/helper.c > +++ b/target-mips/helper.c > @@ -293,9 +293,10 @@ static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, > (env->CP0_EntryHi & 0xFF) | (address & (TARGET_PAGE_MASK << 1)); > #if defined(TARGET_MIPS64) > env->CP0_EntryHi &= env->SEGMask; > - env->CP0_XContext = (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) | > - ((address & 0xC00000000000ULL) >> (55 - env->SEGBITS)) | > - ((address & ((1ULL << env->SEGBITS) - 1) & 0xFFFFFFFFFFFFE000ULL) >> 9); > + env->CP0_XContext = > + /* PTEBase */ (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) | > + /* R */ (extract64(address, 62, 2) << (env->SEGBITS - 9)) | > + /* BadVPN2 */ (extract64(address, 13, env->SEGBITS - 13) << 4); > #endif > cs->exception_index = exception; > env->error_code = error_code; > Thanks for cleaning up the XContext calculation. I applied this one as well as SIGRIE and RDHWR patches to the target-mips queue. Regards, Leon