From e5b3d7d6f3e1894c12b6c44f5c0cff472726eb31 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Sat, 26 Feb 2011 23:45:01 +0000 Subject: [PATCH] 2011-02-26 Michael Snyder * i387-tdep.c (i387_supply_xsave): Avoid shadowing a function param with a local variable of the same name. --- gdb/ChangeLog | 3 +++ gdb/i387-tdep.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 828994e858..e33ade5ff0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2011-02-26 Michael Snyder + * 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 7ec7f535c1..826746667e 100644 --- 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 */ -- 2.34.1