From patchwork Fri Apr 10 18:17:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 6147 Received: (qmail 111445 invoked by alias); 10 Apr 2015 18:17:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 111433 invoked by uid 89); 10 Apr 2015 18:17:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-ie0-f201.google.com Received: from mail-ie0-f201.google.com (HELO mail-ie0-f201.google.com) (209.85.223.201) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 10 Apr 2015 18:17:24 +0000 Received: by ierx19 with SMTP id x19so340877ier.0 for ; Fri, 10 Apr 2015 11:17:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-type; bh=6y3p9VcJeuBLK3bgwGf2F6Qy7o+3nCM0cpTTU2KuJmM=; b=GVIFi3Hy1JN9J8rfoT8bVR/G0EbRZ3aGI0xOfwp6KNf8PqsmcpmYmBo5iV4b6rf4/o vZ1dt423QAh/ktEkcVWfPMEHycMAeCcFpbWeNqenZTT8TsHYNJqSl5VRI8vq2AYocf4M suPzgGrJfSU1v7IzCMd96n6zsDVxYe9PsEpx21nD3XIrYEbvzAosgzMl9Cu6bfVhsIfd DIdZyX+KHR2XB098VD+/NOGWOxLkQ2nZ4KJEa8CLmIIWia8zNL7nvXDsAopObFKrbOWN s69ZEqOvRdbXEPc1V3wzmssGt4DpPsFC4u2v/qKX0taTu8DZZhk0/nH4+TQAUHZdwHKN QdNA== X-Gm-Message-State: ALoCoQmFcF9s+T2CLT2CsJUk4/SVHDATfdnm7mxMzYDh8NsiJ2uVvAPrenD1cLsfL3i9MS7BpPzKGcL0e3SpE43HWju0lOtakFXjHpe/z/cyhltN4b9IaXnHtBg2dDj/C/DNnOryJfDHQfqnZJR+BJpnGegMNDq/MCayyxjzLPuPX+2PCxWyNIk= X-Received: by 10.50.109.201 with SMTP id hu9mr150058igb.4.1428689842253; Fri, 10 Apr 2015 11:17:22 -0700 (PDT) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id t22si114151yho.2.2015.04.10.11.17.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2015 11:17:22 -0700 (PDT) Received: from ruffy.mtv.corp.google.com ([172.17.128.44]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTPS id WKaoxbqb.1; Fri, 10 Apr 2015 11:17:22 -0700 From: Doug Evans To: gdb-patches@sourceware.org Subject: [PATCH] solib-svr4.c (svr4_exec_displacement): Rename outer "displacement" Date: Fri, 10 Apr 2015 11:17:21 -0700 Message-ID: MIME-Version: 1.0 X-IsSubscribed: yes Hi. This function is too confusing to read with two different variables with the same name, one in an outer scope and one in an inner scope. I'd check this in as obvious, but maybe someone wants a different name. 2015-04-10 Doug Evans * solib-svr4.c (svr4_exec_displacement): Rename outer "displacement" to "exec_displacement" to avoid confusion with inner use of the name. diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index dd93847..909dfb7 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -2560,7 +2560,7 @@ svr4_exec_displacement (CORE_ADDR *displacementp) { /* ENTRY_POINT is a possible function descriptor - before a call to gdbarch_convert_from_func_ptr_addr. */ - CORE_ADDR entry_point, displacement; + CORE_ADDR entry_point, exec_displacement; if (exec_bfd == NULL) return 0; @@ -2575,9 +2575,9 @@ svr4_exec_displacement (CORE_ADDR *displacementp) if (target_auxv_search (¤t_target, AT_ENTRY, &entry_point) <= 0) return 0; - displacement = entry_point - bfd_get_start_address (exec_bfd); + exec_displacement = entry_point - bfd_get_start_address (exec_bfd); - /* Verify the DISPLACEMENT candidate complies with the required page + /* Verify the EXEC_DISPLACEMENT candidate complies with the required page alignment. It is cheaper than the program headers comparison below. */ if (bfd_get_flavour (exec_bfd) == bfd_target_elf_flavour) @@ -2589,7 +2589,7 @@ svr4_exec_displacement (CORE_ADDR *displacementp) p_offset % p_align == p_vaddr % p_align Kernel is free to load the executable with lower alignment. */ - if ((displacement & (elf->minpagesize - 1)) != 0) + if ((exec_displacement & (elf->minpagesize - 1)) != 0) return 0; } @@ -2910,11 +2910,11 @@ svr4_exec_displacement (CORE_ADDR *displacementp) printf_unfiltered (_("Using PIE (Position Independent Executable) " "displacement %s for \"%s\".\n"), - paddress (target_gdbarch (), displacement), + paddress (target_gdbarch (), exec_displacement), bfd_get_filename (exec_bfd)); } - *displacementp = displacement; + *displacementp = exec_displacement; return 1; }