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

--HG--
extra : convert_revision : b7ab14ac644f6a38c69aaa5372b3002b21f34af0

diff --git a/arch/alpha/faults.cc b/arch/alpha/faults.cc
index 8c7dc31948661c8d7b46adaab57a04cf245ee449..bde7b3db1ca88e386e15ceff2cd7bb34ce9554c8 100644 (file)
--- a/arch/alpha/faults.cc
+++ b/arch/alpha/faults.cc
@@ -99,7 +99,7 @@ FaultStat IntegerOverflowFault::_stat;
 
 #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);
     xc->cpu->recordEvent(csprintf("Fault %s", name()));

diff --git a/arch/alpha/faults.hh b/arch/alpha/faults.hh
index 829edd490d1cc0c4eba80ac25a3f1e459000ca30..c0316288cf5855ff02bd8110b99b3e7ae7a3fc38 100644 (file)
--- a/arch/alpha/faults.hh
+++ b/arch/alpha/faults.hh
@@ -42,7 +42,7 @@ class AlphaFault : public virtual FaultBase
 {
   public:
 #if FULL_SYSTEM
-    void ev5_trap(ExecContext * xc);
+    void invoke(ExecContext * xc);
 #endif
     virtual FaultVect vect() = 0;
 };

diff --git a/cpu/exec_context.cc b/cpu/exec_context.cc
index 7e8b81e1828fd3115e4c437f5b11987f83321eec..0e787a5472b81e98506c6d1ce0bad001cbe6e73e 100644 (file)
--- 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 e5c2e18cfab875c856d22af479d19f4a89a284d8..85a3c19acb5c224b6df52a7f6d398895f4278d5d 100644 (file)
--- 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 243172821cc8e7c2c2c587f514e1e3ed100ec08b..8396937a878155bd0845d776a4c9caa3198a0748 100644 (file)
--- 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(); }

diff --git a/sim/faults.hh b/sim/faults.hh
index 9b8c94cdaff4c0ecb051cc3aaf375891ac04d9bf..6a786fe265328df9de911ee79ed12843d261efdf 100644 (file)
--- a/sim/faults.hh
+++ b/sim/faults.hh
@@ -53,7 +53,7 @@ class FaultBase : public RefCounted
     virtual FaultName name() = 0;
     virtual FaultStat & stat() = 0;
 #if FULL_SYSTEM
-    virtual void ev5_trap(ExecContext * xc) = 0;
+    virtual void invoke(ExecContext * xc) = 0;
 #endif
     template<typename T>
     bool isA() {return dynamic_cast<T *>(this);}