base.cc (2746:6c4d449121b9) | base.cc (2800:18a615ca6e19) |
---|---|
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; --- 432 unchanged lines hidden (view full) --- 441 } 442} 443 444 445void 446BaseSimpleCPU::advancePC(Fault fault) 447{ 448 if (fault != NoFault) { | 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; --- 432 unchanged lines hidden (view full) --- 441 } 442} 443 444 445void 446BaseSimpleCPU::advancePC(Fault fault) 447{ 448 if (fault != NoFault) { |
449#if FULL_SYSTEM | |
450 fault->invoke(tc); | 449 fault->invoke(tc); |
451#else // !FULL_SYSTEM 452 fatal("fault (%s) detected @ PC %08p", fault->name(), thread->readPC()); 453#endif // FULL_SYSTEM | |
454 } 455 else { 456 // go to the next instruction 457 thread->setPC(thread->readNextPC()); 458#if THE_ISA == ALPHA_ISA 459 thread->setNextPC(thread->readNextPC() + sizeof(MachInst)); 460#else 461 thread->setNextPC(thread->readNextNPC()); --- 14 unchanged lines hidden --- | 450 } 451 else { 452 // go to the next instruction 453 thread->setPC(thread->readNextPC()); 454#if THE_ISA == ALPHA_ISA 455 thread->setNextPC(thread->readNextPC() + sizeof(MachInst)); 456#else 457 thread->setNextPC(thread->readNextNPC()); --- 14 unchanged lines hidden --- |