1 files changed, 16 insertions, 23 deletions

diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 84d748dd3..c0c28f952 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -1353,23 +1353,18 @@ TLB::MakeTsbPtr(TsbPageSize ps, uint64_t tag_access, uint64_t c0_tsb,
 }
 
 void
-TLB::serialize(std::ostream &os)
+TLB::serialize(CheckpointOut &cp) const
 {
     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);
+    std::vector<int> free_list;
+    for (const TlbEntry *entry : freeList)
+        free_list.push_back(entry - tlb);
+
+    SERIALIZE_CONTAINER(free_list);
 
     SERIALIZE_SCALAR(c0_tsb_ps0);
     SERIALIZE_SCALAR(c0_tsb_ps1);
@@ -1381,31 +1376,28 @@ TLB::serialize(std::ostream &os)
     SERIALIZE_SCALAR(tag_access);
 
     for (int x = 0; x < size; x++) {
-        nameOut(os, csprintf("%s.PTE%d", name(), x));
-        tlb[x].serialize(os);
+        ScopedCheckpointSection sec(cp, csprintf("PTE%d", x));
+        tlb[x].serialize(cp);
     }
     SERIALIZE_SCALAR(sfar);
 }
 
 void
-TLB::unserialize(Checkpoint *cp, const std::string &section)
+TLB::unserialize(CheckpointIn &cp)
 {
     int oldSize;
 
-    paramIn(cp, section, "size", oldSize);
+    paramIn(cp, "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);
+    std::vector<int> free_list;
+    UNSERIALIZE_CONTAINER(free_list);
     freeList.clear();
-    UNSERIALIZE_ARRAY(free_list,  cntr);
-    for (int x = 0; x < cntr; x++)
-        freeList.push_back(&tlb[free_list[x]]);
+    for (int idx : free_list)
+        freeList.push_back(&tlb[idx]);
 
     UNSERIALIZE_SCALAR(c0_tsb_ps0);
     UNSERIALIZE_SCALAR(c0_tsb_ps1);
@@ -1418,7 +1410,8 @@ TLB::unserialize(Checkpoint *cp, const std::string &section)
 
     lookupTable.clear();
     for (int x = 0; x < size; x++) {
-        tlb[x].unserialize(cp, csprintf("%s.PTE%d", section, x));
+        ScopedCheckpointSection sec(cp, csprintf("PTE%d", x));
+        tlb[x].unserialize(cp);
         if (tlb[x].valid)
             lookupTable.insert(tlb[x].range, &tlb[x]);