From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 12 Oct 2022 00:13:15 +0000 (-0700)
Subject: Don't call tag_map_regno twice for each index.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc5c479ddecc82dafa385041fb0085020e47d446;p=thirdparty%2Fbinutils-gdb.git

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 a5931e83af1..55059101d98 100644
--- 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 444acea9654..69243ddabea 100644
--- 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;