Remove regcache_invalidate

Remove regcache_invalidate, update callers to use
detached_regcache::invalidate instead.

gdb/ChangeLog:

	* regcache.h (regcache_invalidate): Remove, update callers to
	use detached_regcache::invalidate instead.
	* regcache.c (regcache_invalidate): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d1ae322a1075574edb14240f11ab3802974c0ba6..d0cc45abad368e429adb51ee1d3cfeaf1ac7f05d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * regcache.h (regcache_invalidate): Remove, update callers to
+       use detached_regcache::invalidate instead.
+       * regcache.c (regcache_invalidate): Remove.
+
 2018-05-30  Simon Marchi  <simon.marchi@ericsson.com>
 
        * regcache.h (regcache_raw_write_part): Remove, update callers

diff --git a/gdb/record-full.c b/gdb/record-full.c
index b8460d9c5d872fce1f7b1dcc936fe7406eb66b46..8c0534e22919b79751f9f8c6bd4003310ca8bd96 100644 (file)
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -1609,10 +1609,10 @@ record_full_target::store_registers (struct regcache *regcache, int regno)
                  for (i = 0;
                       i < gdbarch_num_regs (regcache->arch ());
                       i++)
-                   regcache_invalidate (regcache, i);
+                   regcache->invalidate (i);
                }
              else
-               regcache_invalidate (regcache, regno);
+               regcache->invalidate (regno);
 
              error (_("Process record canceled the operation."));
            }

diff --git a/gdb/regcache.c b/gdb/regcache.c
index 371322d9a1e9c1283ffb7e9b9bc64e95bf4827ba..4dce9789a2b0c43cd2fb4702ff16e175f4e889b3 100644 (file)
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -238,7 +238,7 @@ public:
   ~regcache_invalidator ()
   {
     if (m_regcache != nullptr)
-      regcache_invalidate (m_regcache, m_regnum);
+      m_regcache->invalidate (m_regnum);
   }
 
   DISABLE_COPY_AND_ASSIGN (regcache_invalidator);
@@ -328,13 +328,6 @@ reg_buffer::get_register_status (int regnum) const
   return (enum register_status) m_register_status[regnum];
 }
 
-void
-regcache_invalidate (struct regcache *regcache, int regnum)
-{
-  gdb_assert (regcache != NULL);
-  regcache->invalidate (regnum);
-}
-
 void
 detached_regcache::invalidate (int regnum)
 {

diff --git a/gdb/regcache.h b/gdb/regcache.h
index af3adf8d212b3570d703103ea66d4314ad9b8a01..64e4cd7f09481608e4561f0434b8f2ad483e7cda 100644 (file)
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -50,8 +50,6 @@ extern void regcache_raw_write_unsigned (struct regcache *regcache,
 extern LONGEST regcache_raw_get_signed (struct regcache *regcache,
                                        int regnum);
 
-void regcache_invalidate (struct regcache *regcache, int regnum);
-
 /* Transfer of pseudo-registers.  The read variants return a register
    status, as an indication of when a ``cooked'' register was
    constructed from valid, invalid or unavailable ``raw''

diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 7946430ffd42985c69e748dda783e5ddd5049388..97e4a75ed70a7dd866d9887c6d662fabfc357960 100644 (file)
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -1703,7 +1703,7 @@ sh_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache,
 
       regcache->raw_write (BANK_REGNUM, buffer);
       for (bregnum = R0_BANK0_REGNUM; bregnum < MACLB_REGNUM; ++bregnum)
-        regcache_invalidate (regcache, bregnum);
+        regcache->invalidate (bregnum);
     }
   else if (reg_nr >= DR0_REGNUM && reg_nr <= DR_LAST_REGNUM)
     {