From f064aa306061ecc468efd8cf148ed08398ca824d Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 17 Aug 2010 05:17:06 -0700 Subject: sim: revamp unserialization procedure Replace direct call to unserialize() on each SimObject with a pair of calls for better control over initialization in both ckpt and non-ckpt cases. If restoring from a checkpoint, loadState(ckpt) is called on each SimObject. The default implementation simply calls unserialize() if there is a corresponding checkpoint section, so we get backward compatibility for existing objects. However, objects can override loadState() to get other behaviors, e.g., doing other programmed initializations after unserialize(), or complaining if no checkpoint section is found. (Note that the default warning for a missing checkpoint section is now gone.) If not restoring from a checkpoint, we call the new initState() method on each SimObject instead. This provides a hook for state initializations that are only required when *not* restoring from a checkpoint. Given this new framework, do some cleanup of LiveProcess subclasses and X86System, which were (in some cases) emulating initState() behavior in startup via a local flag or (in other cases) erroneously doing initializations in startup() that clobbered state loaded earlier by unserialize(). --- src/arch/sparc/process.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/arch/sparc/process.hh') diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh index cca312e0a..2d68fb3fc 100644 --- a/src/arch/sparc/process.hh +++ b/src/arch/sparc/process.hh @@ -52,7 +52,7 @@ class SparcLiveProcess : public LiveProcess SparcLiveProcess(LiveProcessParams * params, ObjectFile *objFile, Addr _StackBias); - void startup(); + void initState(); template void argsInit(int pageSize); @@ -87,7 +87,7 @@ class Sparc32LiveProcess : public SparcLiveProcess mmap_start = mmap_end = 0x70000000; } - void startup(); + void initState(); public: @@ -115,7 +115,7 @@ class Sparc64LiveProcess : public SparcLiveProcess mmap_start = mmap_end = 0xfffff80000000000ULL; } - void startup(); + void initState(); public: -- cgit v1.2.3