X86: Define a noop ExtMachInst.

[gem5.git] / src / arch / mips / locked_mem.hh

diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 5877b14394c41ff55695be0c2681cdd0c56a6b15..8cf94df98adca61fbdd9daa4711bdd721d26a0a0 100644 (file)
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -37,7 +37,7 @@
  * ISA-specific helper functions for locked memory accesses.
  */
 
-#include "arch/isa_traits.hh"
+#include "arch/registers.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "mem/request.hh"
@@ -45,17 +45,18 @@
 
 namespace MipsISA
 {
+
 template <class XC>
 inline void
 handleLockedRead(XC *xc, Request *req)
 {
-    xc->setMiscRegNoEffect(LLAddr, req->getPaddr() & ~0xf);
-    xc->setMiscRegNoEffect(LLFlag, true);
-    DPRINTF(LLSC, "[tid:%i]: Load-Link Flag Set & Load-Link Address set to %x.\n",
-            req->getThreadNum(), req->getPaddr() & ~0xf);
+    xc->setMiscRegNoEffect(MISCREG_LLADDR, req->getPaddr() & ~0xf);
+    xc->setMiscRegNoEffect(MISCREG_LLFLAG, true);
+    DPRINTF(LLSC, "[tid:%i]: Load-Link Flag Set & Load-Link"
+                  " Address set to %x.\n",
+            req->threadId(), req->getPaddr() & ~0xf);
 }
 
-
 template <class XC>
 inline bool
 handleLockedWrite(XC *xc, Request *req)
@@ -66,14 +67,14 @@ handleLockedWrite(XC *xc, Request *req)
         req->setExtraData(2);
     } else {
         // standard store conditional
-        bool lock_flag = xc->readMiscRegNoEffect(LLFlag);
-        Addr lock_addr = xc->readMiscRegNoEffect(LLAddr);
+        bool lock_flag = xc->readMiscRegNoEffect(MISCREG_LLFLAG);
+        Addr lock_addr = xc->readMiscRegNoEffect(MISCREG_LLADDR);
 
         if (!lock_flag || (req->getPaddr() & ~0xf) != lock_addr) {
             // Lock flag not set or addr mismatch in CPU;
             // don't even bother sending to memory system
             req->setExtraData(0);
-            xc->setMiscRegNoEffect(LLFlag, false);
+            xc->setMiscRegNoEffect(MISCREG_LLFLAG, false);
 
             // the rest of this code is not architectural;
             // it's just a debugging aid to help detect
@@ -82,22 +83,20 @@ handleLockedWrite(XC *xc, Request *req)
             int stCondFailures = xc->readStCondFailures();
             stCondFailures++;
             xc->setStCondFailures(stCondFailures);
-            if (stCondFailures % 10 == 0) {
-                warn("%i: cpu %d: %d consecutive "
+            if (stCondFailures % 100000 == 0) {
+                warn("%i: context %d: %d consecutive "
                      "store conditional failures\n",
-                     curTick, xc->cpuId(), stCondFailures);
-            }
-
-            if (stCondFailures == 5000) {
-                panic("Max (5000) Store Conditional Fails Reached. Check Code For Deadlock.\n");
+                     curTick, xc->contextId(), stCondFailures);
             }
 
             if (!lock_flag){
-                DPRINTF(LLSC, "[tid:%i]: Lock Flag Set, Store Conditional Failed.\n",
-                        req->getThreadNum());
+                DPRINTF(LLSC, "[tid:%i]: Lock Flag Set, "
+                              "Store Conditional Failed.\n",
+                        req->threadId());
             } else if ((req->getPaddr() & ~0xf) != lock_addr) {
-                DPRINTF(LLSC, "[tid:%i]: Load-Link Address Mismatch, Store Conditional Failed.\n",
-                        req->getThreadNum());
+                DPRINTF(LLSC, "[tid:%i]: Load-Link Address Mismatch, "
+                              "Store Conditional Failed.\n",
+                        req->threadId());
             }
             // store conditional failed already, so don't issue it to mem
             return false;
@@ -107,7 +106,6 @@ handleLockedWrite(XC *xc, Request *req)
     return true;
 }
 
-
 } // namespace MipsISA
 
 #endif