Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean

--HG--
extra : convert_revision : 0074df284e85bc2ebe6ccc2dbe765fabda9ab041

4 files changed, 38 insertions, 2 deletions

diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index 195c9daad..92144bd93 100644
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -48,6 +48,9 @@ ExecContext::ExecContext(BaseCPU *_cpu, int _thread_num, System *_sys,
       kernelStats(this, _cpu), cpu(_cpu), thread_num(_thread_num),
       cpu_id(-1), mem(_mem), itb(_itb), dtb(_dtb), system(_sys),
       memCtrl(_sys->memCtrl), physmem(_sys->physmem),
+#ifdef FS_MEASURE
+      swCtx(NULL),
+#endif
       func_exe_insn(0), storeCondFailures(0)
 {
     memset(&regs, 0, sizeof(RegFile));
diff --git a/cpu/exec_context.hh b/cpu/exec_context.hh
index e008e3e13..274a3778b 100644
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@ -46,6 +46,10 @@ class MemoryController;
 #include "kern/tru64/kernel_stats.hh"
 #include "sim/system.hh"
 
+#ifdef FS_MEASURE
+#include "sim/sw_context.hh"
+#endif
+
 #else // !FULL_SYSTEM
 
 #include "sim/prog.hh"
@@ -122,6 +126,10 @@ class ExecContext
     MemoryController *memCtrl;
     PhysicalMemory *physmem;
 
+#ifdef FS_MEASURE
+    SWContext *swCtx;
+#endif
+
 #else
     Process *process;
 
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
index 60d704604..814902390 100644
--- a/cpu/simple_cpu/simple_cpu.cc
+++ b/cpu/simple_cpu/simple_cpu.cc
@@ -627,7 +627,32 @@ SimpleCPU::tick()
         xc->func_exe_insn++;
 
         fault = si->execute(this, xc, traceData);
-
+#ifdef FS_MEASURE
+        if (!(xc->misspeculating()) && (xc->system->bin)) {
+            SWContext *ctx = xc->swCtx;
+            if (ctx && !ctx->callStack.empty()) {
+                if (si->isCall()) {
+                    ctx->calls++;
+                }
+                if (si->isReturn()) {
+                     if (ctx->calls == 0) {
+                        fnCall *top = ctx->callStack.top();
+                        DPRINTF(TCPIP, "Removing %s from callstack.\n", top->name);
+                        delete top;
+                        ctx->callStack.pop();
+                        if (ctx->callStack.empty())
+                            xc->system->nonPath->activate();
+                        else
+                            ctx->callStack.top()->myBin->activate();
+
+                        xc->system->dumpState(xc);
+                    } else {
+                        ctx->calls--;
+                    }
+                }
+            }
+        }
+#endif
         if (si->isMemRef()) {
             numMemRefs++;
         }
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index 61c9143ba..6ad831218 100644
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -216,7 +216,7 @@ class SimpleCPU : public BaseCPU
             assert(old_status == Idle ||
                    old_status == DcacheMissStall ||
                    old_status == IcacheMissComplete);
-            if (old_status == Idle)
+            if (old_status == Idle && curTick != 0)
                 idleCycles += curTick - last_idle;
 
             if (tickEvent.squashed())