From bbc0d79cb7ab5b2214cd984638ff8e0faa366fcf Mon Sep 17 00:00:00 2001 From: aurel32 Date: Sun, 14 Sep 2008 17:09:56 +0000 Subject: [PATCH] MIPS: Fix tlbwi/tlbwr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In CP0 Index register, bit 31 means 'Probe Failure', while lowest bits contain the TLB index. In tlbwi and tlbwr instructions, this Probe Failure bit must be ignored when reading the TLB index. Attached patch fixes it. (Hervé Poussineau) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5215 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-mips/op_helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index da882b8f35..dcadd031ed 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -1572,13 +1572,17 @@ static void r4k_fill_tlb (int idx) void r4k_do_tlbwi (void) { + int idx; + + idx = (env->CP0_Index & ~0x80000000) % env->tlb->nb_tlb; + /* Discard cached TLB entries. We could avoid doing this if the tlbwi is just upgrading access permissions on the current entry; that might be a further win. */ r4k_mips_tlb_flush_extra (env, env->tlb->nb_tlb); - r4k_invalidate_tlb(env, env->CP0_Index % env->tlb->nb_tlb, 0); - r4k_fill_tlb(env->CP0_Index % env->tlb->nb_tlb); + r4k_invalidate_tlb(env, idx, 0); + r4k_fill_tlb(idx); } void r4k_do_tlbwr (void) @@ -1635,9 +1639,11 @@ void r4k_do_tlbr (void) { r4k_tlb_t *tlb; uint8_t ASID; + int idx; ASID = env->CP0_EntryHi & 0xFF; - tlb = &env->tlb->mmu.r4k.tlb[env->CP0_Index % env->tlb->nb_tlb]; + idx = (env->CP0_Index & ~0x80000000) % env->tlb->nb_tlb; + tlb = &env->tlb->mmu.r4k.tlb[idx]; /* If this will change the current ASID, flush qemu's TLB. */ if (ASID != tlb->ASID)