merged with 62e1504b9c64

[gem5.git] / src / cpu / profile.hh

diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index 7f96252417bac6a92d106a801096c8fd0a132d15..9d683959c6646124a8e05ad3f4c2fb2f0bed6804 100644 (file)
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -33,9 +33,10 @@
 
 #include <map>
 
-#include "cpu/static_inst.hh"
-#include "sim/host.hh"
 #include "arch/stacktrace.hh"
+#include "base/types.hh"
+#include "config/the_isa.hh"
+#include "cpu/static_inst.hh"
 
 class ThreadContext;
 
@@ -66,13 +67,13 @@ class FunctionProfile
     const SymbolTable *symtab;
     ProfileNode top;
     std::map<Addr, Counter> pc_count;
-    StackTrace trace;
+    TheISA::StackTrace trace;
 
   public:
     FunctionProfile(const SymbolTable *symtab);
     ~FunctionProfile();
 
-    ProfileNode *consume(ThreadContext *tc, StaticInstPtr inst);
+    ProfileNode *consume(ThreadContext *tc, const StaticInstPtr &inst);
     ProfileNode *consume(const std::vector<Addr> &stack);
     void clear();
     void dump(ThreadContext *tc, std::ostream &out) const;
@@ -80,7 +81,7 @@ class FunctionProfile
 };
 
 inline ProfileNode *
-FunctionProfile::consume(ThreadContext *tc, StaticInstPtr inst)
+FunctionProfile::consume(ThreadContext *tc, const StaticInstPtr &inst)
 {
     if (!trace.trace(tc, inst))
         return NULL;