Make SPARC checkpointing work

src/arch/sparc/floatregfile.cc:
    Fix serialization for fpreg
src/arch/sparc/intregfile.cc:
    fix serialization for intreg
src/arch/sparc/miscregfile.cc:
    fix serialization from miscreg
src/arch/sparc/pagetable.cc:
    fix serialization for page table
src/arch/sparc/regfile.cc:
    need to serialize nnpc
src/arch/sparc/tlb.cc:
    write serialization code for tlb
src/cpu/base.cc:
    provide a way to find the thread number a context is
    serialize the instruction counter
src/cpu/base.hh:
    provide a way to find the thread number a context is
    and given a thread number find a context pointer
src/cpu/cpuevent.hh:
    provide method to get thread context from a cpu event for serialization
src/dev/sparc/t1000.cc:
src/dev/sparc/t1000.hh:
    nothing to serialize in t1000
src/sim/serialize.cc:
src/sim/serialize.hh:
    Make findObj() work (it hasn't since we did the python conversion stuff)

--HG--
extra : convert_revision : a95bc4e3c3354304171efbe3797556fdb146bea2

1 files changed, 44 insertions, 2 deletions

diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index bc3c39294..32e172957 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -1250,13 +1250,55 @@ doMmuWriteError:
 void
 TLB::serialize(std::ostream &os)
 {
-    panic("Need to implement serialize tlb for SPARC\n");
+    SERIALIZE_SCALAR(size);
+    SERIALIZE_SCALAR(usedEntries);
+    SERIALIZE_SCALAR(lastReplaced);
+
+    // convert the pointer based free list into an index based one
+    int *free_list = (int*)malloc(sizeof(int) * size);
+    int cntr = 0;
+    std::list<TlbEntry*>::iterator i;
+    i = freeList.begin();
+    while (i != freeList.end()) {
+        free_list[cntr++] = ((size_t)*i - (size_t)tlb)/ sizeof(TlbEntry);
+        i++;
+    }
+    SERIALIZE_SCALAR(cntr);
+    SERIALIZE_ARRAY(free_list,  cntr);
+
+    for (int x = 0; x < size; x++) {
+        nameOut(os, csprintf("%s.PTE%d", name(), x));
+        tlb[x].serialize(os);
+    }
 }
 
 void
 TLB::unserialize(Checkpoint *cp, const std::string &section)
 {
-    panic("Need to implement unserialize tlb for SPARC\n");
+    int oldSize;
+
+    paramIn(cp, section, "size", oldSize);
+    if (oldSize != size)
+        panic("Don't support unserializing different sized TLBs\n");
+    UNSERIALIZE_SCALAR(usedEntries);
+    UNSERIALIZE_SCALAR(lastReplaced);
+
+    int cntr;
+    UNSERIALIZE_SCALAR(cntr);
+
+    int *free_list = (int*)malloc(sizeof(int) * cntr);
+    freeList.clear();
+    UNSERIALIZE_ARRAY(free_list,  cntr);
+    for (int x = 0; x < cntr; x++)
+        freeList.push_back(&tlb[free_list[x]]);
+
+    lookupTable.clear();
+    for (int x = 0; x < size; x++) {
+        tlb[x].unserialize(cp, csprintf("%s.PTE%d", section, x));
+        if (tlb[x].valid)
+            lookupTable.insert(tlb[x].range, &tlb[x]);
+
+    }
 }