From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8263 invoked by alias); 13 Dec 2011 03:41:10 -0000 Received: (qmail 8241 invoked by uid 22791); 13 Dec 2011 03:41:08 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-iy0-f169.google.com (HELO mail-iy0-f169.google.com) (209.85.210.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Dec 2011 03:40:54 +0000 Received: by mail-iy0-f169.google.com with SMTP id k25so11421845iah.0 for ; Mon, 12 Dec 2011 19:40:54 -0800 (PST) Received: by 10.50.236.35 with SMTP id ur3mr18214934igc.28.1323747654173; Mon, 12 Dec 2011 19:40:54 -0800 (PST) Received: from localhost.localdomain (c-24-18-115-186.hsd1.wa.comcast.net. [24.18.115.186]) by mx.google.com with ESMTPS id e2sm81168651ibe.0.2011.12.12.19.40.53 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 19:40:53 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Cc: Andrey Smirnov Subject: [PATCH 036/238] [index] i386-tdep.c: -Wshadow fix Date: Tue, 13 Dec 2011 03:41:00 -0000 Message-Id: <1323747545-29987-2-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com> References: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-12/txt/msg00363.txt.bz2 To ChangeLog: * i386-tdep.c (i386_record_lea_modrm_addr): Rename `index' to `idx'(-Wshadow). --- gdb/i386-tdep.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index a4e3a22..e28a257 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -3621,7 +3621,7 @@ i386_record_lea_modrm_addr (struct i386_record_s *irp, uint64_t *addr) int havesib = 0; uint8_t scale = 0; uint8_t byte; - uint8_t index = 0; + uint8_t idx = 0; uint8_t base = irp->rm; if (base == 4) @@ -3637,7 +3637,7 @@ i386_record_lea_modrm_addr (struct i386_record_s *irp, uint64_t *addr) } irp->addr++; scale = (byte >> 6) & 3; - index = ((byte >> 3) & 7) | irp->rex_x; + idx = ((byte >> 3) & 7) | irp->rex_x; base = (byte & 7); } base |= irp->rex_b; @@ -3703,9 +3703,9 @@ i386_record_lea_modrm_addr (struct i386_record_s *irp, uint64_t *addr) else *addr = (uint32_t) (offset64 + *addr); - if (havesib && (index != 4 || scale != 0)) + if (havesib && (idx != 4 || scale != 0)) { - regcache_raw_read_unsigned (irp->regcache, irp->regmap[index], + regcache_raw_read_unsigned (irp->regcache, irp->regmap[idx], &offset64); if (irp->aflag == 2) *addr += offset64 << scale; -- 1.7.5.4