Merge zizzer:/z/m5/Bitkeeper/m5
[gem5.git] / cpu / base_cpu.cc
index 3ee7a3892321e64e9824372c44a144302c829ee0..181b484e738499ad0940f6857a9960ef5c346f1c 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <iostream>
 #include <string>
 #include <sstream>
-#include <iostream>
 
-#include "cpu/base_cpu.hh"
 #include "base/cprintf.hh"
-#include "cpu/exec_context.hh"
+#include "base/loader/symtab.hh"
 #include "base/misc.hh"
+#include "base/output.hh"
+#include "cpu/base_cpu.hh"
+#include "cpu/exec_context.hh"
+#include "cpu/sampling_cpu/sampling_cpu.hh"
 #include "sim/param.hh"
 #include "sim/sim_events.hh"
 
@@ -47,21 +50,12 @@ vector<BaseCPU *> BaseCPU::cpuList;
 int maxThreadsPerCPU = 1;
 
 #ifdef FULL_SYSTEM
-BaseCPU::BaseCPU(const string &_name, int _number_of_threads,
-                 Counter max_insts_any_thread,
-                 Counter max_insts_all_threads,
-                 Counter max_loads_any_thread,
-                 Counter max_loads_all_threads,
-                 System *_system, Tick freq)
-    : SimObject(_name), frequency(freq),
-      number_of_threads(_number_of_threads), system(_system)
+BaseCPU::BaseCPU(Params *p)
+    : SimObject(p->name), frequency(p->freq), checkInterrupts(true),
+      params(p), number_of_threads(p->numberOfThreads), system(p->system)
 #else
