atomic.cc (2923:db8a876258df) atomic.cc (2926:48f2f450cbf6)
1/*
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 164 unchanged lines hidden (view full) ---

173 UNSERIALIZE_ENUM(so_state);
174 tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
175 BaseSimpleCPU::unserialize(cp, section);
176}
177
178void
179AtomicSimpleCPU::resume()
180{
1/*
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 164 unchanged lines hidden (view full) ---

173 UNSERIALIZE_ENUM(so_state);
174 tickEvent.unserialize(cp, csprintf("%s.tickEvent", section));
175 BaseSimpleCPU::unserialize(cp, section);
176}
177
178void
179AtomicSimpleCPU::resume()
180{
181 assert(system->getMemoryMode() == System::Atomic);
182 changeState(SimObject::Running);
181 if (thread->status() == ThreadContext::Active) {
182 if (!tickEvent.scheduled())
183 tickEvent.schedule(curTick);
184 }
185}
186
187void
183 if (thread->status() == ThreadContext::Active) {
184 if (!tickEvent.scheduled())
185 tickEvent.schedule(curTick);
186 }
187}
188
189void
188AtomicSimpleCPU::resume()
189{
190 assert(system->getMemoryMode() == System::Atomic);
191 changeState(SimObject::Running);
192}
193
194void
195AtomicSimpleCPU::switchOut()
196{
197 assert(status() == Running || status() == Idle);
198 _status = SwitchedOut;
199
200 tickEvent.squash();
201}
202

--- 356 unchanged lines hidden --- 		190AtomicSimpleCPU::switchOut()
191{
192 assert(status() == Running || status() == Idle);
193 _status = SwitchedOut;
194
195 tickEvent.squash();
196}
197

--- 356 unchanged lines hidden ---