From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 63582 invoked by alias); 1 Aug 2015 16:25:18 -0000 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 Received: (qmail 62806 invoked by uid 89); 1 Aug 2015 16:25:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.4 required=5.0 tests=AWL,BAYES_50,KAM_LAZY_DOMAIN_SECURITY,KAM_STOCKGEN,RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 01 Aug 2015 16:25:15 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 74F7428B511B; Sat, 1 Aug 2015 18:25:12 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5kOX9NM40353; Sat, 1 Aug 2015 18:25:12 +0200 (CEST) Received: from [192.168.0.6] (nat75-2-78-193-84-173.fbxo.proxad.net [78.193.84.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id 24DFC28B5119; Sat, 1 Aug 2015 18:25:12 +0200 (CEST) Message-ID: <55BCF2E7.9000800@adacore.com> Date: Sat, 01 Aug 2015 16:25:00 -0000 From: Pierre-Marie de Rodat User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Luis Machado , Doug Evans CC: GDB Patches , Pedro Alves Subject: Re: [PATCH] Replace the block_found global with explicit data-flow References: <55AE7520.1010307@adacore.com> <55AE943F.3000009@adacore.com> <55BA299D.7040407@adacore.com> <55BC89E6.9040705@adacore.com> <55BC8CA9.3070505@adacore.com> <55BC92D8.8070407@adacore.com> <55BCEDF1.2070806@codesourcery.com> In-Reply-To: <55BCEDF1.2070806@codesourcery.com> Content-Type: multipart/mixed; boundary="------------080602090502010607020702" X-IsSubscribed: yes X-SW-Source: 2015-08/txt/msg00004.txt.bz2 This is a multi-part message in MIME format. --------------080602090502010607020702 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 585 On 08/01/2015 06:04 PM, Luis Machado wrote: >> + sym = lookup_symbol (MDEBUG_EFI_SYMBOL_NAME, b, LABEL_DOMAIN, >> + 0).symbol; >> } > > It is probably a matter of personal taste, but i find it easier and > cleaner to get the result of lookup_symbol (...) assigned to a variable > and then have the code access its 'symbol' field as opposed to chaining > things like the above. > > The current codebase doesn't show many occurrences like the above. Understood: here's an updated patch introducing a temporary to do this. Thank you! -- Pierre-Marie de Rodat --------------080602090502010607020702 Content-Type: text/x-patch; name="0001-Complete-the-previous-commit-block_found-refactoring.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Complete-the-previous-commit-block_found-refactoring.pa"; filename*1="tch" Content-length: 4404 >From 426cecfa72c713442341a77a68b853c4a97e60d7 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Sat, 1 Aug 2015 11:25:44 +0200 Subject: [PATCH] Complete the previous commit (block_found refactoring) The previous commit (Replace the block_found global with explicit data-flow) lacks updates in a couple of files because it was not tested building GDB with --enable-targets=all... but buildbots did. This adds the appropriate simple updates to fix buildbots. gdb/ * alpha-mdebug-tdep.c (find_proc_desc): Update call to lookup_symbol. * ft32-tdep.c (ft32_skip_prologue): Likewise. * moxie-tdep.c (moxie_skip_prologue): Likewise. * mt-tdep.c (mt_skip_prologue): Likewise. * xstormy16-tdep.c (xstormy16_skip_prologue): Likewise. --- gdb/ChangeLog | 9 +++++++++ gdb/alpha-mdebug-tdep.c | 7 ++++++- gdb/ft32-tdep.c | 2 +- gdb/moxie-tdep.c | 2 +- gdb/mt-tdep.c | 2 +- gdb/xstormy16-tdep.c | 2 +- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e8c04c0..a62415f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2015-08-01 Pierre-Marie de Rodat + * alpha-mdebug-tdep.c (find_proc_desc): Update call to + lookup_symbol. + * ft32-tdep.c (ft32_skip_prologue): Likewise. + * moxie-tdep.c (moxie_skip_prologue): Likewise. + * mt-tdep.c (mt_skip_prologue): Likewise. + * xstormy16-tdep.c (xstormy16_skip_prologue): Likewise. + +2015-08-01 Pierre-Marie de Rodat + * ada-exp.y (write_object_renaming): Replace struct ada_symbol_info with struct block_symbol. Update field references accordingly. diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c index 2f58c64..acde3e6 100644 --- a/gdb/alpha-mdebug-tdep.c +++ b/gdb/alpha-mdebug-tdep.c @@ -107,7 +107,12 @@ find_proc_desc (CORE_ADDR pc) symbol reading. */ sym = NULL; else - sym = lookup_symbol (MDEBUG_EFI_SYMBOL_NAME, b, LABEL_DOMAIN, 0); + { + struct block_symbol bsym + = lookup_symbol (MDEBUG_EFI_SYMBOL_NAME, b, LABEL_DOMAIN, 0); + + sym = bsym.symbol; + } } if (sym) diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c index e7f4d1a..2e5deca 100644 --- a/gdb/ft32-tdep.c +++ b/gdb/ft32-tdep.c @@ -250,7 +250,7 @@ ft32_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) plg_end = ft32_analyze_prologue (func_addr, func_end, &cache, gdbarch); /* Found a function. */ - sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL); + sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL).symbol; /* Don't use line number debug info for assembly source files. */ if ((sym != NULL) && SYMBOL_LANGUAGE (sym) != language_asm) { diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index 555151d..9496314 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -241,7 +241,7 @@ moxie_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) plg_end = moxie_analyze_prologue (func_addr, func_end, &cache, gdbarch); /* Found a function. */ - sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL); + sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL).symbol; /* Don't use line number debug info for assembly source files. */ if (sym && SYMBOL_LANGUAGE (sym) != language_asm) diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c index 74d54a7..a9c1fbb 100644 --- a/gdb/mt-tdep.c +++ b/gdb/mt-tdep.c @@ -415,7 +415,7 @@ mt_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) struct symbol *sym; /* Found a function. */ - sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL); + sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL).symbol; if (sym && SYMBOL_LANGUAGE (sym) != language_asm) { /* Don't use this trick for assembly source files. */ diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 4faad2e..05b3039 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -433,7 +433,7 @@ xstormy16_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) return plg_end; /* Found a function. */ - sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL); + sym = lookup_symbol (func_name, NULL, VAR_DOMAIN, NULL).symbol; /* Don't use line number debug info for assembly source files. */ if (sym && SYMBOL_LANGUAGE (sym) != language_asm) { -- 2.4.6 --------------080602090502010607020702--