From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26954 invoked by alias); 6 Jan 2014 17:11:45 -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 26847 invoked by uid 89); 6 Jan 2014 17:11:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 06 Jan 2014 17:11:42 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s06HBfu5029656 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 6 Jan 2014 12:11:41 -0500 Received: from barimba.redhat.com (ovpn-113-85.phx2.redhat.com [10.3.113.85]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s06HBepS011728; Mon, 6 Jan 2014 12:11:41 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/3] make language_of_main static Date: Mon, 06 Jan 2014 17:11:00 -0000 Message-Id: <1389028297-16977-2-git-send-email-tromey@redhat.com> In-Reply-To: <1389028297-16977-1-git-send-email-tromey@redhat.com> References: <1389028297-16977-1-git-send-email-tromey@redhat.com> X-SW-Source: 2014-01/txt/msg00068.txt.bz2 This makes the global language_of_main static. Now it can be set only via a new argument to set_main_name. 2014-01-06 Tom Tromey * dbxread.c (process_one_symbol): Update. * dwarf2read.c (read_partial_die): Update. * symfile.c (set_initial_language): Call main_language. * symtab.c (language_of_main): Now static. (set_main_name): Add 'lang' parameter. (find_main_name): Update. (main_language): New function. (symtab_observer_executable_changed): Update. * symtab.h (set_main_name): Update. (language_of_main): Remove. (main_language): Declare. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/dbxread.c | 2 +- gdb/dwarf2read.c | 8 +------- gdb/symfile.c | 6 ++---- gdb/symtab.c | 25 +++++++++++++++++-------- gdb/symtab.h | 4 ++-- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 1bab8b8..71eb5f8 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -3251,7 +3251,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, N_MAIN within a given objfile, complain() and choose arbitrarily. (kingdon) */ if (name != NULL) - set_main_name (name); + set_main_name (name, language_unknown); break; /* The following symbol types can be ignored. */ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 23bcfe0..0bd7100 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -15313,13 +15313,7 @@ read_partial_die (const struct die_reader_specs *reader, practice. */ if (DW_UNSND (&attr) == DW_CC_program && cu->language == language_fortran) - { - set_main_name (part_die->name); - - /* As this DIE has a static linkage the name would be difficult - to look up later. */ - language_of_main = language_fortran; - } + set_main_name (part_die->name, language_fortran); break; case DW_AT_inline: if (DW_UNSND (&attr) == DW_INL_inlined diff --git a/gdb/symfile.c b/gdb/symfile.c index 4f0fea8..b4b4150 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1628,11 +1628,9 @@ symbol_file_command (char *args, int from_tty) void set_initial_language (void) { - enum language lang = language_unknown; + enum language lang = main_language (); - if (language_of_main != language_unknown) - lang = language_of_main; - else + if (lang == language_unknown) { char *name = main_name (); struct symbol *sym = lookup_symbol (name, NULL, VAR_DOMAIN, NULL); diff --git a/gdb/symtab.c b/gdb/symtab.c index f215586..188bc8a 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -5006,10 +5006,10 @@ skip_prologue_using_sal (struct gdbarch *gdbarch, CORE_ADDR func_addr) /* Track MAIN */ static char *name_of_main; -enum language language_of_main = language_unknown; +static enum language language_of_main = language_unknown; void -set_main_name (const char *name) +set_main_name (const char *name, enum language lang) { if (name_of_main != NULL) { @@ -5020,7 +5020,7 @@ set_main_name (const char *name) if (name != NULL) { name_of_main = xstrdup (name); - language_of_main = language_unknown; + language_of_main = lang; } } @@ -5051,27 +5051,27 @@ find_main_name (void) new_main_name = ada_main_name (); if (new_main_name != NULL) { - set_main_name (new_main_name); + set_main_name (new_main_name, language_ada); return; } new_main_name = go_main_name (); if (new_main_name != NULL) { - set_main_name (new_main_name); + set_main_name (new_main_name, language_go); return; } new_main_name = pascal_main_name (); if (new_main_name != NULL) { - set_main_name (new_main_name); + set_main_name (new_main_name, language_pascal); return; } /* The languages above didn't identify the name of the main procedure. Fallback to "main". */ - set_main_name ("main"); + set_main_name ("main", language_unknown); } char * @@ -5083,13 +5083,22 @@ main_name (void) return name_of_main; } +/* Return the language of the main function. If it is not known, + return language_unknown. */ + +enum language +main_language (void) +{ + return language_of_main; +} + /* Handle ``executable_changed'' events for the symtab module. */ static void symtab_observer_executable_changed (void) { /* NAME_OF_MAIN may no longer be the same, so reset it for now. */ - set_main_name (NULL); + set_main_name (NULL, language_unknown); } /* Return 1 if the supplied producer string matches the ARM RealView diff --git a/gdb/symtab.h b/gdb/symtab.h index 97e9ad7..4a93374 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1324,9 +1324,9 @@ extern struct cleanup *make_cleanup_free_search_symbols (struct symbol_search FIXME: cagney/2001-03-20: Can't make main_name() const since some of the calling code currently assumes that the string isn't const. */ -extern void set_main_name (const char *name); +extern void set_main_name (const char *name, enum language lang); extern /*const */ char *main_name (void); -extern enum language language_of_main; +extern enum language main_language (void); /* Check global symbols in objfile. */ struct symbol *lookup_global_symbol_from_objfile (const struct objfile *, -- 1.8.1.4