diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-01 01:23:10 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-01 01:23:10 -0500 |
| commit | e08cf8fee0a2732aab1d4c6d0ba152282aad9714 (patch) | |
| tree | 8b6fde3b50637a64ea5fd20de12e837bd1b61bb8 /cpu | |
| parent | d6c06571169603a37321af07b4d012f05806ad26 (diff) | |
| download | gem5-e08cf8fee0a2732aab1d4c6d0ba152282aad9714.tar.xz | |
Changed the name of the fault's invocation method from ev5_trap to invoke.
--HG--
extra : convert_revision : b7ab14ac644f6a38c69aaa5372b3002b21f34af0
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/exec_context.cc | 2 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 4 | ||||
| -rw-r--r-- | cpu/simple/cpu.hh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc index 7e8b81e18..0e787a547 100644 --- a/cpu/exec_context.cc +++ b/cpu/exec_context.cc @@ -227,7 +227,7 @@ ExecContext::trap(Fault fault) /** @todo: Going to hack it for now. Do a true fixup later. */ #if FULL_SYSTEM - fault->ev5_trap(this); + fault->invoke(this); #else fatal("fault (%d) detected @ PC 0x%08p", fault, readPC()); #endif diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index e5c2e18cf..85a3c19ac 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -687,7 +687,7 @@ SimpleCPU::tick() if (ipl && ipl > xc->readMiscReg(IPR_IPLR)) { xc->setMiscReg(IPR_ISR, summary); 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", xc->readMiscReg(IPR_IPLR), ipl, summary); @@ -811,7 +811,7 @@ SimpleCPU::tick() if (fault != NoFault) { #if FULL_SYSTEM - fault->ev5_trap(xc); + fault->invoke(xc); #else // !FULL_SYSTEM fatal("fault (%d) detected @ PC 0x%08p", fault, xc->regs.pc); #endif // FULL_SYSTEM diff --git a/cpu/simple/cpu.hh b/cpu/simple/cpu.hh index 243172821..8396937a8 100644 --- a/cpu/simple/cpu.hh +++ b/cpu/simple/cpu.hh @@ -347,7 +347,7 @@ class SimpleCPU : public BaseCPU int readIntrFlag() { return xc->readIntrFlag(); } void setIntrFlag(int val) { xc->setIntrFlag(val); } 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); } #else void syscall() { xc->syscall(); } |