From: Mark Kettenis Date: Sat, 7 Feb 2004 20:40:35 +0000 (+0000) Subject: * sparc-tdep.c (sparc32_frame_prev_register): Rename local X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d34766b6a1e38232506b9c6ebfa647e70c22463;p=binutils-gdb.git * sparc-tdep.c (sparc32_frame_prev_register): Rename local variable `i6' to `i7'. (sparc_supply_rwindow, sparc_collect_rwindow): Likewise. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 27fac564493..17f3bdeb677 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2004-02-07 Mark Kettenis + + * sparc-tdep.c (sparc32_frame_prev_register): Rename local + variable `i6' to `i7'. + (sparc_supply_rwindow, sparc_collect_rwindow): Likewise. + 2004-02-07 Andrew Cagney * tui/tui.h (Opaque, OpaquePtr OpaqueList): Delete definition. diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c index bbe56652096..66dbac798c0 100644 --- a/gdb/sparc-tdep.c +++ b/gdb/sparc-tdep.c @@ -729,11 +729,11 @@ sparc32_frame_prev_register (struct frame_info *next_frame, void **this_cache, if (valuep) { CORE_ADDR addr = cache->base + (regnum - SPARC_L0_REGNUM) * 4; - ULONGEST i6; + ULONGEST i7; /* Read the value in from memory. */ - i6 = get_frame_memory_unsigned (next_frame, addr, 4); - store_unsigned_integer (valuep, 4, i6 ^ wcookie); + i7 = get_frame_memory_unsigned (next_frame, addr, 4); + store_unsigned_integer (valuep, 4, i7 ^ wcookie); } return; } @@ -1241,9 +1241,9 @@ sparc_supply_rwindow (struct regcache *regcache, CORE_ADDR sp, int regnum) if (i == SPARC_I7_REGNUM) { ULONGEST wcookie = sparc_fetch_wcookie (); - ULONGEST i6 = extract_unsigned_integer (buf + offset, 4); + ULONGEST i7 = extract_unsigned_integer (buf + offset, 4); - store_unsigned_integer (buf + offset, 4, i6 ^ wcookie); + store_unsigned_integer (buf + offset, 4, i7 ^ wcookie); } regcache_raw_supply (regcache, i, buf); @@ -1294,9 +1294,9 @@ sparc_collect_rwindow (const struct regcache *regcache, if (i == SPARC_I7_REGNUM) { ULONGEST wcookie = sparc_fetch_wcookie (); - ULONGEST i6 = extract_unsigned_integer (buf + offset, 4); + ULONGEST i7 = extract_unsigned_integer (buf + offset, 4); - store_unsigned_integer (buf + offset, 4, i6 ^ wcookie); + store_unsigned_integer (buf + offset, 4, i7 ^ wcookie); } target_write_memory (sp + ((i - SPARC_L0_REGNUM) * 4),