base.cc (2923:db8a876258df) base.cc (2935:d1223a6c9156)
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;

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

21 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Authors: Steve Reinhardt
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;

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

21 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Authors: Steve Reinhardt
29 * Korey Sewell
30 */
31
32#include "arch/utility.hh"
33#include "base/cprintf.hh"
34#include "base/inifile.hh"
35#include "base/loader/symtab.hh"
36#include "base/misc.hh"
37#include "base/pollevent.hh"

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

450 else {
451 // go to the next instruction
452 thread->setPC(thread->readNextPC());
453#if THE_ISA == ALPHA_ISA
454 thread->setNextPC(thread->readNextPC() + sizeof(MachInst));
455#else
456 thread->setNextPC(thread->readNextNPC());
457 thread->setNextNPC(thread->readNextNPC() + sizeof(MachInst));
29 */
30
31#include "arch/utility.hh"
32#include "base/cprintf.hh"
33#include "base/inifile.hh"
34#include "base/loader/symtab.hh"
35#include "base/misc.hh"
36#include "base/pollevent.hh"

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

449 else {
450 // go to the next instruction
451 thread->setPC(thread->readNextPC());
452#if THE_ISA == ALPHA_ISA
453 thread->setNextPC(thread->readNextPC() + sizeof(MachInst));
454#else
455 thread->setNextPC(thread->readNextNPC());
456 thread->setNextNPC(thread->readNextNPC() + sizeof(MachInst));
457 assert(thread->readNextPC() != thread->readNextNPC());
458#endif
459
460 }
461
462#if FULL_SYSTEM
463 Addr oldpc;
464 do {
465 oldpc = thread->readPC();
466 system->pcEventQueue.service(tc);
467 } while (oldpc != thread->readPC());
468#endif
469}
470
458#endif
459
460 }
461
462#if FULL_SYSTEM
463 Addr oldpc;
464 do {
465 oldpc = thread->readPC();
466 system->pcEventQueue.service(tc);
467 } while (oldpc != thread->readPC());
468#endif
469}
470