Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : bf821e90a6f15a69dfa46fe37f7ab586698cd0c0

1 files changed, 22 insertions, 3 deletions

diff --git a/cpu/base_cpu.hh b/cpu/base_cpu.hh
index 8668c3216..baa956aa8 100644
--- a/cpu/base_cpu.hh
+++ b/cpu/base_cpu.hh
@@ -95,16 +95,18 @@ class BaseCPU : public SimObject
     BaseCPU(const std::string &_name, int _number_of_threads, bool _def_reg,
             Counter max_insts_any_thread, Counter max_insts_all_threads,
             Counter max_loads_any_thread, Counter max_loads_all_threads,
-            System *_system, Tick freq);
+            System *_system, Tick freq,
+            bool _function_trace = false, Tick _function_trace_start = 0);
 #else
     BaseCPU(const std::string &_name, int _number_of_threads, bool _def_reg,
             Counter max_insts_any_thread = 0,
             Counter max_insts_all_threads = 0,
             Counter max_loads_any_thread = 0,
-            Counter max_loads_all_threads = 0);
+            Counter max_loads_all_threads = 0,
+            bool _function_trace = false, Tick _function_trace_start = 0);
 #endif
 
-    virtual ~BaseCPU() {}
+    virtual ~BaseCPU();
 
     virtual void init();
     virtual void regStats();
@@ -166,6 +168,23 @@ class BaseCPU : public SimObject
 
     virtual Counter totalInstructions() const { return 0; }
 
+    // Function tracing
+  private:
+    bool functionTracingEnabled;
+    std::ostream *functionTraceStream;
+    Addr currentFunctionStart;
+    Addr currentFunctionEnd;
+    Tick functionEntryTick;
+    void enableFunctionTrace();
+    void traceFunctionsInternal(Addr pc);
+
+  protected:
+    void traceFunctions(Addr pc)
+    {
+        if (functionTracingEnabled)
+            traceFunctionsInternal(pc);
+    }
+
   private:
     static std::vector<BaseCPU *> cpuList;   //!< Static global cpu list