* regcache.h (struct thread_info): Forward declare.

[deliverable/binutils-gdb.git] / gdb / gdbserver / linux-xtensa-low.c

diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c
index 460747c9dd74157243b90bb8cf2fb77205064e29..c5ed3516ba5409f92c5f18541944fab3a43534a6 100644 (file)
--- a/gdb/gdbserver/linux-xtensa-low.c
+++ b/gdb/gdbserver/linux-xtensa-low.c
@@ -37,7 +37,7 @@ enum regnum {
 };
 
 static void
-xtensa_fill_gregset (void *buf)
+xtensa_fill_gregset (struct regcache *regcache, void *buf)
 {
   elf_greg_t* rset = (elf_greg_t*)buf;
   int ar0_regnum;
@@ -51,27 +51,27 @@ xtensa_fill_gregset (void *buf)
 
   for (i = ar0_regnum; i < ar0_regnum + XCHAL_NUM_AREGS; i++)
     {
-      collect_register (i, ptr);
+      collect_register (regcache, i, ptr);
       ptr += register_size(i);
     }
 
   /* Loop registers, if hardware has it.  */
 
 #if XCHAL_HAVE_LOOP
-  collect_register_by_name ("lbeg", (char*)&rset[R_LBEG]);
-  collect_register_by_name ("lend", (char*)&rset[R_LEND]);
-  collect_register_by_name ("lcount", (char*)&rset[R_LCOUNT]);
+  collect_register_by_name (regcache, "lbeg", (char*)&rset[R_LBEG]);
+  collect_register_by_name (regcache, "lend", (char*)&rset[R_LEND]);
+  collect_register_by_name (regcache, "lcount", (char*)&rset[R_LCOUNT]);
 #endif
 
-  collect_register_by_name ("sar", (char*)&rset[R_SAR]);
-  collect_register_by_name ("pc", (char*)&rset[R_PC]);
-  collect_register_by_name ("ps", (char*)&rset[R_PS]);
-  collect_register_by_name ("windowbase", (char*)&rset[R_WB]);
-  collect_register_by_name ("windowstart", (char*)&rset[R_WS]);
+  collect_register_by_name (regcache, "sar", (char*)&rset[R_SAR]);
+  collect_register_by_name (regcache, "pc", (char*)&rset[R_PC]);
+  collect_register_by_name (regcache, "ps", (char*)&rset[R_PS]);
+  collect_register_by_name (regcache, "windowbase", (char*)&rset[R_WB]);
+  collect_register_by_name (regcache, "windowstart", (char*)&rset[R_WS]);
 }
 
 static void
-xtensa_store_gregset (const void *buf)
+xtensa_store_gregset (struct regcache *regcache, const void *buf)
 {
   const elf_greg_t* rset = (const elf_greg_t*)buf;
   int ar0_regnum;
@@ -85,47 +85,47 @@ xtensa_store_gregset (const void *buf)
 
   for (i = ar0_regnum; i < ar0_regnum + XCHAL_NUM_AREGS; i++)
     {
-      supply_register (i, ptr);
+      supply_register (regcache, i, ptr);
       ptr += register_size(i);
     }
 
   /* Loop registers, if hardware has it.  */
 
 #if XCHAL_HAVE_LOOP
-  supply_register_by_name ("lbeg", (char*)&rset[R_LBEG]);
-  supply_register_by_name ("lend", (char*)&rset[R_LEND]);
-  supply_register_by_name ("lcount", (char*)&rset[R_LCOUNT]);
+  supply_register_by_name (regcache, "lbeg", (char*)&rset[R_LBEG]);
+  supply_register_by_name (regcache, "lend", (char*)&rset[R_LEND]);
+  supply_register_by_name (regcache, "lcount", (char*)&rset[R_LCOUNT]);
 #endif
 
-  supply_register_by_name ("sar", (char*)&rset[R_SAR]);
-  supply_register_by_name ("pc", (char*)&rset[R_PC]);
-  supply_register_by_name ("ps", (char*)&rset[R_PS]);
-  supply_register_by_name ("windowbase", (char*)&rset[R_WB]);
-  supply_register_by_name ("windowstart", (char*)&rset[R_WS]);
+  supply_register_by_name (regcache, "sar", (char*)&rset[R_SAR]);
+  supply_register_by_name (regcache, "pc", (char*)&rset[R_PC]);
+  supply_register_by_name (regcache, "ps", (char*)&rset[R_PS]);
+  supply_register_by_name (regcache, "windowbase", (char*)&rset[R_WB]);
+  supply_register_by_name (regcache, "windowstart", (char*)&rset[R_WS]);
 }
 
 /* Xtensa GNU/Linux PTRACE interface includes extended register set.  */
 
 static void
-xtensa_fill_xtregset (void *buf)
+xtensa_fill_xtregset (struct regcache *regcache, void *buf)
 {
   const xtensa_regtable_t *ptr;
 
   for (ptr = xtensa_regmap_table; ptr->name; ptr++)
     {
-      collect_register_by_name (ptr->name,
+      collect_register_by_name (regcache, ptr->name,
                                (char*)buf + ptr->ptrace_offset);
     }
 }
 
 static void
-xtensa_store_xtregset (const void *buf)
+xtensa_store_xtregset (struct regcache *regcache, const void *buf)
 {
   const xtensa_regtable_t *ptr;
 
   for (ptr = xtensa_regmap_table; ptr->name; ptr++)
     {
-      supply_register_by_name (ptr->name,
+      supply_register_by_name (regcache, ptr->name,
                                (char*)buf + ptr->ptrace_offset);
     }
 }
@@ -150,19 +150,19 @@ static const unsigned char xtensa_breakpoint[] = XTENSA_BREAKPOINT;
 #define xtensa_breakpoint_len 2
 
 static CORE_ADDR
-xtensa_get_pc (void)
+xtensa_get_pc (struct regcache *regcache)
 {
   unsigned long pc;
 
-  collect_register_by_name ("pc", &pc);
+  collect_register_by_name (regcache, "pc", &pc);
   return pc;
 }
 
 static void
-xtensa_set_pc (CORE_ADDR pc)
+xtensa_set_pc (struct regcache *regcache, CORE_ADDR pc)
 {
   unsigned long newpc = pc;
-  supply_register_by_name ("pc", &newpc);
+  supply_register_by_name (regcache, "pc", &newpc);
 }
 
 static int