-BaseCPU::BaseCPU(const string &_name, int _number_of_threads,
-                 Counter max_insts_any_thread,
-                 Counter max_insts_all_threads,
-                 Counter max_loads_any_thread,
-                 Counter max_loads_all_threads)
-    : SimObject(_name), number_of_threads(_number_of_threads)
+BaseCPU::BaseCPU(Params *p)
+    : SimObject(p->name), params(p), number_of_threads(p->numberOfThreads)
 #endif
 {
     // add self to global list of CPUs
@@ -71,19 +65,19 @@ BaseCPU::BaseCPU(const string &_name, int _number_of_threads,
         maxThreadsPerCPU = number_of_threads;
 
     // allocate per-thread instruction-based event queues
-    comInstEventQueue = new (EventQueue *)[number_of_threads];
+    comInstEventQueue = new EventQueue *[number_of_threads];
     for (int i = 0; i < number_of_threads; ++i)
         comInstEventQueue[i] = new EventQueue("instruction-based event queue");
 
     //
     // set up instruction-count-based termination events, if any
     //
-    if (max_insts_any_thread != 0)
+    if (p->max_insts_any_thread != 0)
         for (int i = 0; i < number_of_threads; ++i)
-            new SimExitEvent(comInstEventQueue[i], max_insts_any_thread,
+            new SimExitEvent(comInstEventQueue[i], p->max_insts_any_thread,
                 "a thread reached the max instruction count");
 
-    if (max_insts_all_threads != 0) {
+    if (p->max_insts_all_threads != 0) {
         // allocate & initialize shared downcounter: each event will
         // decrement this when triggered; simulation will terminate
         // when counter reaches 0
@@ -92,23 +86,23 @@ BaseCPU::BaseCPU(const string &_name, int _number_of_threads,
         for (int i = 0; i < number_of_threads; ++i)
             new CountedExitEvent(comInstEventQueue[i],
                 "all threads reached the max instruction count",
-                max_insts_all_threads, *counter);
+                p->max_insts_all_threads, *counter);
     }
 
     // allocate per-thread load-based event queues
-    comLoadEventQueue = new (EventQueue *)[number_of_threads];
+    comLoadEventQueue = new EventQueue *[number_of_threads];
     for (int i = 0; i < number_of_threads; ++i)
         comLoadEventQueue[i] = new EventQueue("load-based event queue");
 
     //
     // set up instruction-count-based termination events, if any
     //
-    if (max_loads_any_thread != 0)
+    if (p->max_loads_any_thread != 0)
         for (int i = 0; i < number_of_threads; ++i)
-            new SimExitEvent(comLoadEventQueue[i], max_loads_any_thread,
+            new SimExitEvent(comLoadEventQueue[i], p->max_loads_any_thread,
                 "a thread reached the max load count");
 
-    if (max_loads_all_threads != 0) {
+    if (p->max_loads_all_threads != 0) {
         // allocate & initialize shared downcounter: each event will
         // decrement this when triggered; simulation will terminate
         // when counter reaches 0
@@ -117,15 +111,48 @@ BaseCPU::BaseCPU(const string &_name, int _number_of_threads,
         for (int i = 0; i < number_of_threads; ++i)
             new CountedExitEvent(comLoadEventQueue[i],
                 "all threads reached the max load count",
-                max_loads_all_threads, *counter);
+                p->max_loads_all_threads, *counter);
     }
 
 #ifdef FULL_SYSTEM
     memset(interrupts, 0, sizeof(interrupts));
     intstatus = 0;
 #endif
+
+    functionTracingEnabled = false;
+    if (p->functionTrace) {
+        functionTraceStream = simout.find(csprintf("ftrace.%s", name()));
+        currentFunctionStart = currentFunctionEnd = 0;
+        functionEntryTick = p->functionTraceStart;
+
+        if (p->functionTraceStart == 0) {
+            functionTracingEnabled = true;
+        } else {
+            Event *e =
+                new EventWrapper<BaseCPU, &BaseCPU::enableFunctionTrace>(this,
+                                                                         true);
+            e->schedule(p->functionTraceStart);
+        }
+    }
+}
+
+
+void
+BaseCPU::enableFunctionTrace()
+{
+    functionTracingEnabled = true;
 }
 
+BaseCPU::~BaseCPU()
+{
+}
+
+void
+BaseCPU::init()
+{
+    if (!params->deferRegistration)
+        registerExecContexts();
+}
 
 void
 BaseCPU::regStats()
@@ -168,9 +195,10 @@ BaseCPU::registerExecContexts()
 
 
 void
-BaseCPU::switchOut()
+BaseCPU::switchOut(SamplingCPU *sampler)
 {
-    // default: do nothing
+    // default: do nothing, signal done
+    sampler->signalSwitched();
 }
 
 void
@@ -185,10 +213,10 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU)
         newXC->takeOverFrom(oldXC);
         assert(newXC->cpu_id == oldXC->cpu_id);
 #ifdef FULL_SYSTEM
-        system->replaceExecContext(newXC->cpu_id, newXC);
+        system->replaceExecContext(newXC, newXC->cpu_id);
 #else
         assert(newXC->process == oldXC->process);
-        newXC->process->replaceExecContext(newXC->cpu_id, newXC);
+        newXC->process->replaceExecContext(newXC, newXC->cpu_id);
 #endif
     }
 
@@ -212,7 +240,7 @@ BaseCPU::post_interrupt(int int_num, int index)
     if (index < 0 || index >= sizeof(uint64_t) * 8)
         panic("int_num out of bounds\n");
 
-    AlphaISA::check_interrupts = 1;
+    checkInterrupts = true;
     interrupts[int_num] |= 1 << index;
     intstatus |= (ULL(1) << int_num);
 }
@@ -259,4 +287,32 @@ BaseCPU::unserialize(Checkpoint *cp, const std::string &section)
 
 #endif // FULL_SYSTEM
 
+void
+BaseCPU::traceFunctionsInternal(Addr pc)
+{
+    if (!debugSymbolTable)
+        return;
+
+    // if pc enters different function, print new function symbol and
+    // update saved range.  Otherwise do nothing.
+    if (pc < currentFunctionStart || pc >= currentFunctionEnd) {
+        string sym_str;
+        bool found = debugSymbolTable->findNearestSymbol(pc, sym_str,
+                                                         currentFunctionStart,
+                                                         currentFunctionEnd);
+
+        if (!found) {
+            // no symbol found: use addr as label
+            sym_str = csprintf("0x%x", pc);
+            currentFunctionStart = pc;
+            currentFunctionEnd = pc + 1;
+        }
+
+        ccprintf(*functionTraceStream, " (%d)\n%d: %s",
+                 curTick - functionEntryTick, curTick, sym_str);
+        functionEntryTick = curTick;
+    }
+}
+
+
 DEFINE_SIM_OBJECT_CLASS_NAME("BaseCPU", BaseCPU)