* alpha-opc.c (alpha_opcodes): Fix thinko in ret pseudo

[deliverable/binutils-gdb.git] / gdb / regcache.c

diff --git a/gdb/regcache.c b/gdb/regcache.c
index 1b48da6575ea3c6f1ae63f985b60c0504a7c87c9..28859045e5fe87d8ecc8fd423708f7635eea17c3 100644 (file)
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -125,7 +125,8 @@ fetch_register (int regnum)
   if (FETCH_PSEUDO_REGISTER_P ()
       && pseudo_register (regnum))
     FETCH_PSEUDO_REGISTER (regnum);
-  target_fetch_registers (regnum);
+  else
+    target_fetch_registers (regnum);
 }
 
 /* Write register REGNUM cached value to the target.  */
@@ -140,7 +141,8 @@ store_register (int regnum)
   if (STORE_PSEUDO_REGISTER_P ()
       && pseudo_register (regnum))
     STORE_PSEUDO_REGISTER (regnum);
-  target_store_registers (regnum);
+  else
+    target_store_registers (regnum);
 }
 
 /* Low level examining and depositing of registers.
@@ -310,7 +312,7 @@ legacy_read_register_gen (int regnum, char *myaddr)
 void
 regcache_read (int rawnum, char *buf)
 {
-  gdb_assert (rawnum >= 0 && rawnum < NUM_REGS);
+  gdb_assert (rawnum >= 0 && rawnum < (NUM_REGS + NUM_PSEUDO_REGS));
   /* For moment, just use underlying legacy code. Ulgh!!! */
   legacy_read_register_gen (rawnum, buf);
 }
@@ -369,7 +371,7 @@ legacy_write_register_gen (int regnum, char *myaddr)
 void
 regcache_write (int rawnum, char *buf)
 {
-  gdb_assert (rawnum >= 0 && rawnum < NUM_REGS);
+  gdb_assert (rawnum >= 0 && rawnum < (NUM_REGS + NUM_PSEUDO_REGS));
   /* For moment, just use underlying legacy code. Ulgh!!! */
   legacy_write_register_gen (rawnum, buf);
 }
@@ -571,8 +573,8 @@ supply_register (int regnum, char *val)
      through the method gdbarch_register_read() clean up the
      values. */
 
-#ifdef CLEAN_UP_REGISTER_VALUE
-  CLEAN_UP_REGISTER_VALUE (regnum, register_buffer (regnum));
+#ifdef DEPRECATED_CLEAN_UP_REGISTER_VALUE
+  DEPRECATED_CLEAN_UP_REGISTER_VALUE (regnum, register_buffer (regnum));
 #endif
 }