69c69
< SystemCounter::serialize(std::ostream &os) const
---
> SystemCounter::serialize(CheckpointOut &cp) const
78,79c78
< SystemCounter::unserialize(Checkpoint *cp,
< const std::string &section)
---
> SystemCounter::unserialize(CheckpointIn &cp)
178c177
< ArchTimer::serialize(std::ostream &os) const
---
> ArchTimer::serialize(CheckpointOut &cp) const
180c179
< paramOut(os, "control_serial", _control);
---
> paramOut(cp, "control_serial", _control);
193,194c192
< ArchTimer::unserialize(Checkpoint *cp,
< const std::string &section)
---
> ArchTimer::unserialize(CheckpointIn &cp)
196c194
< paramIn(cp, section, "control_serial", _control);
---
> paramIn(cp, "control_serial", _control);
243c241
< GenericTimer::serialize(std::ostream &os)
---
> GenericTimer::serialize(CheckpointOut &cp) const
245c243
< paramOut(os, "cpu_count", timers.size());
---
> paramOut(cp, "cpu_count", timers.size());
247,248c245
< nameOut(os, csprintf("%s.sys_counter", name()));
< systemCounter.serialize(os);
---
> systemCounter.serializeSection(cp, "sys_counter");
251c248
< CoreTimers &core(getTimers(i));
---
> const CoreTimers &core(*timers[i]);
253,257c250,253
< nameOut(os, core.phys.name());
< core.phys.serialize(os);
<
< nameOut(os, core.virt.name());
< core.virt.serialize(os);
---
> // This should really be phys_timerN, but we are stuck with
> // arch_timer for backwards compatibility.
> core.phys.serializeSection(cp, csprintf("arch_timer%d", i));
> core.virt.serializeSection(cp, csprintf("virt_timer%d", i));
262c258
< GenericTimer::unserialize(Checkpoint *cp, const std::string &section)
---
> GenericTimer::unserialize(CheckpointIn &cp)
264c260
< systemCounter.unserialize(cp, csprintf("%s.sys_counter", section));
---
> systemCounter.unserializeSection(cp, "sys_counter");
281,282c277,278
< core.phys.unserialize(cp, csprintf("%s.arch_timer%d", section, i));
< core.virt.unserialize(cp, csprintf("%s.virt_timer%d", section, i));
---
> core.phys.unserializeSection(cp, csprintf("arch_timer%d", i));
> core.virt.unserializeSection(cp, csprintf("virt_timer%d", i));
501c497
< GenericTimerMem::serialize(std::ostream &os)
---
> GenericTimerMem::serialize(CheckpointOut &cp) const
503c499
< paramOut(os, "timer_count", 1);
---
> paramOut(cp, "timer_count", 1);
505,506c501
< nameOut(os, csprintf("%s.sys_counter", name()));
< systemCounter.serialize(os);
---
> systemCounter.serializeSection(cp, "sys_counter");
508,512c503,504
< nameOut(os, physTimer.name());
< physTimer.serialize(os);
<
< nameOut(os, virtTimer.name());
< virtTimer.serialize(os);
---
> physTimer.serializeSection(cp, "phys_timer0");
> virtTimer.serializeSection(cp, "virt_timer0");
516c508
< GenericTimerMem::unserialize(Checkpoint *cp, const std::string &section)
---
> GenericTimerMem::unserialize(CheckpointIn &cp)
518c510
< systemCounter.unserialize(cp, csprintf("%s.sys_counter", section));
---
> systemCounter.unserializeSection(cp, "sys_counter");
527,528c519,520
< physTimer.unserialize(cp, csprintf("%s.phys_timer0", section));
< virtTimer.unserialize(cp, csprintf("%s.virt_timer0", section));
---
> physTimer.unserializeSection(cp, "phys_timer0");
> virtTimer.unserializeSection(cp, "virt_timer0");