From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 17 Jan 2007 00:06:33 +0000 (-0500)
Subject: In the case of ASI_P or ASI_LDTX_P set primary and skip the other checks
X-Git-Tag: m5_2.0_beta3~224^2~10^2~6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0584d5bd6c24c66a0d497bba6a3a47d8cdc7a87e;p=gem5.git

In the case of ASI_P or ASI_LDTX_P set primary and skip the other checks

--HG--
extra : convert_revision : e7b21c56eadf4603ab03364741b00c9689492423
---

diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 1cecb4ebb..0935cee4e 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -625,13 +625,12 @@ DTB::translate(RequestPtr &req, ThreadContext *tc, bool write)
             return new DataAccessException;
         }
 
-    } /*else if (hpriv) {*/
-        if (asi == ASI_P) {
-            ct = Primary;
-            context = pri_context;
-            goto continueDtbFlow;
-        }
-    //}
+    }
+    if (asi == ASI_P || asi == ASI_LDTX_P) {
+        ct = Primary;
+        context = pri_context;
+        goto continueDtbFlow;
+    }
 
     if (!implicit) {
         if (AsiIsLittle(asi))
@@ -640,9 +639,6 @@ DTB::translate(RequestPtr &req, ThreadContext *tc, bool write)
             panic("Block ASIs not supported\n");
         if (AsiIsNoFault(asi))
             panic("No Fault ASIs not supported\n");
-        if (write && asi == ASI_LDTX_P)
-            // block init store (like write hint64)
-            goto continueDtbFlow;
         if (!write && asi == ASI_QUAD_LDD)
             goto continueDtbFlow;