sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Changed the name of the fault's invocation method from ev5_trap to invoke.

Browse source 
--HG--
extra : convert_revision : b7ab14ac644f6a38c69aaa5372b3002b21f34af0
This commit is contained in:
Gabe Black 2006-03-01 01:23:10 -05:00
parent d6c0657116
commit e08cf8fee0
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/alpha/faults.cc
View file

@ -99,7 +99,7 @@ FaultStat IntegerOverflowFault::_stat;
#if FULL_SYSTEM #if FULL_SYSTEM
void AlphaFault::ev5_trap(ExecContext * xc) void AlphaFault::invoke(ExecContext * xc)
{ {
DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->regs.pc); DPRINTF(Fault, "Fault %s at PC: %#x\n", name(), xc->regs.pc);
xc->cpu->recordEvent(csprintf("Fault %s", name())); xc->cpu->recordEvent(csprintf("Fault %s", name()));

2
arch/alpha/faults.hh
View file

@ -42,7 +42,7 @@ class AlphaFault : public virtual FaultBase
{ {
public: public:
#if FULL_SYSTEM #if FULL_SYSTEM
void ev5_trap(ExecContext * xc); void invoke(ExecContext * xc);
#endif #endif
virtual FaultVect vect() = 0; virtual FaultVect vect() = 0;
}; };

2
cpu/exec_context.cc
View file

@ -227,7 +227,7 @@ ExecContext::trap(Fault fault)
/** @todo: Going to hack it for now. Do a true fixup later. */ /** @todo: Going to hack it for now. Do a true fixup later. */
#if FULL_SYSTEM #if FULL_SYSTEM
fault->ev5_trap(this); fault->invoke(this);
#else #else
fatal("fault (%d) detected @ PC 0x%08p", fault, readPC()); fatal("fault (%d) detected @ PC 0x%08p", fault, readPC());
#endif #endif

4
cpu/simple/cpu.cc
View file

@ -687,7 +687,7 @@ SimpleCPU::tick()
if (ipl && ipl > xc->readMiscReg(IPR_IPLR)) { if (ipl && ipl > xc->readMiscReg(IPR_IPLR)) {
xc->setMiscReg(IPR_ISR, summary); xc->setMiscReg(IPR_ISR, summary);
xc->setMiscReg(IPR_INTID, ipl); xc->setMiscReg(IPR_INTID, ipl);
Fault(new InterruptFault)->ev5_trap(xc); Fault(new InterruptFault)->invoke(xc);
DPRINTF(Flow, "Interrupt! IPLR=%d ipl=%d summary=%x\n", DPRINTF(Flow, "Interrupt! IPLR=%d ipl=%d summary=%x\n",
xc->readMiscReg(IPR_IPLR), ipl, summary); xc->readMiscReg(IPR_IPLR), ipl, summary);
@ -811,7 +811,7 @@ SimpleCPU::tick()
if (fault != NoFault) { if (fault != NoFault) {
#if FULL_SYSTEM #if FULL_SYSTEM
fault->ev5_trap(xc); fault->invoke(xc);
#else // !FULL_SYSTEM #else // !FULL_SYSTEM
fatal("fault (%d) detected @ PC 0x%08p", fault, xc->regs.pc); fatal("fault (%d) detected @ PC 0x%08p", fault, xc->regs.pc);
#endif // FULL_SYSTEM #endif // FULL_SYSTEM

2
cpu/simple/cpu.hh
View file

@ -347,7 +347,7 @@ class SimpleCPU : public BaseCPU
int readIntrFlag() { return xc->readIntrFlag(); } int readIntrFlag() { return xc->readIntrFlag(); }
void setIntrFlag(int val) { xc->setIntrFlag(val); } void setIntrFlag(int val) { xc->setIntrFlag(val); }
bool inPalMode() { return xc->inPalMode(); } bool inPalMode() { return xc->inPalMode(); }
void ev5_trap(Fault fault) { fault->ev5_trap(xc); } void ev5_trap(Fault fault) { fault->invoke(xc); }
bool simPalCheck(int palFunc) { return xc->simPalCheck(palFunc); } bool simPalCheck(int palFunc) { return xc->simPalCheck(palFunc); }
#else #else
void syscall() { xc->syscall(); } void syscall() { xc->syscall(); }

2
sim/faults.hh
View file

@ -53,7 +53,7 @@ class FaultBase : public RefCounted
virtual FaultName name() = 0; virtual FaultName name() = 0;
virtual FaultStat & stat() = 0; virtual FaultStat & stat() = 0;
#if FULL_SYSTEM #if FULL_SYSTEM
virtual void ev5_trap(ExecContext * xc) = 0; virtual void invoke(ExecContext * xc) = 0;
#endif #endif
template<typename T> template<typename T>
bool isA() {return dynamic_cast<T *>(this);} bool isA() {return dynamic_cast<T *>(this);}