From patchwork Tue Oct 29 21:56:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35459 Received: (qmail 46474 invoked by alias); 29 Oct 2019 21:56:25 -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 46426 invoked by uid 89); 29 Oct 2019 21:56:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN autolearn=ham version=3.3.1 spammy=settle, canceled X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 Oct 2019 21:56:17 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id AC37920C7E; Tue, 29 Oct 2019 17:56:15 -0400 (EDT) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 4749220D63; Tue, 29 Oct 2019 17:56:08 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 2FD9520AF6; Tue, 29 Oct 2019 17:56:08 -0400 (EDT) X-Gerrit-PatchSet: 2 Date: Tue, 29 Oct 2019 17:56:07 -0400 From: "Sourceware to Gerrit sync (Code Review)" To: Simon Marchi , Tom Tromey , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [pushed] Clean up ada-lang.h X-Gerrit-Change-Id: If0d46ba87d6585ab674c87244068a19e84718fc9 X-Gerrit-Change-Number: 324 X-Gerrit-ChangeURL: X-Gerrit-Commit: de93309a38afe2a7c0c519c8b69cca7c20d03fbc In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, simon.marchi@polymtl.ca, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-74-g460fb0f7e9 Message-Id: <20191029215608.2FD9520AF6@gnutoolchain-gerrit.osci.io> The original change was created by Simon Marchi. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/324 ...................................................................... Clean up ada-lang.h This patch cleans up ada-lang.h: - Some functions just don't exist anymore, remove their declaration - Some functions are implemented in ada-lang.c and only used there, make them static to that file. I moved some functions higher in the file to avoid having to forward-declare them, but the implementations are unchanged. gdb/ChangeLog: * ada-lang.h (GROW_VECT): Move to ada-lang.c. (grow_vect): Remove declaration. (ada_type_of_array): Remove declaration. (ada_update_initial_language): Remove declaration. (ada_fold_name): Remove declaration. (ada_fill_in_ada_prototype): Remove declaration. (user_select_syms): Remove declaration. (get_selections): Remove declaration. (ada_tag_type): Remove declaration. (ada_value_tag): Remove declaration. (ada_is_others_clause): Remove declaration. (ada_in_variant): Remove declaration. (ada_value_struct_elt): Remove declaration. (ada_attribute_name): Remove declaration. (ada_system_address_type): Remove declaration. * ada-lang.c (ada_watch_location_expression): Make static. (GROW_VECT): Move here from ada-lang.h. (grow_vect): Make static. (ada_update_initial_language): Make static. (ada_fold_name): Make static. (ada_type_of_array): Make static. (encoded_ordered_before): Move up. (sort_choices): Move up. (print_signatures): Move up. (ada_print_symbol_signature): Move up. (get_selections): Move up and make static. (user_select_syms): Move up and make static. (ada_value_struct_elt): Move up and make static. (ada_tag_type): Make static. (ada_value_tag): Make static. (ada_is_others_clause): Make static. (ada_in_variant): Make static. (ada_attribute_name): Make static. Change-Id: If0d46ba87d6585ab674c87244068a19e84718fc9 --- M gdb/ChangeLog M gdb/ada-lang.c M gdb/ada-lang.h 3 files changed, 491 insertions(+), 483 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 63c8c57..8c12df0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,41 @@ 2019-10-29 Simon Marchi + * ada-lang.h (GROW_VECT): Move to ada-lang.c. + (grow_vect): Remove declaration. + (ada_type_of_array): Remove declaration. + (ada_update_initial_language): Remove declaration. + (ada_fold_name): Remove declaration. + (ada_fill_in_ada_prototype): Remove declaration. + (user_select_syms): Remove declaration. + (get_selections): Remove declaration. + (ada_tag_type): Remove declaration. + (ada_value_tag): Remove declaration. + (ada_is_others_clause): Remove declaration. + (ada_in_variant): Remove declaration. + (ada_value_struct_elt): Remove declaration. + (ada_attribute_name): Remove declaration. + (ada_system_address_type): Remove declaration. + * ada-lang.c (ada_watch_location_expression): Make static. + (GROW_VECT): Move here from ada-lang.h. + (grow_vect): Make static. + (ada_update_initial_language): Make static. + (ada_fold_name): Make static. + (ada_type_of_array): Make static. + (encoded_ordered_before): Move up. + (sort_choices): Move up. + (print_signatures): Move up. + (ada_print_symbol_signature): Move up. + (get_selections): Move up and make static. + (user_select_syms): Move up and make static. + (ada_value_struct_elt): Move up and make static. + (ada_tag_type): Make static. + (ada_value_tag): Make static. + (ada_is_others_clause): Make static. + (ada_in_variant): Make static. + (ada_attribute_name): Make static. + +2019-10-29 Simon Marchi + * ada-lang.c: Remove includes. * ada-typeprint.c: Remove includes. * ada-valprint.c: Remove includes. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d08a264..7370490 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -527,7 +527,7 @@ /* la_watch_location_expression for Ada. */ -gdb::unique_xmalloc_ptr +static gdb::unique_xmalloc_ptr ada_watch_location_expression (struct type *type, CORE_ADDR addr) { type = check_typedef (TYPE_TARGET_TYPE (check_typedef (type))); @@ -536,11 +536,17 @@ (xstrprintf ("{%s} %s", name.c_str (), core_addr_to_string (addr))); } +/* Assuming V points to an array of S objects, make sure that it contains at + least M objects, updating V and S as necessary. */ + +#define GROW_VECT(v, s, m) \ + if ((s) < (m)) (v) = (char *) grow_vect (v, &(s), m, sizeof *(v)); + /* Assuming VECT points to an array of *SIZE objects of size ELEMENT_SIZE, grow it to contain at least MIN_SIZE objects, updating *SIZE as necessary and returning the (new) array. */ -void * +static void * grow_vect (void *vect, size_t *size, size_t min_size, int element_size) { if (*size < min_size) @@ -862,7 +868,7 @@ /* If the main program is in Ada, return language_ada, otherwise return LANG (the main program is in Ada iif the adainit symbol is found). */ -enum language +static enum language ada_update_initial_language (enum language lang) { if (lookup_minimal_symbol ("adainit", NULL, NULL).minsym != NULL) @@ -1009,7 +1015,7 @@ quotes, unfolded, but with the quotes stripped away. Result good to next call. */ -char * +static char * ada_fold_name (const char *name) { static char *fold_buffer = NULL; @@ -1910,7 +1916,8 @@ the ARR denotes a null array descriptor and BOUNDS is non-zero, returns NULL. The result is simply the type of ARR if ARR is not a descriptor. */ -struct type * + +static struct type * ada_type_of_array (struct value *arr, int bounds) { if (ada_is_constrained_packed_array_type (value_type (arr))) @@ -3140,6 +3147,319 @@ error (_("Could not find operator name for opcode")); } +/* Returns true (non-zero) iff decoded name N0 should appear before N1 + in a listing of choices during disambiguation (see sort_choices, below). + The idea is that overloadings of a subprogram name from the + same package should sort in their source order. We settle for ordering + such symbols by their trailing number (__N or $N). */ + +static int +encoded_ordered_before (const char *N0, const char *N1) +{ + if (N1 == NULL) + return 0; + else if (N0 == NULL) + return 1; + else + { + int k0, k1; + + for (k0 = strlen (N0) - 1; k0 > 0 && isdigit (N0[k0]); k0 -= 1) + ; + for (k1 = strlen (N1) - 1; k1 > 0 && isdigit (N1[k1]); k1 -= 1) + ; + if ((N0[k0] == '_' || N0[k0] == '$') && N0[k0 + 1] != '\000' + && (N1[k1] == '_' || N1[k1] == '$') && N1[k1 + 1] != '\000') + { + int n0, n1; + + n0 = k0; + while (N0[n0] == '_' && n0 > 0 && N0[n0 - 1] == '_') + n0 -= 1; + n1 = k1; + while (N1[n1] == '_' && n1 > 0 && N1[n1 - 1] == '_') + n1 -= 1; + if (n0 == n1 && strncmp (N0, N1, n0) == 0) + return (atoi (N0 + k0 + 1) < atoi (N1 + k1 + 1)); + } + return (strcmp (N0, N1) < 0); + } +} + +/* Sort SYMS[0..NSYMS-1] to put the choices in a canonical order by the + encoded names. */ + +static void +sort_choices (struct block_symbol syms[], int nsyms) +{ + int i; + + for (i = 1; i < nsyms; i += 1) + { + struct block_symbol sym = syms[i]; + int j; + + for (j = i - 1; j >= 0; j -= 1) + { + if (encoded_ordered_before (SYMBOL_LINKAGE_NAME (syms[j].symbol), + SYMBOL_LINKAGE_NAME (sym.symbol))) + break; + syms[j + 1] = syms[j]; + } + syms[j + 1] = sym; + } +} + +/* Whether GDB should display formals and return types for functions in the + overloads selection menu. */ +static bool print_signatures = true; + +/* Print the signature for SYM on STREAM according to the FLAGS options. For + all but functions, the signature is just the name of the symbol. For + functions, this is the name of the function, the list of types for formals + and the return type (if any). */ + +static void +ada_print_symbol_signature (struct ui_file *stream, struct symbol *sym, + const struct type_print_options *flags) +{ + struct type *type = SYMBOL_TYPE (sym); + + fprintf_filtered (stream, "%s", SYMBOL_PRINT_NAME (sym)); + if (!print_signatures + || type == NULL + || TYPE_CODE (type) != TYPE_CODE_FUNC) + return; + + if (TYPE_NFIELDS (type) > 0) + { + int i; + + fprintf_filtered (stream, " ("); + for (i = 0; i < TYPE_NFIELDS (type); ++i) + { + if (i > 0) + fprintf_filtered (stream, "; "); + ada_print_type (TYPE_FIELD_TYPE (type, i), NULL, stream, -1, 0, + flags); + } + fprintf_filtered (stream, ")"); + } + if (TYPE_TARGET_TYPE (type) != NULL + && TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID) + { + fprintf_filtered (stream, " return "); + ada_print_type (TYPE_TARGET_TYPE (type), NULL, stream, -1, 0, flags); + } +} + +/* Read and validate a set of numeric choices from the user in the + range 0 .. N_CHOICES-1. Place the results in increasing + order in CHOICES[0 .. N-1], and return N. + + The user types choices as a sequence of numbers on one line + separated by blanks, encoding them as follows: + + + A choice of 0 means to cancel the selection, throwing an error. + + If IS_ALL_CHOICE, a choice of 1 selects the entire set 0 .. N_CHOICES-1. + + The user chooses k by typing k+IS_ALL_CHOICE+1. + + The user is not allowed to choose more than MAX_RESULTS values. + + ANNOTATION_SUFFIX, if present, is used to annotate the input + prompts (for use with the -f switch). */ + +static int +get_selections (int *choices, int n_choices, int max_results, + int is_all_choice, const char *annotation_suffix) +{ + char *args; + const char *prompt; + int n_chosen; + int first_choice = is_all_choice ? 2 : 1; + + prompt = getenv ("PS2"); + if (prompt == NULL) + prompt = "> "; + + args = command_line_input (prompt, annotation_suffix); + + if (args == NULL) + error_no_arg (_("one or more choice numbers")); + + n_chosen = 0; + + /* Set choices[0 .. n_chosen-1] to the users' choices in ascending + order, as given in args. Choices are validated. */ + while (1) + { + char *args2; + int choice, j; + + args = skip_spaces (args); + if (*args == '\0' && n_chosen == 0) + error_no_arg (_("one or more choice numbers")); + else if (*args == '\0') + break; + + choice = strtol (args, &args2, 10); + if (args == args2 || choice < 0 + || choice > n_choices + first_choice - 1) + error (_("Argument must be choice number")); + args = args2; + + if (choice == 0) + error (_("cancelled")); + + if (choice < first_choice) + { + n_chosen = n_choices; + for (j = 0; j < n_choices; j += 1) + choices[j] = j; + break; + } + choice -= first_choice; + + for (j = n_chosen - 1; j >= 0 && choice < choices[j]; j -= 1) + { + } + + if (j < 0 || choice != choices[j]) + { + int k; + + for (k = n_chosen - 1; k > j; k -= 1) + choices[k + 1] = choices[k]; + choices[j + 1] = choice; + n_chosen += 1; + } + } + + if (n_chosen > max_results) + error (_("Select no more than %d of the above"), max_results); + + return n_chosen; +} + +/* Given a list of NSYMS symbols in SYMS, select up to MAX_RESULTS>0 + by asking the user (if necessary), returning the number selected, + and setting the first elements of SYMS items. Error if no symbols + selected. */ + +/* NOTE: Adapted from decode_line_2 in symtab.c, with which it ought + to be re-integrated one of these days. */ + +static int +user_select_syms (struct block_symbol *syms, int nsyms, int max_results) +{ + int i; + int *chosen = XALLOCAVEC (int , nsyms); + int n_chosen; + int first_choice = (max_results == 1) ? 1 : 2; + const char *select_mode = multiple_symbols_select_mode (); + + if (max_results < 1) + error (_("Request to select 0 symbols!")); + if (nsyms <= 1) + return nsyms; + + if (select_mode == multiple_symbols_cancel) + error (_("\ +canceled because the command is ambiguous\n\ +See set/show multiple-symbol.")); + + /* If select_mode is "all", then return all possible symbols. + Only do that if more than one symbol can be selected, of course. + Otherwise, display the menu as usual. */ + if (select_mode == multiple_symbols_all && max_results > 1) + return nsyms; + + printf_filtered (_("[0] cancel\n")); + if (max_results > 1) + printf_filtered (_("[1] all\n")); + + sort_choices (syms, nsyms); + + for (i = 0; i < nsyms; i += 1) + { + if (syms[i].symbol == NULL) + continue; + + if (SYMBOL_CLASS (syms[i].symbol) == LOC_BLOCK) + { + struct symtab_and_line sal = + find_function_start_sal (syms[i].symbol, 1); + + printf_filtered ("[%d] ", i + first_choice); + ada_print_symbol_signature (gdb_stdout, syms[i].symbol, + &type_print_raw_options); + if (sal.symtab == NULL) + printf_filtered (_(" at %p[%p]:%d\n"), + metadata_style.style ().ptr (), nullptr, sal.line); + else + printf_filtered + (_(" at %ps:%d\n"), + styled_string (file_name_style.style (), + symtab_to_filename_for_display (sal.symtab)), + sal.line); + continue; + } + else + { + int is_enumeral = + (SYMBOL_CLASS (syms[i].symbol) == LOC_CONST + && SYMBOL_TYPE (syms[i].symbol) != NULL + && TYPE_CODE (SYMBOL_TYPE (syms[i].symbol)) == TYPE_CODE_ENUM); + struct symtab *symtab = NULL; + + if (SYMBOL_OBJFILE_OWNED (syms[i].symbol)) + symtab = symbol_symtab (syms[i].symbol); + + if (SYMBOL_LINE (syms[i].symbol) != 0 && symtab != NULL) + { + printf_filtered ("[%d] ", i + first_choice); + ada_print_symbol_signature (gdb_stdout, syms[i].symbol, + &type_print_raw_options); + printf_filtered (_(" at %s:%d\n"), + symtab_to_filename_for_display (symtab), + SYMBOL_LINE (syms[i].symbol)); + } + else if (is_enumeral + && TYPE_NAME (SYMBOL_TYPE (syms[i].symbol)) != NULL) + { + printf_filtered (("[%d] "), i + first_choice); + ada_print_type (SYMBOL_TYPE (syms[i].symbol), NULL, + gdb_stdout, -1, 0, &type_print_raw_options); + printf_filtered (_("'(%s) (enumeral)\n"), + SYMBOL_PRINT_NAME (syms[i].symbol)); + } + else + { + printf_filtered ("[%d] ", i + first_choice); + ada_print_symbol_signature (gdb_stdout, syms[i].symbol, + &type_print_raw_options); + + if (symtab != NULL) + printf_filtered (is_enumeral + ? _(" in %s (enumeral)\n") + : _(" at %s:?\n"), + symtab_to_filename_for_display (symtab)); + else + printf_filtered (is_enumeral + ? _(" (enumeral)\n") + : _(" at ?\n")); + } + } + } + + n_chosen = get_selections (chosen, nsyms, max_results, max_results > 1, + "overload-choice"); + + for (i = 0; i < n_chosen; i += 1) + syms[i] = syms[chosen[i]]; + + return n_chosen; +} /* Same as evaluate_type (*EXP), but resolves ambiguous symbol references (marked by OP_VAR_VALUE nodes in which the symbol has an @@ -3711,320 +4031,6 @@ return 0; } -/* Returns true (non-zero) iff decoded name N0 should appear before N1 - in a listing of choices during disambiguation (see sort_choices, below). - The idea is that overloadings of a subprogram name from the - same package should sort in their source order. We settle for ordering - such symbols by their trailing number (__N or $N). */ - -static int -encoded_ordered_before (const char *N0, const char *N1) -{ - if (N1 == NULL) - return 0; - else if (N0 == NULL) - return 1; - else - { - int k0, k1; - - for (k0 = strlen (N0) - 1; k0 > 0 && isdigit (N0[k0]); k0 -= 1) - ; - for (k1 = strlen (N1) - 1; k1 > 0 && isdigit (N1[k1]); k1 -= 1) - ; - if ((N0[k0] == '_' || N0[k0] == '$') && N0[k0 + 1] != '\000' - && (N1[k1] == '_' || N1[k1] == '$') && N1[k1 + 1] != '\000') - { - int n0, n1; - - n0 = k0; - while (N0[n0] == '_' && n0 > 0 && N0[n0 - 1] == '_') - n0 -= 1; - n1 = k1; - while (N1[n1] == '_' && n1 > 0 && N1[n1 - 1] == '_') - n1 -= 1; - if (n0 == n1 && strncmp (N0, N1, n0) == 0) - return (atoi (N0 + k0 + 1) < atoi (N1 + k1 + 1)); - } - return (strcmp (N0, N1) < 0); - } -} - -/* Sort SYMS[0..NSYMS-1] to put the choices in a canonical order by the - encoded names. */ - -static void -sort_choices (struct block_symbol syms[], int nsyms) -{ - int i; - - for (i = 1; i < nsyms; i += 1) - { - struct block_symbol sym = syms[i]; - int j; - - for (j = i - 1; j >= 0; j -= 1) - { - if (encoded_ordered_before (SYMBOL_LINKAGE_NAME (syms[j].symbol), - SYMBOL_LINKAGE_NAME (sym.symbol))) - break; - syms[j + 1] = syms[j]; - } - syms[j + 1] = sym; - } -} - -/* Whether GDB should display formals and return types for functions in the - overloads selection menu. */ -static bool print_signatures = true; - -/* Print the signature for SYM on STREAM according to the FLAGS options. For - all but functions, the signature is just the name of the symbol. For - functions, this is the name of the function, the list of types for formals - and the return type (if any). */ - -static void -ada_print_symbol_signature (struct ui_file *stream, struct symbol *sym, - const struct type_print_options *flags) -{ - struct type *type = SYMBOL_TYPE (sym); - - fprintf_filtered (stream, "%s", SYMBOL_PRINT_NAME (sym)); - if (!print_signatures - || type == NULL - || TYPE_CODE (type) != TYPE_CODE_FUNC) - return; - - if (TYPE_NFIELDS (type) > 0) - { - int i; - - fprintf_filtered (stream, " ("); - for (i = 0; i < TYPE_NFIELDS (type); ++i) - { - if (i > 0) - fprintf_filtered (stream, "; "); - ada_print_type (TYPE_FIELD_TYPE (type, i), NULL, stream, -1, 0, - flags); - } - fprintf_filtered (stream, ")"); - } - if (TYPE_TARGET_TYPE (type) != NULL - && TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID) - { - fprintf_filtered (stream, " return "); - ada_print_type (TYPE_TARGET_TYPE (type), NULL, stream, -1, 0, flags); - } -} - -/* Given a list of NSYMS symbols in SYMS, select up to MAX_RESULTS>0 - by asking the user (if necessary), returning the number selected, - and setting the first elements of SYMS items. Error if no symbols - selected. */ - -/* NOTE: Adapted from decode_line_2 in symtab.c, with which it ought - to be re-integrated one of these days. */ - -int -user_select_syms (struct block_symbol *syms, int nsyms, int max_results) -{ - int i; - int *chosen = XALLOCAVEC (int , nsyms); - int n_chosen; - int first_choice = (max_results == 1) ? 1 : 2; - const char *select_mode = multiple_symbols_select_mode (); - - if (max_results < 1) - error (_("Request to select 0 symbols!")); - if (nsyms <= 1) - return nsyms; - - if (select_mode == multiple_symbols_cancel) - error (_("\ -canceled because the command is ambiguous\n\ -See set/show multiple-symbol.")); - - /* If select_mode is "all", then return all possible symbols. - Only do that if more than one symbol can be selected, of course. - Otherwise, display the menu as usual. */ - if (select_mode == multiple_symbols_all && max_results > 1) - return nsyms; - - printf_filtered (_("[0] cancel\n")); - if (max_results > 1) - printf_filtered (_("[1] all\n")); - - sort_choices (syms, nsyms); - - for (i = 0; i < nsyms; i += 1) - { - if (syms[i].symbol == NULL) - continue; - - if (SYMBOL_CLASS (syms[i].symbol) == LOC_BLOCK) - { - struct symtab_and_line sal = - find_function_start_sal (syms[i].symbol, 1); - - printf_filtered ("[%d] ", i + first_choice); - ada_print_symbol_signature (gdb_stdout, syms[i].symbol, - &type_print_raw_options); - if (sal.symtab == NULL) - printf_filtered (_(" at %p[%p]:%d\n"), - metadata_style.style ().ptr (), nullptr, sal.line); - else - printf_filtered - (_(" at %ps:%d\n"), - styled_string (file_name_style.style (), - symtab_to_filename_for_display (sal.symtab)), - sal.line); - continue; - } - else - { - int is_enumeral = - (SYMBOL_CLASS (syms[i].symbol) == LOC_CONST - && SYMBOL_TYPE (syms[i].symbol) != NULL - && TYPE_CODE (SYMBOL_TYPE (syms[i].symbol)) == TYPE_CODE_ENUM); - struct symtab *symtab = NULL; - - if (SYMBOL_OBJFILE_OWNED (syms[i].symbol)) - symtab = symbol_symtab (syms[i].symbol); - - if (SYMBOL_LINE (syms[i].symbol) != 0 && symtab != NULL) - { - printf_filtered ("[%d] ", i + first_choice); - ada_print_symbol_signature (gdb_stdout, syms[i].symbol, - &type_print_raw_options); - printf_filtered (_(" at %s:%d\n"), - symtab_to_filename_for_display (symtab), - SYMBOL_LINE (syms[i].symbol)); - } - else if (is_enumeral - && TYPE_NAME (SYMBOL_TYPE (syms[i].symbol)) != NULL) - { - printf_filtered (("[%d] "), i + first_choice); - ada_print_type (SYMBOL_TYPE (syms[i].symbol), NULL, - gdb_stdout, -1, 0, &type_print_raw_options); - printf_filtered (_("'(%s) (enumeral)\n"), - SYMBOL_PRINT_NAME (syms[i].symbol)); - } - else - { - printf_filtered ("[%d] ", i + first_choice); - ada_print_symbol_signature (gdb_stdout, syms[i].symbol, - &type_print_raw_options); - - if (symtab != NULL) - printf_filtered (is_enumeral - ? _(" in %s (enumeral)\n") - : _(" at %s:?\n"), - symtab_to_filename_for_display (symtab)); - else - printf_filtered (is_enumeral - ? _(" (enumeral)\n") - : _(" at ?\n")); - } - } - } - - n_chosen = get_selections (chosen, nsyms, max_results, max_results > 1, - "overload-choice"); - - for (i = 0; i < n_chosen; i += 1) - syms[i] = syms[chosen[i]]; - - return n_chosen; -} - -/* Read and validate a set of numeric choices from the user in the - range 0 .. N_CHOICES-1. Place the results in increasing - order in CHOICES[0 .. N-1], and return N. - - The user types choices as a sequence of numbers on one line - separated by blanks, encoding them as follows: - - + A choice of 0 means to cancel the selection, throwing an error. - + If IS_ALL_CHOICE, a choice of 1 selects the entire set 0 .. N_CHOICES-1. - + The user chooses k by typing k+IS_ALL_CHOICE+1. - - The user is not allowed to choose more than MAX_RESULTS values. - - ANNOTATION_SUFFIX, if present, is used to annotate the input - prompts (for use with the -f switch). */ - -int -get_selections (int *choices, int n_choices, int max_results, - int is_all_choice, const char *annotation_suffix) -{ - char *args; - const char *prompt; - int n_chosen; - int first_choice = is_all_choice ? 2 : 1; - - prompt = getenv ("PS2"); - if (prompt == NULL) - prompt = "> "; - - args = command_line_input (prompt, annotation_suffix); - - if (args == NULL) - error_no_arg (_("one or more choice numbers")); - - n_chosen = 0; - - /* Set choices[0 .. n_chosen-1] to the users' choices in ascending - order, as given in args. Choices are validated. */ - while (1) - { - char *args2; - int choice, j; - - args = skip_spaces (args); - if (*args == '\0' && n_chosen == 0) - error_no_arg (_("one or more choice numbers")); - else if (*args == '\0') - break; - - choice = strtol (args, &args2, 10); - if (args == args2 || choice < 0 - || choice > n_choices + first_choice - 1) - error (_("Argument must be choice number")); - args = args2; - - if (choice == 0) - error (_("cancelled")); - - if (choice < first_choice) - { - n_chosen = n_choices; - for (j = 0; j < n_choices; j += 1) - choices[j] = j; - break; - } - choice -= first_choice; - - for (j = n_chosen - 1; j >= 0 && choice < choices[j]; j -= 1) - { - } - - if (j < 0 || choice != choices[j]) - { - int k; - - for (k = n_chosen - 1; k > j; k -= 1) - choices[k + 1] = choices[k]; - choices[j + 1] = choice; - n_chosen += 1; - } - } - - if (n_chosen > max_results) - error (_("Select no more than %d of the above"), max_results); - - return n_chosen; -} - /* Replace the operator of length OPLEN at position PC in *EXPP with a call on the function identified by SYM and BLOCK, and taking NARGS arguments. Update *EXPP as needed to hold more space. */ @@ -4337,6 +4343,131 @@ return val; } +/* Given ARG, a value of type (pointer or reference to a)* + structure/union, extract the component named NAME from the ultimate + target structure/union and return it as a value with its + appropriate type. + + The routine searches for NAME among all members of the structure itself + and (recursively) among all members of any wrapper members + (e.g., '_parent'). + + If NO_ERR, then simply return NULL in case of error, rather than + calling error. */ + +static struct value * +ada_value_struct_elt (struct value *arg, const char *name, int no_err) +{ + struct type *t, *t1; + struct value *v; + int check_tag; + + v = NULL; + t1 = t = ada_check_typedef (value_type (arg)); + if (TYPE_CODE (t) == TYPE_CODE_REF) + { + t1 = TYPE_TARGET_TYPE (t); + if (t1 == NULL) + goto BadValue; + t1 = ada_check_typedef (t1); + if (TYPE_CODE (t1) == TYPE_CODE_PTR) + { + arg = coerce_ref (arg); + t = t1; + } + } + + while (TYPE_CODE (t) == TYPE_CODE_PTR) + { + t1 = TYPE_TARGET_TYPE (t); + if (t1 == NULL) + goto BadValue; + t1 = ada_check_typedef (t1); + if (TYPE_CODE (t1) == TYPE_CODE_PTR) + { + arg = value_ind (arg); + t = t1; + } + else + break; + } + + if (TYPE_CODE (t1) != TYPE_CODE_STRUCT && TYPE_CODE (t1) != TYPE_CODE_UNION) + goto BadValue; + + if (t1 == t) + v = ada_search_struct_field (name, arg, 0, t); + else + { + int bit_offset, bit_size, byte_offset; + struct type *field_type; + CORE_ADDR address; + + if (TYPE_CODE (t) == TYPE_CODE_PTR) + address = value_address (ada_value_ind (arg)); + else + address = value_address (ada_coerce_ref (arg)); + + /* Check to see if this is a tagged type. We also need to handle + the case where the type is a reference to a tagged type, but + we have to be careful to exclude pointers to tagged types. + The latter should be shown as usual (as a pointer), whereas + a reference should mostly be transparent to the user. */ + + if (ada_is_tagged_type (t1, 0) + || (TYPE_CODE (t1) == TYPE_CODE_REF + && ada_is_tagged_type (TYPE_TARGET_TYPE (t1), 0))) + { + /* We first try to find the searched field in the current type. + If not found then let's look in the fixed type. */ + + if (!find_struct_field (name, t1, 0, + &field_type, &byte_offset, &bit_offset, + &bit_size, NULL)) + check_tag = 1; + else + check_tag = 0; + } + else + check_tag = 0; + + /* Convert to fixed type in all cases, so that we have proper + offsets to each field in unconstrained record types. */ + t1 = ada_to_fixed_type (ada_get_base_type (t1), NULL, + address, NULL, check_tag); + + if (find_struct_field (name, t1, 0, + &field_type, &byte_offset, &bit_offset, + &bit_size, NULL)) + { + if (bit_size != 0) + { + if (TYPE_CODE (t) == TYPE_CODE_REF) + arg = ada_coerce_ref (arg); + else + arg = ada_value_ind (arg); + v = ada_value_primitive_packed_val (arg, NULL, byte_offset, + bit_offset, bit_size, + field_type); + } + else + v = value_at_lazy (field_type, address + byte_offset); + } + } + + if (v != NULL || no_err) + return v; + else + error (_("There is no member named %s."), name); + + BadValue: + if (no_err) + return NULL; + else + error (_("Attempt to extract a component of " + "a value that is not a record.")); +} + /* Return the value ACTUAL, converted to be an appropriate value for a formal of type FORMAL_TYPE. Use *SP as a stack pointer for allocating any necessary descriptors (fat pointers), or copies of @@ -6491,7 +6622,7 @@ /* The type of the tag on VAL. */ -struct type * +static struct type * ada_tag_type (struct value *val) { return ada_lookup_struct_elt_type (value_type (val), "_tag", 1, 0); @@ -6508,7 +6639,7 @@ /* The value of the tag on VAL. */ -struct value * +static struct value * ada_value_tag (struct value *val) { return ada_value_struct_elt (val, "_tag", 0); @@ -6860,7 +6991,7 @@ valid field number within it, returns 1 iff field FIELD_NUM of TYPE represents a 'when others' clause; otherwise 0. */ -int +static int ada_is_others_clause (struct type *type, int field_num) { const char *name = TYPE_FIELD_NAME (type, field_num); @@ -6968,7 +7099,7 @@ and FIELD_NUM is a valid field number within it, returns 1 iff VAL is in the range encoded by field FIELD_NUM of TYPE; otherwise 0. */ -int +static int ada_in_variant (LONGEST val, struct type *type, int field_num) { const char *name = TYPE_FIELD_NAME (type, field_num); @@ -7369,131 +7500,6 @@ return NULL; } -/* Given ARG, a value of type (pointer or reference to a)* - structure/union, extract the component named NAME from the ultimate - target structure/union and return it as a value with its - appropriate type. - - The routine searches for NAME among all members of the structure itself - and (recursively) among all members of any wrapper members - (e.g., '_parent'). - - If NO_ERR, then simply return NULL in case of error, rather than - calling error. */ - -struct value * -ada_value_struct_elt (struct value *arg, const char *name, int no_err) -{ - struct type *t, *t1; - struct value *v; - int check_tag; - - v = NULL; - t1 = t = ada_check_typedef (value_type (arg)); - if (TYPE_CODE (t) == TYPE_CODE_REF) - { - t1 = TYPE_TARGET_TYPE (t); - if (t1 == NULL) - goto BadValue; - t1 = ada_check_typedef (t1); - if (TYPE_CODE (t1) == TYPE_CODE_PTR) - { - arg = coerce_ref (arg); - t = t1; - } - } - - while (TYPE_CODE (t) == TYPE_CODE_PTR) - { - t1 = TYPE_TARGET_TYPE (t); - if (t1 == NULL) - goto BadValue; - t1 = ada_check_typedef (t1); - if (TYPE_CODE (t1) == TYPE_CODE_PTR) - { - arg = value_ind (arg); - t = t1; - } - else - break; - } - - if (TYPE_CODE (t1) != TYPE_CODE_STRUCT && TYPE_CODE (t1) != TYPE_CODE_UNION) - goto BadValue; - - if (t1 == t) - v = ada_search_struct_field (name, arg, 0, t); - else - { - int bit_offset, bit_size, byte_offset; - struct type *field_type; - CORE_ADDR address; - - if (TYPE_CODE (t) == TYPE_CODE_PTR) - address = value_address (ada_value_ind (arg)); - else - address = value_address (ada_coerce_ref (arg)); - - /* Check to see if this is a tagged type. We also need to handle - the case where the type is a reference to a tagged type, but - we have to be careful to exclude pointers to tagged types. - The latter should be shown as usual (as a pointer), whereas - a reference should mostly be transparent to the user. */ - - if (ada_is_tagged_type (t1, 0) - || (TYPE_CODE (t1) == TYPE_CODE_REF - && ada_is_tagged_type (TYPE_TARGET_TYPE (t1), 0))) - { - /* We first try to find the searched field in the current type. - If not found then let's look in the fixed type. */ - - if (!find_struct_field (name, t1, 0, - &field_type, &byte_offset, &bit_offset, - &bit_size, NULL)) - check_tag = 1; - else - check_tag = 0; - } - else - check_tag = 0; - - /* Convert to fixed type in all cases, so that we have proper - offsets to each field in unconstrained record types. */ - t1 = ada_to_fixed_type (ada_get_base_type (t1), NULL, - address, NULL, check_tag); - - if (find_struct_field (name, t1, 0, - &field_type, &byte_offset, &bit_offset, - &bit_size, NULL)) - { - if (bit_size != 0) - { - if (TYPE_CODE (t) == TYPE_CODE_REF) - arg = ada_coerce_ref (arg); - else - arg = ada_value_ind (arg); - v = ada_value_primitive_packed_val (arg, NULL, byte_offset, - bit_offset, bit_size, - field_type); - } - else - v = value_at_lazy (field_type, address + byte_offset); - } - } - - if (v != NULL || no_err) - return v; - else - error (_("There is no member named %s."), name); - - BadValue: - if (no_err) - return NULL; - else - error (_("Attempt to extract a component of " - "a value that is not a record.")); -} - /* Return a string representation of type TYPE. */ static std::string @@ -9145,7 +9151,7 @@ 0 }; -const char * +static const char * ada_attribute_name (enum exp_opcode n) { if (n >= OP_ATR_FIRST && n <= (int) OP_ATR_VAL) diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index b68dd4e..13a917a 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -149,14 +149,6 @@ int base_cpu; }; -/* Assuming V points to an array of S objects, make sure that it contains at - least M objects, updating V and S as necessary. */ - -#define GROW_VECT(v, s, m) \ - if ((s) < (m)) (v) = (char *) grow_vect (v, &(s), m, sizeof *(v)); - -extern void *grow_vect (void *, size_t *, size_t, int); - extern void ada_ensure_varsize_limit (const struct type *type); extern int ada_get_field_index (const struct type *type, @@ -204,8 +196,6 @@ extern int ada_array_arity (struct type *); -struct type *ada_type_of_array (struct value *, int); - extern struct value *ada_coerce_to_simple_array_ptr (struct value *); struct value *ada_coerce_to_simple_array (struct value *); @@ -228,14 +218,10 @@ extern std::string ada_decode (const char*); -extern enum language ada_update_initial_language (enum language); - extern int ada_lookup_symbol_list (const char *, const struct block *, domain_enum, std::vector *); -extern char *ada_fold_name (const char *); - extern struct block_symbol ada_lookup_symbol (const char *, const struct block *, domain_enum); @@ -246,12 +232,6 @@ extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *); -extern void ada_fill_in_ada_prototype (struct symbol *); - -extern int user_select_syms (struct block_symbol *, int, int); - -extern int get_selections (int *, int, int, int, const char *); - extern int ada_scan_number (const char *, int, LONGEST *, int *); extern struct type *ada_parent_type (struct type *); @@ -275,10 +255,6 @@ extern int ada_is_tag_type (struct type *); -extern struct type *ada_tag_type (struct value *); - -extern struct value *ada_value_tag (struct value *); - extern const char *ada_tag_name (struct value *); extern struct value *ada_tag_value_at_base_address (struct value *obj); @@ -291,14 +267,8 @@ extern struct type *ada_variant_discrim_type (struct type *, struct type *); -extern int ada_is_others_clause (struct type *, int); - -extern int ada_in_variant (LONGEST, struct type *, int); - extern const char *ada_variant_discrim_name (struct type *); -extern struct value *ada_value_struct_elt (struct value *, const char *, int); - extern int ada_is_aligner_type (struct type *); extern struct type *ada_aligned_type (struct type *); @@ -306,8 +276,6 @@ extern const gdb_byte *ada_aligned_value_addr (struct type *, const gdb_byte *); -extern const char *ada_attribute_name (enum exp_opcode); - extern int ada_is_fixed_point_type (struct type *); extern int ada_is_system_address_type (struct type *); @@ -316,8 +284,6 @@ extern struct value *ada_scaling_factor (struct type *); -extern struct type *ada_system_address_type (void); - extern int ada_which_variant_applies (struct type *, struct type *, const gdb_byte *);