arch: Get rid of the unused GenericTLB.

[gem5.git] / src / cpu / timing_expr.cc

diff --git a/src/cpu/timing_expr.cc b/src/cpu/timing_expr.cc
index d6d904956d120d56c117fe3e714b21a02e749747..da5c6489edab64207581fda450b77c1877d96801 100644 (file)
--- a/src/cpu/timing_expr.cc
+++ b/src/cpu/timing_expr.cc
@@ -37,10 +37,11 @@
  * Authors: Andrew Bardsley
  */
 
-#include "base/intmath.hh"
 #include "cpu/timing_expr.hh"
 
-TimingExprEvalContext::TimingExprEvalContext (StaticInstPtr inst_,
+#include "base/intmath.hh"
+
+TimingExprEvalContext::TimingExprEvalContext(const StaticInstPtr &inst_,
     ThreadContext *thread_,
     TimingExprLet *let_) :
     inst(inst_), thread(thread_), let(let_)
@@ -57,7 +58,7 @@ TimingExprEvalContext::TimingExprEvalContext (StaticInstPtr inst_,
 
 uint64_t TimingExprSrcReg::eval(TimingExprEvalContext &context)
 {
-    return context.inst->srcRegIdx(index);
+    return context.inst->srcRegIdx(index).index();
 }
 
 uint64_t TimingExprReadIntReg::eval(TimingExprEvalContext &context)