summaryrefslogtreecommitdiff
path: root/cpu/simple_cpu/simple_cpu.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-10-28 12:56:17 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2003-10-28 12:56:17 -0800
commite12e64a0718f6805c1203e1d11a39abaf0d9483b (patch)
tree3908a0650ad9a4022fb906c553c3648d31c1fcb4 /cpu/simple_cpu/simple_cpu.hh
parent18205206972932a236d0bf4f427918b57f9857f0 (diff)
parentb90f810575679442d78c0e9cd0c98a057ba4871b (diff)
downloadgem5-e12e64a0718f6805c1203e1d11a39abaf0d9483b.tar.xz
Merge zizzer:bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG-- extra : convert_revision : 50aa3791d27a17c4ea2fb4aee1a67011bd2abec1
Diffstat (limited to 'cpu/simple_cpu/simple_cpu.hh')
-rw-r--r--cpu/simple_cpu/simple_cpu.hh5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index 9e2c7fd06..fa7386106 100644
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -259,9 +259,8 @@ class SimpleCPU : public BaseCPU
void processCacheCompletion();
- virtual void serialize();
- virtual void unserialize(IniFile &db, const std::string &category,
- ConfigNode *node);
+ virtual void serialize(std::ostream &os);
+ virtual void unserialize(IniFile &db, const std::string &section);
template <class T>
Fault read(Addr addr, T& data, unsigned flags);