2002-11-02 Andrew Cagney <cagney@redhat.com>

	* regcache.h (deprecated_read_register_gen): Rename
	read_register_gen.
	(deprecated_write_register_gen): Rename write_register_gen.
	* i387-tdep.c: Update.
	* x86-64-linux-nat.c: Update
	* wince.c: Update.
	* thread-db.c: Update.
	* win32-nat.c: Update.
	* mips-tdep.c: Update.
	* d10v-tdep.c: Update.
	* cris-tdep.c: Update.
	* remote-sim.c: Update.
	* remote-rdi.c: Update.
	* remote-rdp.c: Update.
	* frame.c: Update.
	* target.c: Update.
	* blockframe.c: Update.
	* x86-64-tdep.c: Update.
	* xstormy16-tdep.c: Update.
	* sh-tdep.c: Update.
	* s390-tdep.c: Update.
	* rs6000-tdep.c: Update.
	* sparc-tdep.c: Update.
	* i386-tdep.c: Update.
	* dwarf2cfi.c: Update.
	* regcache.c: Update.

25 files changed, 104 insertions, 74 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 822cc040a5f..effdb1f6d22 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,32 @@
+2002-11-02  Andrew Cagney  <cagney@redhat.com>
+
+	* regcache.h (deprecated_read_register_gen): Rename
+	read_register_gen.
+	(deprecated_write_register_gen): Rename write_register_gen.
+	* i387-tdep.c: Update.
+	* x86-64-linux-nat.c: Update
+	* wince.c: Update.
+	* thread-db.c: Update.
+	* win32-nat.c: Update.
+	* mips-tdep.c: Update.
+	* d10v-tdep.c: Update.
+	* cris-tdep.c: Update.
+	* remote-sim.c: Update.
+	* remote-rdi.c: Update.
+	* remote-rdp.c: Update.
+	* frame.c: Update.
+	* target.c: Update.
+	* blockframe.c: Update.
+	* x86-64-tdep.c: Update.
+	* xstormy16-tdep.c: Update.
+	* sh-tdep.c: Update.
+	* s390-tdep.c: Update.
+	* rs6000-tdep.c: Update.
+	* sparc-tdep.c: Update.
+	* i386-tdep.c: Update.
+	* dwarf2cfi.c: Update.
+	* regcache.c: Update.
+
 2002-11-01  Joel Brobecker  <brobecker@gnat.com>
 
 	New interix-specific files:
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 0b5c44004ab..2b789e6dbb1 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -1619,7 +1619,7 @@ deprecated_generic_get_saved_register (char *raw_buffer, int *optimized,
   if (addrp)
     *addrp = REGISTER_BYTE (regnum);
   if (raw_buffer)
-    read_register_gen (regnum, raw_buffer);
+    deprecated_read_register_gen (regnum, raw_buffer);
 }
 
 void
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 85b8887a1b0..860286eb48e 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -3706,8 +3706,8 @@ cris_fpless_backtrace (char *noargs, int from_tty)
      function (since there's no push srp in that case).  */
   int innermost_frame = 1;
   
-  read_register_gen (PC_REGNUM, (char *) &pc);
-  read_register_gen (SP_REGNUM, (char *) &sp);
+  deprecated_read_register_gen (PC_REGNUM, (char *) &pc);
+  deprecated_read_register_gen (SP_REGNUM, (char *) &sp);
   
   /* We make an explicit return when we can't find an outer frame.  */
   while (1)
@@ -3846,7 +3846,7 @@ cris_fpless_backtrace (char *noargs, int from_tty)
           /* We couldn't find a push srp in the prologue, so this must be
              a leaf function, and thus we use the srp register directly.
              This should happen at most once, for the innermost function.  */
-          read_register_gen (SRP_REGNUM, (char *) &pc);
+          deprecated_read_register_gen (SRP_REGNUM, (char *) &pc);
         }
       else
         {
diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c
index d338ff47810..42ac50516f0 100644
--- a/gdb/d10v-tdep.c
+++ b/gdb/d10v-tdep.c
@@ -977,7 +977,7 @@ show_regs (char *args, int from_tty)
       char num[MAX_REGISTER_RAW_SIZE];
       int i;
       printf_filtered ("  ");
-      read_register_gen (a, (char *) &num);
+      deprecated_read_register_gen (a, (char *) &num);
       for (i = 0; i < MAX_REGISTER_RAW_SIZE; i++)
 	{
 	  printf_filtered ("%02x", (num[i] & 0xff));
diff --git a/gdb/dwarf2cfi.c b/gdb/dwarf2cfi.c
index f1883b7d3a8..83cfddca9ca 100644
--- a/gdb/dwarf2cfi.c
+++ b/gdb/dwarf2cfi.c
@@ -824,14 +824,14 @@ get_reg (char *reg, struct context *context, int regnum)
   switch (context->reg[regnum].how)
     {
     case REG_CTX_UNSAVED:
-      read_register_gen (regnum, reg);
+      deprecated_read_register_gen (regnum, reg);
       break;
     case REG_CTX_SAVED_OFFSET:
       target_read_memory (context->cfa + context->reg[regnum].loc.offset,
 			  reg, REGISTER_RAW_SIZE (regnum));
       break;
     case REG_CTX_SAVED_REG:
-      read_register_gen (context->reg[regnum].loc.reg, reg);
+      deprecated_read_register_gen (context->reg[regnum].loc.reg, reg);
       break;
     case REG_CTX_SAVED_ADDR:
       target_read_memory (context->reg[regnum].loc.addr,
@@ -1688,7 +1688,7 @@ cfi_write_fp (CORE_ADDR val)
   if (fs->cfa_how == CFA_REG_OFFSET)
     {
       val -= fs->cfa_offset;
-      write_register_gen (fs->cfa_reg, (char *) &val);
+      deprecated_write_register_gen (fs->cfa_reg, (char *) &val);
     }
   else
     warning ("Can't write fp.");
@@ -1819,7 +1819,7 @@ cfi_get_saved_register (char *raw_buffer,
 
   if (!frame->next)
     {
-      read_register_gen (regnum, raw_buffer);
+      deprecated_read_register_gen (regnum, raw_buffer);
       if (lval != NULL)
 	*lval = lval_register;
       if (addrp != NULL)
@@ -1831,7 +1831,7 @@ cfi_get_saved_register (char *raw_buffer,
       switch (UNWIND_CONTEXT (frame)->reg[regnum].how)
 	{
 	case REG_CTX_UNSAVED:
-	  read_register_gen (regnum, raw_buffer);
+	  deprecated_read_register_gen (regnum, raw_buffer);
 	  if (lval != NULL)
 	    *lval = not_lval;
 	  if (optimized != NULL)
@@ -1849,8 +1849,8 @@ cfi_get_saved_register (char *raw_buffer,
 	      UNWIND_CONTEXT (frame)->reg[regnum].loc.offset;
 	  break;
 	case REG_CTX_SAVED_REG:
-	  read_register_gen (UNWIND_CONTEXT (frame)->reg[regnum].loc.reg,
-			     raw_buffer);
+	  deprecated_read_register_gen (UNWIND_CONTEXT (frame)->reg[regnum].loc.reg,
+					raw_buffer);
 	  if (lval != NULL)
 	    *lval = lval_register;
 	  if (addrp != NULL)
diff --git a/gdb/frame.c b/gdb/frame.c
index 9a5914c1898..d7d7f0a302f 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -115,7 +115,7 @@ frame_register_unwind (struct frame_info *frame, int regnum,
          available?  */
       *realnump = regnum;
       if (bufferp)
-	read_register_gen (regnum, bufferp);
+	deprecated_read_register_gen (regnum, bufferp);
       return;
     }
 
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index ab1945fea66..91e57142e42 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -838,7 +838,7 @@ i386_do_pop_frame (struct frame_info *frame)
       if (addr)
 	{
 	  read_memory (addr, regbuf, REGISTER_RAW_SIZE (regnum));
-	  write_register_gen (regnum, regbuf);
+	  deprecated_write_register_gen (regnum, regbuf);
 	}
     }
   write_register (FP_REGNUM, read_memory_integer (fp, 4));
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 3d4b39775fb..53d2ae86b2d 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -367,7 +367,7 @@ i387_print_float_info (struct gdbarch *gdbarch, struct ui_file *file,
 	  break;
 	}
 
-      read_register_gen ((fpreg + 8 - top) % 8 + FP0_REGNUM, raw);
+      deprecated_read_register_gen ((fpreg + 8 - top) % 8 + FP0_REGNUM, raw);
 
       fputs_filtered ("0x", file);
       for (i = 9; i >= 0; i--)
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 75f1c84ff14..7071c108707 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -3718,7 +3718,7 @@ mips_push_register (CORE_ADDR * sp, int regno)
       offset = 0;
     }
   *sp -= regsize;
-  read_register_gen (regno, buffer);
+  deprecated_read_register_gen (regno, buffer);
   write_memory (*sp, buffer + offset, regsize);
 }
 
diff --git a/gdb/regcache.c b/gdb/regcache.c
index ab65c67a47b..070651e1956 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -604,7 +604,7 @@ read_register_bytes (int in_start, char *in_buf, int in_len)
 
       if (REGISTER_NAME (regnum) != NULL && *REGISTER_NAME (regnum) != '\0')
 	/* Force the cache to fetch the entire register.  */
-	read_register_gen (regnum, reg_buf);
+	deprecated_read_register_gen (regnum, reg_buf);
       else
 	/* Legacy note: even though this register is ``invalid'' we
            still need to return something.  It would appear that some
@@ -748,7 +748,7 @@ regcache_raw_write_unsigned (struct regcache *regcache, int regnum,
 }
 
 void
-read_register_gen (int regnum, char *buf)
+deprecated_read_register_gen (int regnum, char *buf)
 {
   gdb_assert (current_regcache != NULL);
   gdb_assert (current_regcache->descr->gdbarch == current_gdbarch);
@@ -894,7 +894,7 @@ regcache_raw_write (struct regcache *regcache, int regnum, const void *buf)
 }
 
 void
-write_register_gen (int regnum, char *buf)
+deprecated_write_register_gen (int regnum, char *buf)
 {
   gdb_assert (current_regcache != NULL);
   gdb_assert (current_regcache->descr->gdbarch == current_gdbarch);
@@ -947,7 +947,7 @@ write_register_bytes (int myregstart, char *myaddr, int inlen)
 
       /* Is this register completely within the range the user is writing?  */
       else if (myregstart <= regstart && regend <= myregend)
-	write_register_gen (regnum, myaddr + (regstart - myregstart));
+	deprecated_write_register_gen (regnum, myaddr + (regstart - myregstart));
 
       /* The register partially overlaps the range being written.  */
       else
@@ -960,7 +960,7 @@ write_register_bytes (int myregstart, char *myaddr, int inlen)
 
 	  /* We may be doing a partial update of an invalid register.
 	     Update it from the target before scribbling on it.  */
-	  read_register_gen (regnum, regbuf);
+	  deprecated_read_register_gen (regnum, regbuf);
 
 	  memcpy (registers + overlapstart,
 		  myaddr + (overlapstart - myregstart),
@@ -1147,7 +1147,7 @@ ULONGEST
 read_register (int regnum)
 {
   char *buf = alloca (REGISTER_RAW_SIZE (regnum));
-  read_register_gen (regnum, buf);
+  deprecated_read_register_gen (regnum, buf);
   return (extract_unsigned_integer (buf, REGISTER_RAW_SIZE (regnum)));
 }
 
@@ -1178,7 +1178,7 @@ LONGEST
 read_signed_register (int regnum)
 {
   void *buf = alloca (REGISTER_RAW_SIZE (regnum));
-  read_register_gen (regnum, buf);
+  deprecated_read_register_gen (regnum, buf);
   return (extract_signed_integer (buf, REGISTER_RAW_SIZE (regnum)));
 }
 
@@ -1212,7 +1212,7 @@ write_register (int regnum, LONGEST val)
   size = REGISTER_RAW_SIZE (regnum);
   buf = alloca (size);
   store_signed_integer (buf, size, (LONGEST) val);
-  write_register_gen (regnum, buf);
+  deprecated_write_register_gen (regnum, buf);
 }
 
 void
diff --git a/gdb/regcache.h b/gdb/regcache.h
index 4ddcda38104..48112b31bcc 100644
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -184,9 +184,9 @@ extern void registers_fetched (void);
 
 extern void read_register_bytes (int regbyte, char *myaddr, int len);
 
-extern void read_register_gen (int regnum, char *myaddr);
+extern void deprecated_read_register_gen (int regnum, char *myaddr);
 
-extern void write_register_gen (int regnum, char *myaddr);
+extern void deprecated_write_register_gen (int regnum, char *myaddr);
 
 extern void write_register_bytes (int regbyte, char *myaddr, int len);
 
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 228e3d98c37..a85fbb118b7 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -598,7 +598,7 @@ arm_rdi_store_registers (int regno)
     }
   else
     {
-      read_register_gen (regno, (char *) rawreg);
+      deprecated_read_register_gen (regno, (char *) rawreg);
       /* RDI manipulates data in host byte order, so convert now. */
       store_unsigned_integer (rawerreg, 4, rawreg[0]);
 
diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index 34a42abb1fa..07b340bf9e4 100644
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -643,7 +643,7 @@ remote_rdp_store_register (int regno)
   else
     {
       char tmp[ARM_MAX_REGISTER_RAW_SIZE];
-      read_register_gen (regno, tmp);
+      deprecated_read_register_gen (regno, tmp);
       if (regno < 15)
 	rdp_store_one_register (1 << regno, tmp);
       else if (regno == ARM_PC_REGNUM)
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 221efe45674..c2c435c8703 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -361,7 +361,7 @@ gdbsim_store_register (int regno)
     {
       char tmp[MAX_REGISTER_RAW_SIZE];
       int nr_bytes;
-      read_register_gen (regno, tmp);
+      deprecated_read_register_gen (regno, tmp);
       nr_bytes = sim_store_register (gdbsim_desc,
 				     REGISTER_SIM_REGNO (regno),
 				     tmp, REGISTER_RAW_SIZE (regno));
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 53b9dd333e0..d3ad2a5c955 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -2014,7 +2014,7 @@ e500_store_return_value (struct type *type, char *valbuf)
 
       memcpy (reg_val_buf, valbuf + copied, reg_size);
       copied += reg_size;
-      write_register_gen (regnum, reg_val_buf);
+      deprecated_write_register_gen (regnum, reg_val_buf);
       i++;
     }
 }
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index f19e4ddfdd8..da415edbd08 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -1595,10 +1595,10 @@ s390_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
         else if (is_double_arg (type)
                  && gr <= 5)
           {
-            write_register_gen (S390_GP0_REGNUM + gr,
-                                VALUE_CONTENTS (arg));
-            write_register_gen (S390_GP0_REGNUM + gr + 1,
-                                VALUE_CONTENTS (arg) + 4);
+            deprecated_write_register_gen (S390_GP0_REGNUM + gr,
+					   VALUE_CONTENTS (arg));
+            deprecated_write_register_gen (S390_GP0_REGNUM + gr + 1,
+					   VALUE_CONTENTS (arg) + 4);
             gr += 2;
           }
         else
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 731e05a31bb..06940a1c418 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -1874,7 +1874,7 @@ sh64_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp,
   if (addrp)
     *addrp = REGISTER_BYTE (live_regnum);
   if (raw_buffer)
-    read_register_gen (live_regnum, raw_buffer);
+    deprecated_read_register_gen (live_regnum, raw_buffer);
 }
 
 /* Extract from an array REGBUF containing the (raw) register state
@@ -2223,7 +2223,8 @@ sh64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 	      if (float_arg_index <= tdep->FLOAT_ARGLAST_REGNUM)
 		{
 		  /* Goes in FR0...FR11 */
-		  write_register_gen (FP0_REGNUM + float_arg_index, val);
+		  deprecated_write_register_gen (FP0_REGNUM + float_arg_index,
+						 val);
 		  fp_args[float_arg_index] = 1;
 		  /* Skip the corresponding general argument register. */
 		  int_argreg ++;
@@ -2266,7 +2267,7 @@ sh64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 		       call the gdbarch function to do register
 		       writes, and that will properly know how to deal
 		       with pseudoregs. */
-		    write_register_gen (regnum, val);
+		    deprecated_write_register_gen (regnum, val);
 		    fp_args[double_arg_index] = 1;
 		    fp_args[double_arg_index + 1] = 1;
 		    /* Skip the corresponding general argument register. */
@@ -2501,7 +2502,7 @@ sh64_store_return_value (struct type *type, char *valbuf)
       if (len == 4)
 	{
 	  /* Return value stored in FP0_REGNUM */
-	  write_register_gen (FP0_REGNUM, valbuf);
+	  deprecated_write_register_gen (FP0_REGNUM, valbuf);
 	}
       if (len == 8)
 	{
@@ -2524,10 +2525,10 @@ sh64_store_return_value (struct type *type, char *valbuf)
 	    offset = REGISTER_RAW_SIZE (return_register) - len;
 
 	  memcpy (buf + offset, valbuf, len);
-	  write_register_gen (return_register, buf);
+	  deprecated_write_register_gen (return_register, buf);
 	}
       else
-	write_register_gen (return_register, valbuf);
+	deprecated_write_register_gen (return_register, valbuf);
     }
 }
 
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 033cc8170bf..0fce4732ab2 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -956,7 +956,7 @@ sparc_get_saved_register (char *raw_buffer, int *optimized, CORE_ADDR *addrp,
 	*lval = lval_register;
       addr = REGISTER_BYTE (regnum);
       if (raw_buffer != NULL)
-	read_register_gen (regnum, raw_buffer);
+	deprecated_read_register_gen (regnum, raw_buffer);
     }
   if (addrp != NULL)
     *addrp = addr;
@@ -1245,12 +1245,12 @@ sparc_pop_frame (void)
 	  if (fsr[FPS_REGNUM])
 	    {
 	      read_memory (fsr[FPS_REGNUM], raw_buffer, SPARC_INTREG_SIZE);
-	      write_register_gen (FPS_REGNUM, raw_buffer);
+	      deprecated_write_register_gen (FPS_REGNUM, raw_buffer);
 	    }
 	  if (fsr[CPS_REGNUM])
 	    {
 	      read_memory (fsr[CPS_REGNUM], raw_buffer, SPARC_INTREG_SIZE);
-	      write_register_gen (CPS_REGNUM, raw_buffer);
+	      deprecated_write_register_gen (CPS_REGNUM, raw_buffer);
 	    }
 	}
     }
@@ -1609,37 +1609,37 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno)
 
   for (regi = 0; regi <= R_I7; regi++)
     if ((regno == -1) || (regno == regi))
