From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 11 Mar 2006 16:39:23 +0000 (+0000)
Subject: Avoid flushing of global TLB entries for differing ASIDs (Thiemo Seufer).
X-Git-Tag: release_0_8_1~120
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09c56b842ee3a1e5efbf98540408cdcafe451ab0;p=thirdparty%2Fqemu.git

Avoid flushing of global TLB entries for differing ASIDs (Thiemo Seufer).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1778 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index b1a308e6714..9066ce7d1b2 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -625,13 +625,14 @@ void do_tlbp (void)
 void do_tlbr (void)
 {
     tlb_t *tlb;
+    uint8_t ASID;
     int size;
 
+    ASID = env->CP0_EntryHi & 0xFF;
     tlb = &env->tlb[env->CP0_index & (MIPS_TLB_NB - 1)];
 
     /* If this will change the current ASID, flush qemu's TLB.  */
-    /* FIXME: Could avoid flushing things which match global entries... */
-    if ((env->CP0_EntryHi & 0xFF) != tlb->ASID)
+    if (ASID != tlb->ASID && tlb->G != 1)
       tlb_flush (env, 1);
 
     env->CP0_EntryHi = tlb->VPN | tlb->ASID;