2 files changed, 9 insertions, 9 deletions
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index 716e5bd49..2b545d13c 100644
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -128,7 +128,7 @@
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
-#include "cpu/exec_context.hh"
+#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
@@ -252,7 +252,7 @@ RemoteGDB::Event::process(int revent)
         gdb->detach();
 }
 
-RemoteGDB::RemoteGDB(System *_system, ExecContext *c)
+RemoteGDB::RemoteGDB(System *_system, ThreadContext *c)
     : event(NULL), listener(NULL), number(-1), fd(-1),
       active(false), attached(false),
       system(_system), pmem(_system->physmem), context(c)
@@ -704,11 +704,11 @@ RemoteGDB::HardBreakpoint::HardBreakpoint(RemoteGDB *_gdb, Addr pc)
 }
 
 void
-RemoteGDB::HardBreakpoint::process(ExecContext *xc)
+RemoteGDB::HardBreakpoint::process(ThreadContext *tc)
 {
     DPRINTF(GDBMisc, "handling hardware breakpoint at %#x\n", pc());
 
-    if (xc == gdb->context)
+    if (tc == gdb->context)
         gdb->trap(ALPHA_KENTRY_INT);
 }
 
diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh
index df86f11f7..90b53e53f 100644
--- a/src/base/remote_gdb.hh
+++ b/src/base/remote_gdb.hh
@@ -39,7 +39,7 @@
 #include "base/socket.hh"
 
 class System;
-class ExecContext;
+class ThreadContext;
 class PhysicalMemory;
 
 class GDBListener;
@@ -80,7 +80,7 @@ class RemoteGDB
 
     System *system;
     PhysicalMemory *pmem;
-    ExecContext *context;
+    ThreadContext *context;
 
   protected:
     uint8_t getbyte();
@@ -98,10 +98,10 @@ class RemoteGDB
     template <class T> void write(Addr addr, T data);
 
   public:
-    RemoteGDB(System *system, ExecContext *context);
+    RemoteGDB(System *system, ThreadContext *context);
     ~RemoteGDB();
 
-    void replaceExecContext(ExecContext *xc) { context = xc; }
+    void replaceThreadContext(ThreadContext *tc) { context = tc; }
 
     void attach(int fd);
     void detach();
@@ -133,7 +133,7 @@ class RemoteGDB
         HardBreakpoint(RemoteGDB *_gdb, Addr addr);
         std::string name() { return gdb->name() + ".hwbkpt"; }
 
-        virtual void process(ExecContext *xc);
+        virtual void process(ThreadContext *tc);
     };
     friend class HardBreakpoint;