make some changes to bonnie - now that the simulator uses more memory the old config...

[gem5.git] / cpu / base_cpu.hh

diff --git a/cpu/base_cpu.hh b/cpu/base_cpu.hh
index 8668c3216ac5de0eed7a74140ebeea070c21db43..dd1c7ac589e878994c30f20d8fa86caebb3d7c06 100644 (file)
--- a/cpu/base_cpu.hh
+++ b/cpu/base_cpu.hh
@@ -90,26 +90,31 @@ class BaseCPU : public SimObject
     virtual void haltContext(int thread_num) {}
 
   public:
-
+    struct Params
+    {
+        std::string name;
+        int numberOfThreads;
+        bool deferRegistration;
+        Counter max_insts_any_thread;
+        Counter max_insts_all_threads;
+        Counter max_loads_any_thread;
+        Counter max_loads_all_threads;
+        Tick freq;
+        bool functionTrace;
+        Tick functionTraceStart;
 #ifdef FULL_SYSTEM
-    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);
-#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);
+        System *system;
 #endif
+    };
+
+    const Params *params;
 
-    virtual ~BaseCPU() {}
+    BaseCPU(Params *params);
+    virtual ~BaseCPU();
 
     virtual void init();
     virtual void regStats();
 
-    bool deferRegistration;
     void registerExecContexts();
 
     /// Prepare for another CPU to take over execution.  Called by
@@ -166,6 +171,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