From 6f1187943cf78c2fd0334bd7e4372ae79a587fa4 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Fri, 7 Jan 2011 21:50:29 -0800
Subject: Replace curTick global variable with accessor functions. This step
 makes it easy to replace the accessor functions (which still access a global
 variable) with ones that access per-thread curTick values.

---
 src/cpu/trace/trace_cpu.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/cpu/trace')

diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc
index b286f1e40..70aa1f042 100644
--- a/src/cpu/trace/trace_cpu.cc
+++ b/src/cpu/trace/trace_cpu.cc
@@ -66,13 +66,13 @@ TraceCPU::tick()
     int instReqs = 0;
     int dataReqs = 0;
 
-    while (nextReq && curTick >= nextCycle) {
+    while (nextReq && curTick() >= nextCycle) {
         assert(nextReq->thread_num < 4 && "Not enough threads");
         if (nextReq->isInstFetch() && icacheInterface) {
             if (icacheInterface->isBlocked())
                 break;
 
-            nextReq->time = curTick;
+            nextReq->time = curTick();
             if (nextReq->cmd == Squash) {
                 icacheInterface->squash(nextReq->asid);
             } else {
@@ -91,7 +91,7 @@ TraceCPU::tick()
                 break;
 
             ++dataReqs;
-            nextReq->time = curTick;
+            nextReq->time = curTick();
             if (dcacheInterface->doEvents()) {
                 nextReq->completionEvent =
                     new TraceCompleteEvent(nextReq, this);
@@ -113,7 +113,7 @@ TraceCPU::tick()
             tickEvent.schedule(mainEventQueue.nextEventTime() + ticks(1));
         }
     } else {
-        tickEvent.schedule(max(curTick + ticks(1), nextCycle));
+        tickEvent.schedule(max(curTick() + ticks(1), nextCycle));
     }
 }
 
-- 
cgit v1.2.3