2011-02-26 Michael Snyder <msnyder@vmware.com>

	* i387-tdep.c (i387_supply_xsave): Avoid shadowing a function
	param with a local variable of the same name.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 828994e8587a8f0bdc3780673db5e8fc1ba78667..e33ade5ff0fc52a2c0382bd95c7f303b88c59228 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-26  Michael Snyder  <msnyder@vmware.com>
 
+       * i387-tdep.c (i387_supply_xsave): Avoid shadowing a function
+       param with a local variable of the same name.
+
        * linux-low.c (linux_nat_xfer_osdata): Rename local variable so
        that it does not shadow a function parameter.
 

diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 7ec7f535c136fb1a374ab1a7d3a097338f123e1c..826746667ed6c92f0733301c00b6c30390e85e80 100644 (file)
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -882,9 +882,9 @@ i387_supply_xsave (struct regcache *regcache, int regnum,
 
                    if (val[0] & (1 << fpreg))
                      {
-                       int regnum = (fpreg + 8 - top) % 8 
+                       int thisreg = (fpreg + 8 - top) % 8 
                                       + I387_ST0_REGNUM (tdep);
-                       tag = i387_tag (FXSAVE_ADDR (tdep, regs, regnum));
+                       tag = i387_tag (FXSAVE_ADDR (tdep, regs, thisreg));
                      }
                    else
                      tag = 3;          /* Empty */