ruby: move stall and wakeup functions to AbstractController

[gem5.git] / src / cpu / pc_event.cc

diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc
index 050bf1a88a88f38752f61822381f30f51f77b834..c957fe4d5521322e058659182f2ea57225b969a6 100644 (file)
--- a/src/cpu/pc_event.cc
+++ b/src/cpu/pc_event.cc
@@ -24,20 +24,22 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ *          Steve Reinhardt
  */
 
 #include <algorithm>
-#include <map>
 #include <string>
 #include <utility>
 
+#include "base/debug.hh"
 #include "base/trace.hh"
-#include "config/full_system.hh"
 #include "cpu/base.hh"
-#include "cpu/exec_context.hh"
 #include "cpu/pc_event.hh"
-#include "sim/debug.hh"
-#include "sim/root.hh"
+#include "cpu/thread_context.hh"
+#include "debug/PCEvent.hh"
+#include "sim/core.hh"
 #include "sim/system.hh"
 
 using namespace std;
@@ -53,13 +55,18 @@ PCEventQueue::remove(PCEvent *event)
 {
     int removed = 0;
     range_t range = equal_range(event);
-    for (iterator i = range.first; i != range.second; ++i) {
+    iterator i = range.first;
+    while (i != range.second &&
+           i != pc_map.end()) {
         if (*i == event) {
             DPRINTF(PCEvent, "PC based event removed at %#x: %s\n",
                     event->pc(), event->descr());
-            pc_map.erase(i);
+            i = pc_map.erase(i);
             ++removed;
+        } else {
+            i++;
         }
+
     }
 
     return removed > 0;
@@ -78,9 +85,11 @@ PCEventQueue::schedule(PCEvent *event)
 }
 
 bool
-PCEventQueue::doService(ExecContext *xc)
+PCEventQueue::doService(ThreadContext *tc)
 {
-    Addr pc = xc->readPC() & ~0x3;
+    // This will fail to break on Alpha PALcode addresses, but that is
+    // a rare use case.
+    Addr pc = tc->instAddr();
     int serviced = 0;
     range_t range = equal_range(pc);
     for (iterator i = range.first; i != range.second; ++i) {
@@ -88,13 +97,13 @@ PCEventQueue::doService(ExecContext *xc)
         // another event.  This for example, prevents two invocations
         // of the SkipFuncEvent.  Maybe we should have separate PC
         // event queues for each processor?
-        if (pc != (xc->readPC() & ~0x3))
+        if (pc != tc->instAddr())
             continue;
 
         DPRINTF(PCEvent, "PC based event serviced at %#x: %s\n",
                 (*i)->pc(), (*i)->descr());
 
-        (*i)->process(xc);
+        (*i)->process(tc);
         ++serviced;
     }
 
@@ -108,7 +117,7 @@ PCEventQueue::dump() const
     const_iterator e = pc_map.end();
 
     for (; i != e; ++i)
-        cprintf("%d: event at %#x: %s\n", curTick, (*i)->pc(),
+        cprintf("%d: event at %#x: %s\n", curTick(), (*i)->pc(),
                 (*i)->descr());
 }
 
@@ -125,24 +134,21 @@ BreakPCEvent::BreakPCEvent(PCEventQueue *q, const std::string &desc, Addr addr,
 }
 
 void
-BreakPCEvent::process(ExecContext *xc)
+BreakPCEvent::process(ThreadContext *tc)
 {
-    StringWrap name(xc->getCpuPtr()->name() + ".break_event");
+    StringWrap name(tc->getCpuPtr()->name() + ".break_event");
     DPRINTFN("break event %s triggered\n", descr());
-    debug_break();
+    Debug::breakpoint();
     if (remove)
         delete this;
 }
 
-#if FULL_SYSTEM
-extern "C"
 void
 sched_break_pc_sys(System *sys, Addr addr)
 {
     new BreakPCEvent(&sys->pcEventQueue, "debug break", addr, true);
 }
 
-extern "C"
 void
 sched_break_pc(Addr addr)
 {
@@ -152,4 +158,3 @@ sched_break_pc(Addr addr)
     }
 
 }
-#endif