diff -r a7a72f42919e -r 56533035907f src/arch/alpha/system.hh --- a/src/arch/alpha/system.hh Fri Aug 10 13:50:42 2012 -0500 +++ b/src/arch/alpha/system.hh Sun Aug 12 11:14:32 2012 -0500 @@ -62,9 +62,9 @@ virtual void serialize(std::ostream &os); virtual void unserialize(Checkpoint *cp, const std::string §ion); - /** Override loadState to provide a path to call setupFuncEvents() + /** Override startup() to provide a path to call setupFuncEvents() */ - virtual void loadState(Checkpoint *cp); + virtual void startup(); /** * Set the m5AlphaAccess pointer in the console diff -r a7a72f42919e -r 56533035907f src/arch/alpha/system.cc --- a/src/arch/alpha/system.cc Fri Aug 10 13:50:42 2012 -0500 +++ b/src/arch/alpha/system.cc Sun Aug 12 11:14:32 2012 -0500 @@ -134,24 +134,17 @@ virtProxy.write(addr+0x58, data); } else panic("could not find hwrpb\n"); +} +void +AlphaSystem::startup() +{ // Setup all the function events now that we have a system and a symbol // table setupFuncEvents(); } void -AlphaSystem::loadState(Checkpoint *cp) -{ - System::loadState(cp); - - // Setup all the function events now that we have a system and a symbol - // table - setupFuncEvents(); - -} - -void AlphaSystem::setupFuncEvents() { #ifndef NDEBUG