2 files changed, 10 insertions, 2 deletions
diff --git a/cpu/pc_event.cc b/cpu/pc_event.cc
index 7b72f5c08..8c584a492 100644
--- a/cpu/pc_event.cc
+++ b/cpu/pc_event.cc
@@ -84,7 +84,7 @@ PCEventQueue::schedule(PCEvent *event)
 }
 
 bool
-PCEventQueue::service(ExecContext *xc)
+PCEventQueue::doService(ExecContext *xc)
 {
     Addr pc = xc->regs.pc;
     int serviced = 0;
diff --git a/cpu/pc_event.hh b/cpu/pc_event.hh
index 08c6fa59a..d452bc030 100644
--- a/cpu/pc_event.hh
+++ b/cpu/pc_event.hh
@@ -98,13 +98,21 @@ class PCEventQueue
   protected:
     map_t pc_map;
 
+    bool doService(ExecContext *xc);
+
   public:
     PCEventQueue();
     ~PCEventQueue();
 
     bool remove(PCEvent *event);
     bool schedule(PCEvent *event);
-    bool service(ExecContext *xc);
+    bool service(ExecContext *xc)
+    {
+        if (pc_map.empty())
+            return false;
+
+        return doService(xc);
+    }
 
     range_t equal_range(Addr pc);
     range_t equal_range(PCEvent *event) { return equal_range(event->pc()); }