From: Andrew Burgess <aburgess@redhat.com>
Date: Tue, 9 Aug 2022 11:10:03 +0000 (+0100)
Subject: gdb/riscv: use register name enum values in riscv-linux-nat.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8cf61a33bba791c38e1b2f6cf2f276d052a1f17e;p=binutils-gdb.git

gdb/riscv: use register name enum values in riscv-linux-nat.c

There were a few places where we were using integer values rather than
the RISCV_*_REGNUM constants defined in riscv-tdep.h.  This commit
replaces 0 with RISCV_ZERO_REGNUM and 32 with RISCV_PC_REGNUM in a few
places.

There should be no user visible changes after this commit.
---

diff --git a/gdb/riscv-linux-nat.c b/gdb/riscv-linux-nat.c
index 70634941483..5fbb0ca5add 100644
--- a/gdb/riscv-linux-nat.c
+++ b/gdb/riscv-linux-nat.c
@@ -66,17 +66,17 @@ supply_gregset_regnum (struct regcache *regcache, const prgregset_t *gregs,
 	regcache->raw_supply (i, regp + i);
 
       /* GDB stores PC in reg 32.  Linux kernel stores it in reg 0.  */
-      regcache->raw_supply (32, regp + 0);
+      regcache->raw_supply (RISCV_PC_REGNUM, regp + 0);
 
       /* Fill the inaccessible zero register with zero.  */
-      regcache->raw_supply_zeroed (0);
+      regcache->raw_supply_zeroed (RISCV_ZERO_REGNUM);
     }
   else if (regnum == RISCV_ZERO_REGNUM)
-    regcache->raw_supply_zeroed (0);
+    regcache->raw_supply_zeroed (RISCV_ZERO_REGNUM);
   else if (regnum > RISCV_ZERO_REGNUM && regnum < RISCV_PC_REGNUM)
     regcache->raw_supply (regnum, regp + regnum);
   else if (regnum == RISCV_PC_REGNUM)
-    regcache->raw_supply (32, regp + 0);
+    regcache->raw_supply (RISCV_PC_REGNUM, regp + 0);
 }
 
 /* Copy all general purpose registers from regset GREGS into REGCACHE.  */
@@ -147,7 +147,7 @@ fill_gregset (const struct regcache *regcache, prgregset_t *gregs, int regnum)
       for (int i = RISCV_ZERO_REGNUM + 1; i < RISCV_PC_REGNUM; i++)
 	regcache->raw_collect (i, regp + i);
 
-      regcache->raw_collect (32, regp + 0);
+      regcache->raw_collect (RISCV_PC_REGNUM, regp + 0);
     }
   else if (regnum == RISCV_ZERO_REGNUM)
     /* Nothing to do here.  */
@@ -155,7 +155,7 @@ fill_gregset (const struct regcache *regcache, prgregset_t *gregs, int regnum)
   else if (regnum > RISCV_ZERO_REGNUM && regnum < RISCV_PC_REGNUM)
     regcache->raw_collect (regnum, regp + regnum);
   else if (regnum == RISCV_PC_REGNUM)
-    regcache->raw_collect (32, regp + 0);
+    regcache->raw_collect (RISCV_PC_REGNUM, regp + 0);
 }
 
 /* Copy floating point register REGNUM (or all fp regs if REGNUM == -1)