-      read_register_gen (regi, (char *) (regp + regi) + offset);
+      deprecated_read_register_gen (regi, (char *) (regp + regi) + offset);
 
   if ((regno == -1) || (regno == PC_REGNUM))
-    read_register_gen (PC_REGNUM, (char *) (regp + R_PC) + offset);
+    deprecated_read_register_gen (PC_REGNUM, (char *) (regp + R_PC) + offset);
 
   if ((regno == -1) || (regno == NPC_REGNUM))
-    read_register_gen (NPC_REGNUM, (char *) (regp + R_nPC) + offset);
+    deprecated_read_register_gen (NPC_REGNUM, (char *) (regp + R_nPC) + offset);
 
   if ((regno == -1) || (regno == Y_REGNUM))
-    read_register_gen (Y_REGNUM, (char *) (regp + R_Y) + offset);
+    deprecated_read_register_gen (Y_REGNUM, (char *) (regp + R_Y) + offset);
 
   if (GDB_TARGET_IS_SPARC64)
     {
 #ifdef R_CCR
       if (regno == -1 || regno == CCR_REGNUM)
-	read_register_gen (CCR_REGNUM, ((char *) (regp + R_CCR)) + offset);
+	deprecated_read_register_gen (CCR_REGNUM, ((char *) (regp + R_CCR)) + offset);
 #endif
 #ifdef R_FPRS
       if (regno == -1 || regno == FPRS_REGNUM)
-	read_register_gen (FPRS_REGNUM, ((char *) (regp + R_FPRS)) + offset);
+	deprecated_read_register_gen (FPRS_REGNUM, ((char *) (regp + R_FPRS)) + offset);
 #endif
 #ifdef R_ASI
       if (regno == -1 || regno == ASI_REGNUM)
-	read_register_gen (ASI_REGNUM, ((char *) (regp + R_ASI)) + offset);
+	deprecated_read_register_gen (ASI_REGNUM, ((char *) (regp + R_ASI)) + offset);
 #endif
     }
   else /* sparc32 */
     {
 #ifdef R_PS
       if (regno == -1 || regno == PS_REGNUM)
-	read_register_gen (PS_REGNUM, ((char *) (regp + R_PS)) + offset);
+	deprecated_read_register_gen (PS_REGNUM, ((char *) (regp + R_PS)) + offset);
 #endif
 
       /* For 64-bit hosts, R_WIM and R_TBR may not be defined.
@@ -1655,18 +1655,18 @@ fill_gregset (gdb_gregset_t *gregsetp, int regno)
 
 #if defined (R_WIM)
       if (regno == -1 || regno == WIM_REGNUM)
-	read_register_gen (WIM_REGNUM, ((char *) (regp + R_WIM)) + offset);
+	deprecated_read_register_gen (WIM_REGNUM, ((char *) (regp + R_WIM)) + offset);
 #else
       if (regno == -1 || regno == WIM_REGNUM)
-	read_register_gen (WIM_REGNUM, NULL);
+	deprecated_read_register_gen (WIM_REGNUM, NULL);
 #endif
 
 #if defined (R_TBR)
       if (regno == -1 || regno == TBR_REGNUM)
-	read_register_gen (TBR_REGNUM, ((char *) (regp + R_TBR)) + offset);
+	deprecated_read_register_gen (TBR_REGNUM, ((char *) (regp + R_TBR)) + offset);
 #else
       if (regno == -1 || regno == TBR_REGNUM)
-	read_register_gen (TBR_REGNUM, NULL);
+	deprecated_read_register_gen (TBR_REGNUM, NULL);
 #endif
     }
 }
@@ -2099,7 +2099,7 @@ sparc32_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
       for (j = 0; 
 	   j < m_arg->len && oregnum < 6; 
 	   j += SPARC_INTREG_SIZE, oregnum++)
-	write_register_gen (O0_REGNUM + oregnum, m_arg->contents + j);
+	deprecated_write_register_gen (O0_REGNUM + oregnum, m_arg->contents + j);
     }
 
   return sp;
@@ -2155,7 +2155,7 @@ sparc_store_return_value (struct type *type, char *valbuf)
       memset (buffer, 0, REGISTER_RAW_SIZE (regno));
       memcpy (buffer + REGISTER_RAW_SIZE (regno) - TYPE_LENGTH (type), valbuf,
 	      TYPE_LENGTH (type));
-      write_register_gen (regno, buffer);
+      deprecated_write_register_gen (regno, buffer);
     }
   else
     write_register_bytes (REGISTER_BYTE (regno), valbuf, TYPE_LENGTH (type));
@@ -2440,7 +2440,7 @@ sparc64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 	    {
 	      int oreg = O0_REGNUM + register_counter;
 
-	      write_register_gen (oreg, VALUE_CONTENTS (copyarg) + j);
+	      deprecated_write_register_gen (oreg, VALUE_CONTENTS (copyarg) + j);
 	      register_counter += 1;
 	    }
         }
diff --git a/gdb/target.c b/gdb/target.c
index 75d022ff200..c7a2acf0dc8 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1733,7 +1733,7 @@ debug_print_register (const char * func, int regno)
     {
       int i;
       unsigned char *buf = alloca (MAX_REGISTER_RAW_SIZE);
-      read_register_gen (regno, buf);
+      deprecated_read_register_gen (regno, buf);
       fprintf_unfiltered (gdb_stdlog, " = ");
       for (i = 0; i < REGISTER_RAW_SIZE (regno); i++)
 	{
diff --git a/gdb/thread-db.c b/gdb/thread-db.c
index d38db74b4b1..34b5c558b4c 100644
--- a/gdb/thread-db.c
+++ b/gdb/thread-db.c
@@ -829,7 +829,7 @@ thread_db_store_registers (int regno)
     {
       char raw[MAX_REGISTER_RAW_SIZE];
 
-      read_register_gen (regno, raw);
+      deprecated_read_register_gen (regno, raw);
       thread_db_fetch_registers (-1);
       supply_register (regno, raw);
     }
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index e2a85e138dc..73bc0839780 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -383,7 +383,7 @@ static void
 do_child_store_inferior_registers (int r)
 {
   if (r >= 0)
-    read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
+    deprecated_read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
   else
     {
       for (r = 0; r < NUM_REGS; r++)
diff --git a/gdb/wince.c b/gdb/wince.c
index 92c115820b4..15138b87a28 100644
--- a/gdb/wince.c
+++ b/gdb/wince.c
@@ -1139,7 +1139,7 @@ static void
 do_child_store_inferior_registers (int r)
 {
   if (r >= 0)
-    read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
+    deprecated_read_register_gen (r, ((char *) &current_thread->context) + mappings[r]);
   else
     {
       for (r = 0; r < NUM_REGS; r++)
diff --git a/gdb/x86-64-linux-nat.c b/gdb/x86-64-linux-nat.c
index 7e6417b1cc9..78e9c495af6 100644
--- a/gdb/x86-64-linux-nat.c
+++ b/gdb/x86-64-linux-nat.c
@@ -158,7 +158,7 @@ fill_gregset (elf_gregset_t * gregsetp, int regno)
 
   for (i = 0; i < x86_64_num_gregs; i++)
     if ((regno == -1 || regno == i))
-      read_register_gen (i, (char *) (regp + x86_64_regmap[i]));
+      deprecated_read_register_gen (i, (char *) (regp + x86_64_regmap[i]));
 }
 
 /* Fetch all general-purpose registers from process/thread TID and
diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c
index 24e2472a276..d3ecb2b5c35 100644
--- a/gdb/x86-64-tdep.c
+++ b/gdb/x86-64-tdep.c
@@ -692,30 +692,30 @@ x86_64_push_arguments (int nargs, struct value **args, CORE_ADDR sp,
 		case X86_64_NO_CLASS:
 		  break;
 		case X86_64_INTEGER_CLASS:
-		  write_register_gen (int_parameter_registers
-				      [(intreg + 1) / 2],
-				      VALUE_CONTENTS_ALL (args[i]) + offset);
+		  deprecated_write_register_gen (int_parameter_registers
+						 [(intreg + 1) / 2],
+						 VALUE_CONTENTS_ALL (args[i]) + offset);
 		  offset += 8;
 		  intreg += 2;
 		  break;
 		case X86_64_INTEGERSI_CLASS:
-		  write_register_gen (int_parameter_registers[intreg / 2],
-				      VALUE_CONTENTS_ALL (args[i]) + offset);
+		  deprecated_write_register_gen (int_parameter_registers[intreg / 2],
+						 VALUE_CONTENTS_ALL (args[i]) + offset);
 		  offset += 8;
 		  intreg++;
 		  break;
 		case X86_64_SSEDF_CLASS:
 		case X86_64_SSESF_CLASS:
 		case X86_64_SSE_CLASS:
-		  write_register_gen (sse_parameter_registers
-				      [(ssereg + 1) / 2],
-				      VALUE_CONTENTS_ALL (args[i]) + offset);
+		  deprecated_write_register_gen (sse_parameter_registers
+						 [(ssereg + 1) / 2],
+						 VALUE_CONTENTS_ALL (args[i]) + offset);
 		  offset += 8;
 		  ssereg += 2;
 		  break;
 		case X86_64_SSEUP_CLASS:
-		  write_register_gen (sse_parameter_registers[ssereg / 2],
-				      VALUE_CONTENTS_ALL (args[i]) + offset);
+		  deprecated_write_register_gen (sse_parameter_registers[ssereg / 2],
+						 VALUE_CONTENTS_ALL (args[i]) + offset);
 		  offset += 8;
 		  ssereg++;
 		  break;
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 9058a82c6bc..21457d0834a 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -387,7 +387,7 @@ xstormy16_store_return_value (struct type *type, char *valbuf)
       /* Add leading zeros to the value. */
       memset (buf, 0, xstormy16_reg_size);
       memcpy (buf, valbuf, 1);
-      write_register_gen (E_1ST_ARG_REGNUM, buf);
+      deprecated_write_register_gen (E_1ST_ARG_REGNUM, buf);
     }
   else if (xstormy16_type_is_scalar (type) &&
 	   TYPE_LENGTH (type) <= E_MAX_RETTYPE_SIZE_IN_REGS)