2 files changed, 10 insertions, 22 deletions
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index 3b436cced..6ed5957d7 100644
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -289,17 +289,18 @@ BaseRemoteGDB::TrapEvent::process()
 }
 
 void
-BaseRemoteGDB::SingleStepEvent::process()
+BaseRemoteGDB::processSingleStepEvent()
 {
-    if (!gdb->singleStepEvent.scheduled())
-        gdb->scheduleInstCommitEvent(&gdb->singleStepEvent, 1);
-    gdb->trap(SIGTRAP);
+    if (!singleStepEvent.scheduled())
+        scheduleInstCommitEvent(&singleStepEvent, 1);
+    trap(SIGTRAP);
 }
 
 BaseRemoteGDB::BaseRemoteGDB(System *_system, ThreadContext *c) :
-        inputEvent(NULL), trapEvent(this), listener(NULL),
-        number(-1), fd(-1), active(false), attached(false), system(_system),
-        context(c), singleStepEvent(this)
+        inputEvent(NULL), trapEvent(this), listener(NULL), number(-1),
+        fd(-1), active(false), attached(false), system(_system),
+        context(c),
+        singleStepEvent([this]{ processSingleStepEvent(); }, name())
 {
 }
 
@@ -1123,4 +1124,3 @@ BaseRemoteGDB::hex2i(const char **srcp)
     *srcp = src;
     return r;
 }
-
diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh
index b7de0ae54..121faaf2e 100644
--- a/src/base/remote_gdb.hh
+++ b/src/base/remote_gdb.hh
@@ -260,20 +260,8 @@ class BaseRemoteGDB
         return trap(SIGTRAP);
     }
 
-  protected:
-    class SingleStepEvent : public Event
-    {
-      protected:
-        BaseRemoteGDB *gdb;
-
-      public:
-        SingleStepEvent(BaseRemoteGDB *g) : gdb(g)
-        {}
-
-        void process();
-    };
-
-    SingleStepEvent singleStepEvent;
+    void processSingleStepEvent();
+    EventFunctionWrapper singleStepEvent;
 
     void clearSingleStep();
     void setSingleStep();