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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e33ade5ff0fc52a2c0382bd95c7f303b88c59228..6e7188a60637050e08dc8e115066ce093f57a4ee 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,7 +1,8 @@
 2011-02-26  Michael Snyder  <msnyder@vmware.com>
 
-       * i387-tdep.c (i387_supply_xsave): Avoid shadowing a function
+       * i387-tdep.c (i387_supply_fxsave): Avoid shadowing a function
        param with a local variable of the same name.
+       (i387_supply_xsave): Ditto.
 
        * 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 826746667ed6c92f0733301c00b6c30390e85e80..122bd83a397a3b1d4899fdc1a439a4321876a1d1 100644 (file)
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -587,9 +587,9 @@ i387_supply_fxsave (struct regcache *regcache, int regnum, const void *fxsave)
 
                    if (val[0] & (1 << fpreg))
                      {
-                       int regnum = (fpreg + 8 - top) % 8 
-                                      + I387_ST0_REGNUM (tdep);
-                       tag = i387_tag (FXSAVE_ADDR (tdep, regs, regnum));
+                       int thisreg = (fpreg + 8 - top) % 8 
+                                      + I387_ST0_REGNUM (tdep);
+                       tag = i387_tag (FXSAVE_ADDR (tdep, regs, thisreg));
                      }
                    else
                      tag = 3;          /* Empty */