1 files changed, 50 insertions, 19 deletions

diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh
index 6531e0f61..543683ee8 100644
--- a/src/arch/sparc/remote_gdb.hh
+++ b/src/arch/sparc/remote_gdb.hh
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2015 LabWare
  * Copyright (c) 2002-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
@@ -26,6 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Authors: Nathan Binkert
+ *          Boris Shingarov
  */
 
 #ifndef __ARCH_SPARC_REMOTE_GDB_HH__
@@ -33,10 +35,7 @@
 
 #include <map>
 
-#include "arch/sparc/types.hh"
-#include "base/pollevent.hh"
 #include "base/remote_gdb.hh"
-#include "cpu/pc_event.hh"
 
 class System;
 class ThreadContext;
@@ -47,26 +46,58 @@ namespace SparcISA
 class RemoteGDB : public BaseRemoteGDB
 {
   protected:
-    enum RegisterConstants
+    bool acc(Addr addr, size_t len);
+
+    class SPARCGdbRegCache : public BaseGdbRegCache
     {
-        RegG0 = 0, RegO0 = 8, RegL0 = 16, RegI0 = 24,
-        RegF0 = 32,
-        RegPc = 64, RegNpc, RegState, RegFsr, RegFprs, RegY,
-        /*RegState contains data in same format as tstate */
-        Reg32Y = 64, Reg32Psr, Reg32Pc, Reg32Npc, Reg32Fsr, Reg32Csr,
-        NumGDBRegs
+      using BaseGdbRegCache::BaseGdbRegCache;
+      private:
+        struct {
+            uint32_t gpr[32];
+            uint32_t hole[32];
+            uint32_t y;
+            uint32_t psr;
+            uint32_t wim;
+            uint32_t tbr;
+            uint32_t pc;
+            uint32_t npc;
+            uint32_t fsr;
+            uint32_t csr;
+        } r;
+      public:
+        char *data() const { return (char *)&r; }
+        size_t size() const { return sizeof(r); }
+        void getRegs(ThreadContext*);
+        void setRegs(ThreadContext*) const;
+        const std::string name() const { return gdb->name() + ".SPARCGdbRegCache"; }
     };
 
-  public:
-    RemoteGDB(System *system, ThreadContext *context);
-
-    bool acc(Addr addr, size_t len);
+    class SPARC64GdbRegCache : public BaseGdbRegCache
+    {
+      using BaseGdbRegCache::BaseGdbRegCache;
+      private:
+        struct {
+            uint64_t gpr[32];
+            uint64_t fpr[32];
+            uint64_t pc;
+            uint64_t npc;
+            uint64_t state;
+            uint64_t fsr;
+            uint64_t fprs;
+            uint64_t y;
+        } r;
+      public:
+        char *data() const { return (char *)&r; }
+        size_t size() const { return sizeof(r); }
+        void getRegs(ThreadContext*);
+        void setRegs(ThreadContext*) const;
+        const std::string name() const { return gdb->name() + ".SPARC64GdbRegCache"; }
+    };
 
-  protected:
-    void getregs();
-    void setregs();
+  public:
+    RemoteGDB(System *_system, ThreadContext *tc);
+    BaseGdbRegCache *gdbRegs();
 };
-
-}
+} // namespace SparcISA
 
 #endif /* __ARCH_SPARC_REMOTE_GDB_H__ */