X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fmacroscope.c;h=93f561acccd8b7a5e97afc3b555b44f93edbb03b;hb=e05523bd2411bac0277da73556f4d01f6c7448aa;hp=a23cac4f7e31b631493a08c1aa18cbff1548bf3c;hpb=0b30217134add051e159a192066a1e568ebd837f;p=binutils-gdb.git diff --git a/gdb/macroscope.c b/gdb/macroscope.c index a23cac4f7e3..93f561acccd 100644 --- a/gdb/macroscope.c +++ b/gdb/macroscope.c @@ -1,5 +1,5 @@ /* Functions for deciding which macros are currently in scope. - Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2022 Free Software Foundation, Inc. Contributed by Red Hat, Inc. This file is part of GDB. @@ -35,19 +35,22 @@ struct macro_table *macro_user_macros; -struct macro_scope * +gdb::unique_xmalloc_ptr sal_macro_scope (struct symtab_and_line sal) { struct macro_source_file *main_file, *inclusion; - struct macro_scope *ms; + struct compunit_symtab *cust; - if (! sal.symtab - || ! sal.symtab->macro_table) - return 0; + if (sal.symtab == NULL) + return NULL; - ms = (struct macro_scope *) xmalloc (sizeof (*ms)); + cust = sal.symtab->compunit (); + if (cust->macro_table () == NULL) + return NULL; - main_file = macro_main (sal.symtab->macro_table); + gdb::unique_xmalloc_ptr ms (XNEW (struct macro_scope)); + + main_file = macro_main (cust->macro_table ()); inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename); if (inclusion) @@ -58,48 +61,45 @@ sal_macro_scope (struct symtab_and_line sal) else { /* There are, unfortunately, cases where a compilation unit can - have a symtab for a source file that doesn't appear in the - macro table. For example, at the moment, Dwarf doesn't have - any way in the .debug_macinfo section to describe the effect - of #line directives, so if you debug a YACC parser you'll get - a macro table which only mentions the .c files generated by - YACC, but symtabs that mention the .y files consumed by YACC. - - In the long run, we should extend the Dwarf macro info - representation to handle #line directives, and get GCC to - emit it. - - For the time being, though, we'll just treat these as - occurring at the end of the main source file. */ + have a symtab for a source file that doesn't appear in the + macro table. For example, at the moment, Dwarf doesn't have + any way in the .debug_macinfo section to describe the effect + of #line directives, so if you debug a YACC parser you'll get + a macro table which only mentions the .c files generated by + YACC, but symtabs that mention the .y files consumed by YACC. + + In the long run, we should extend the Dwarf macro info + representation to handle #line directives, and get GCC to + emit it. + + For the time being, though, we'll just treat these as + occurring at the end of the main source file. */ ms->file = main_file; ms->line = -1; - complaint (&symfile_complaints, - _("symtab found for `%s', but that file\n" - "is not covered in the compilation unit's macro information"), - sal.symtab->filename); + complaint (_("symtab found for `%s', but that file\n" + "is not covered in the compilation unit's macro information"), + symtab_to_filename_for_display (sal.symtab)); } return ms; } -struct macro_scope * +gdb::unique_xmalloc_ptr user_macro_scope (void) { - struct macro_scope *ms; - - ms = XNEW (struct macro_scope); + gdb::unique_xmalloc_ptr ms (XNEW (struct macro_scope)); ms->file = macro_main (macro_user_macros); ms->line = -1; return ms; } -struct macro_scope * +gdb::unique_xmalloc_ptr default_macro_scope (void) { struct symtab_and_line sal; - struct macro_scope *ms; + gdb::unique_xmalloc_ptr ms; struct frame_info *frame; CORE_ADDR pc; @@ -112,18 +112,18 @@ default_macro_scope (void) else { /* Don't call select_source_symtab here. That can raise an - error if symbols aren't loaded, but GDB calls the expression - evaluator in all sorts of contexts. - - For example, commands like `set width' call the expression - evaluator to evaluate their numeric arguments. If the - current language is C, then that may call this function to - choose a scope for macro expansion. If you don't have any - symbol files loaded, then get_current_or_default would raise an - error. But `set width' shouldn't raise an error just because - it can't decide which scope to macro-expand its argument in. */ - struct symtab_and_line cursal = - get_current_source_symtab_and_line (); + error if symbols aren't loaded, but GDB calls the expression + evaluator in all sorts of contexts. + + For example, commands like `set width' call the expression + evaluator to evaluate their numeric arguments. If the + current language is C, then that may call this function to + choose a scope for macro expansion. If you don't have any + symbol files loaded, then get_current_or_default would raise an + error. But `set width' shouldn't raise an error just because + it can't decide which scope to macro-expand its argument in. */ + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); sal.symtab = cursal.symtab; sal.line = cursal.line; @@ -141,25 +141,23 @@ default_macro_scope (void) location given by BATON, which must be a pointer to a `struct macro_scope' structure. */ struct macro_definition * -standard_macro_lookup (const char *name, void *baton) +standard_macro_lookup (const char *name, const macro_scope &ms) { - struct macro_scope *ms = (struct macro_scope *) baton; - struct macro_definition *result; - /* Give user-defined macros priority over all others. */ - result = macro_lookup_definition (macro_main (macro_user_macros), -1, name); - if (! result) - result = macro_lookup_definition (ms->file, ms->line, name); + macro_definition *result + = macro_lookup_definition (macro_main (macro_user_macros), -1, name); + + if (result == nullptr) + result = macro_lookup_definition (ms.file, ms.line, name); + return result; } -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_macroscope; - +void _initialize_macroscope (); void -_initialize_macroscope (void) +_initialize_macroscope () { - macro_user_macros = new_macro_table (0, 0); + macro_user_macros = new_macro_table (NULL, NULL, NULL); macro_set_main (macro_user_macros, ""); macro_allow_redefinitions (macro_user_macros); }