Don't call tag_map_regno twice for each index.

diff --git a/gdb/aarch64-fbsd-tdep.c b/gdb/aarch64-fbsd-tdep.c
index a5931e83af194196d9f96ce294096b331664f921..55059101d98aa6ce17e8f4cc9cb907aec8821334 100644 (file)
--- a/gdb/aarch64-fbsd-tdep.c
+++ b/gdb/aarch64-fbsd-tdep.c
@@ -293,7 +293,7 @@ aarch64_fbsd_supply_capregset (const struct regset *regset,
       if (regno == -1)
        continue;
       if (regnum == -1 || regno == regnum)
-       regcache->raw_supply_tag (tag_map_regno(tdep, i), tag_map & 1);
+       regcache->raw_supply_tag (regno, tag_map & 1);
       tag_map >>= 1;
     }
 }
@@ -322,7 +322,7 @@ aarch64_fbsd_collect_capregset (const struct regset *regset,
       if (regnum == -1 || regno == regnum)
        {
          mask = (uint64_t)1 << i;
-         if (regcache->raw_collect_tag (tag_map_regno(tdep, i)))
+         if (regcache->raw_collect_tag (regno))
            tag_map |= mask;
          else
            tag_map &= ~mask;

diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index 444acea9654b93333217eb53d7704894c66a5e62..69243ddabea12f9c3b6e7c600c37bd4c002c74dd 100644 (file)
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -631,7 +631,7 @@ aarch64_linux_supply_cregset (const struct regset *regset,
 
       regno = tag_map_regno(tdep, i);
       if (regnum == -1 || regno == regnum)
-       regcache->raw_supply_tag (tag_map_regno(tdep, i), tag_map & 1);
+       regcache->raw_supply_tag (regno, tag_map & 1);
       tag_map >>= 1;
     }
 }
@@ -658,7 +658,7 @@ aarch64_linux_collect_cregset (const struct regset *regset,
       if (regnum == -1 || regno == regnum)
        {
          mask = (uint64_t)1 << i;
-         if (regcache->raw_collect_tag (tag_map_regno(tdep, i)))
+         if (regcache->raw_collect_tag (regno))
            tag_map |= mask;
          else
            tag_map &= ~mask;