1 files changed, 69 insertions, 2 deletions

diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index a01e053b9..a7f81d5fb 100644
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -40,6 +40,7 @@
 #include <string>
 #include <vector>
 
+#include "base/annotate.hh"
 #include "base/inifile.hh"
 #include "base/misc.hh"
 #include "base/output.hh"
@@ -178,6 +179,22 @@ paramOut(ostream &os, const std::string &name, const T &param)
     os << "\n";
 }
 
+template <class T>
+void
+arrayParamOut(ostream &os, const std::string &name,
+              const std::vector<T> &param)
+{
+    int size = param.size();
+    os << name << "=";
+    if (size > 0)
+        showParam(os, param[0]);
+    for (int i = 1; i < size; ++i) {
+        os << " ";
+        showParam(os, param[i]);
+    }
+    os << "\n";
+}
+
 
 template <class T>
 void
@@ -251,6 +268,49 @@ arrayParamIn(Checkpoint *cp, const std::string &section,
     }
 }
 
+template <class T>
+void
+arrayParamIn(Checkpoint *cp, const std::string &section,
+             const std::string &name, std::vector<T> &param)
+{
+    std::string str;
+    if (!cp->find(section, name, str)) {
+        fatal("Can't unserialize '%s:%s'\n", section, name);
+    }
+
+    // code below stolen from VectorParam<T>::parse().
+    // it would be nice to unify these somehow...
+
+    vector<string> tokens;
+
+    tokenize(tokens, str, ' ');
+
+    // Need this if we were doing a vector
+    // value.resize(tokens.size());
+
+    param.resize(tokens.size());
+
+    for (int i = 0; i < tokens.size(); i++) {
+        // need to parse into local variable to handle vector<bool>,
+        // for which operator[] returns a special reference class
+        // that's not the same as 'bool&', (since it's a packed
+        // vector)
+        T scalar_value;
+        if (!parseParam(tokens[i], scalar_value)) {
+            string err("could not parse \"");
+
+            err += str;
+            err += "\"";
+
+            fatal(err);
+        }
+
+        // assign parsed value to vector
+        param[i] = scalar_value;
+    }
+}
+
+
 
 void
 objParamIn(Checkpoint *cp, const std::string &section,
@@ -273,7 +333,13 @@ arrayParamOut(ostream &os, const std::string &name,			\
               type const *param, int size);				\
 template void								\
 arrayParamIn(Checkpoint *cp, const std::string &section,		\
-             const std::string &name, type *param, int size);
+             const std::string &name, type *param, int size);           \
+template void								\
+arrayParamOut(ostream &os, const std::string &name,			\
+              const std::vector<type> &param);				\
+template void								\
+arrayParamIn(Checkpoint *cp, const std::string &section,		\
+             const std::string &name, std::vector<type> &param);
 
 INSTANTIATE_PARAM_TEMPLATES(signed char)
 INSTANTIATE_PARAM_TEMPLATES(unsigned char)
@@ -343,6 +409,7 @@ Serializable::serializeAll(const std::string &cpt_dir)
     outstream << "// checkpoint generated: " << ctime(&t);
 
     globals.serialize(outstream);
+    Annotate::annotations.serialize(outstream);
     SimObject::serializeAll(outstream);
 }
 
@@ -358,7 +425,7 @@ Serializable::unserializeAll(const std::string &cpt_dir)
              dir);
     Checkpoint *cp = new Checkpoint(dir, section);
     unserializeGlobals(cp);
-
+    Annotate::annotations.unserialize(cp);
     SimObject::unserializeAll(cp);
 }