serialization for binning. it is WAAAAAAAY past my bedtime.

cpu/exec_context.cc:
sim/system.cc:
sim/system.hh:
    serialization for binning

--HG--
extra : convert_revision : f8417794a3a5ec7f2addc9c2da0f48e851899112

3 files changed, 112 insertions, 1 deletions

diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index b0ebb9622..20ab64bc4 100644
--- a/cpu/exec_context.cc
+++ b/cpu/exec_context.cc
@@ -104,6 +104,29 @@ ExecContext::serialize(ostream &os)
     regs.serialize(os);
     // thread_num and cpu_id are deterministic from the config
     SERIALIZE_SCALAR(func_exe_inst);
+
+    bool ctx = false;
+    if (swCtx) {
+        ctx = true;
+        SERIALIZE_SCALAR(ctx);
+        SERIALIZE_SCALAR(swCtx->calls);
+        std::stack<fnCall *> *stack = &(swCtx->callStack);
+        fnCall *top;
+        int size = stack->size();
+        SERIALIZE_SCALAR(size);
+
+        for (int j=0; j<size; ++j) {
+            top = stack->top();
+            paramOut(os, csprintf("stackpos[%d]",j), top->name);
+        }
+    } else {
+        SERIALIZE_SCALAR(ctx);
+    }
+    if (system->bin) {
+        Statistics::MainBin *cur = Statistics::MainBin::curBin();
+        string bin_name = cur->name();
+        SERIALIZE_SCALAR(bin_name);
+    }
 }
 
 
@@ -114,6 +137,31 @@ ExecContext::unserialize(Checkpoint *cp, const std::string &section)
     regs.unserialize(cp, section);
     // thread_num and cpu_id are deterministic from the config
     UNSERIALIZE_SCALAR(func_exe_inst);
+
+    bool ctx;
+    UNSERIALIZE_SCALAR(ctx);
+    if (ctx) {
+        swCtx = new SWContext;
+        UNSERIALIZE_SCALAR(swCtx->calls);
+        int size;
+        UNSERIALIZE_SCALAR(size);
+        fnCall *call = new fnCall[size];
+        for (int i=0; i<size; ++i) {
+            paramIn(cp, section, csprintf("stackpos[%d]",i), call[i].name);
+            call[i].myBin = system->getBin(call[i].name);
+        }
+
+        for (int i=size-1; i>=0; --i) {
+            swCtx->callStack.push(&(call[i]));
+        }
+
+    }
+
+    if (system->bin) {
+        string bin_name;
+        UNSERIALIZE_SCALAR(bin_name);
+        system->getBin(bin_name)->activate();
+    }
 }
 
 
diff --git a/sim/system.cc b/sim/system.cc
index 36275f400..fa8e8c463 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -108,7 +108,7 @@ System::getBin(const std::string &name)
     std::map<const std::string, Statistics::MainBin *>::const_iterator i;
     i = fnBins.find(name);
     if (i == fnBins.end())
-        panic("trying to getBin that is not on system map!");
+        panic("trying to getBin %s that is not on system map!", name);
     return (*i).second;
 }
 
@@ -125,5 +125,64 @@ System::findContext(Addr pcb)
       return NULL;
 }
 
+void
+System::serialize(std::ostream &os)
+{
+    if (bin == true) {
+        map<const Addr, SWContext *>::const_iterator iter, end;
+        iter = swCtxMap.begin();
+        end = swCtxMap.end();
+
+        int numCtxs = swCtxMap.size();
+        SERIALIZE_SCALAR(numCtxs);
+        SWContext *ctx;
+        for (int i = 0; iter != end; ++i) {
+            paramOut(os, csprintf("Addr[%d]",i), (*iter).first);
+            ctx = (*iter).second;
+            paramOut(os, csprintf("calls[%d]",i), ctx->calls);
+
+            stack<fnCall *> *stack = &(ctx->callStack);
+            fnCall *top;
+            int size = stack->size();
+            paramOut(os, csprintf("stacksize[%d]",i), size);
+            for (int j=0; j<size; ++j) {
+                top = stack->top();
+                paramOut(os, csprintf("ctx[%d].stackpos[%d]",i,j), top->name);
+            }
+        }
+    }
+}
+
+void
+System::unserialize(Checkpoint *cp, const std::string &section)
+{
+    if (bin == true) {
+        int numCtxs;
+        UNSERIALIZE_SCALAR(numCtxs);
+
+        SWContext *ctxs = new SWContext[numCtxs];
+        Addr addr;
+        int size;
+        for(int i = 0; i < numCtxs; ++i) {
+            paramIn(cp, section, csprintf("Addr[%d]",i), addr);
+            paramIn(cp, section, csprintf("calls[%d]",i), ctxs[i].calls);
+
+            paramIn(cp, section, csprintf("stacksize[%d]",i), size);
+            fnCall *call = new fnCall[size];
+            for (int j = 0; j < size; ++j) {
+                paramIn(cp, section, csprintf("ctx[%d].stackpos[%d]",i,j),
+                        call[j].name);
+                call[j].myBin = getBin(call[j].name);
+            }
+
+            for (int j=size-1; j>=0; --j) {
+                ctxs[i].callStack.push(&(call[j]));
+            }
+
+            addContext(addr, &(ctxs[i]));
+        }
+    }
+}
+
 DEFINE_SIM_OBJECT_CLASS_NAME("System", System)
 
diff --git a/sim/system.hh b/sim/system.hh
index aba5f2590..3d6d3fc39 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -70,6 +70,10 @@ class System : public SimObject
 
     virtual void dumpState(ExecContext *xc) const = 0;
 
+    virtual void serialize(std::ostream &os);
+    virtual void unserialize(Checkpoint *cp, const std::string &section);
+    //
+
   public:
     const uint64_t init_param;
     MemoryController *memCtrl;