mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-23 13:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: remove SYMBOL_LINE macro

Browse Source 
Add a getter and a setter for a symbol's line.  Remove the corresponding macro
and adjust all callers.

Change-Id: I229f2b8fcf938c07975f641361313a8761fad9a5
This commit is contained in:
Simon Marchi 2022-01-27 22:39:50 -05:00
parent 5f9c5a63ce
commit 5d0027b9ba
13 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ada-lang.c
View File

@ -3355,14 +3355,14 @@ See set/show multiple-symbol."));
if (syms[i].symbol->is_objfile_owned ())
symtab = symbol_symtab (syms[i].symbol);
if (SYMBOL_LINE (syms[i].symbol) != 0 && symtab != NULL)
if (syms[i].symbol->line () != 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));
syms[i].symbol->line ());
}
else if (is_enumeral
&& syms[i].symbol->type ()->name () != NULL)

2
gdb/compile/compile-c-symbols.c
View File

@ -58,7 +58,7 @@ convert_one_symbol (compile_c_instance *context,
{
gcc_type sym_type;
const char *filename = symbol_symtab (sym.symbol)->filename;
unsigned short line = SYMBOL_LINE (sym.symbol);
unsigned short line = sym.symbol->line ();
context->error_symbol_once (sym.symbol);

2
gdb/compile/compile-cplus-symbols.c
View File

@ -49,7 +49,7 @@ convert_one_symbol (compile_cplus_instance *instance,
/* Squash compiler warning. */
gcc_type sym_type = 0;
const char *filename = symbol_symtab (sym.symbol)->filename;
unsigned short line = SYMBOL_LINE (sym.symbol);
unsigned short line = sym.symbol->line ();
instance->error_symbol_once (sym.symbol);

4
gdb/compile/compile-cplus-types.c
View File

@ -626,7 +626,7 @@ compile_cplus_convert_struct_or_union_members
continue;
}
const char *filename = symbol_symtab (sym.symbol)->filename;
unsigned int line = SYMBOL_LINE (sym.symbol);
unsigned int line = sym.symbol->line ();
physaddr = SYMBOL_VALUE_ADDRESS (sym.symbol);
instance->plugin ().build_decl
@ -765,7 +765,7 @@ compile_cplus_convert_struct_or_union_methods (compile_cplus_instance *instance,
}
const char *filename = symbol_symtab (sym.symbol)->filename;
unsigned int line = SYMBOL_LINE (sym.symbol);
unsigned int line = sym.symbol->line ();
CORE_ADDR address = BLOCK_START (SYMBOL_BLOCK_VALUE (sym.symbol));
const char *kind;

2
gdb/dwarf2/read.c
View File

@ -21727,7 +21727,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
inlined_func ? DW_AT_call_line : DW_AT_decl_line,
cu);
if (attr != nullptr)
SYMBOL_LINE (sym) = attr->constant_value (0);
sym->set_line (attr->constant_value (0));
attr = dwarf2_attr (die,
inlined_func ? DW_AT_call_file : DW_AT_decl_file,

4
gdb/frame.c
View File

@ -2699,10 +2699,10 @@ find_frame_sal (frame_info *frame)
gdb_assert (sym);
symtab_and_line sal;
if (SYMBOL_LINE (sym) != 0)
if (sym->line () != 0)
{
sal.symtab = symbol_symtab (sym);
sal.line = SYMBOL_LINE (sym);
sal.line = sym->line ();
}
else
/* If the symbol does not have a location, we don't know where

2
gdb/guile/scm-symbol.c
View File

@ -510,7 +510,7 @@ gdbscm_symbol_line (SCM self)
= syscm_get_valid_symbol_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME);
const struct symbol *symbol = s_smob->symbol;
return scm_from_int (SYMBOL_LINE (symbol));
return scm_from_int (symbol->line ());
}
/* (symbol-value <gdb:symbol> [#:frame <gdb:frame>]) -> <gdb:value>

6
gdb/linespec.c
View File

@ -4451,7 +4451,7 @@ symbol_to_sal (struct symtab_and_line *result,
*result = {};
result->symtab = symbol_symtab (sym);
result->symbol = sym;
result->line = SYMBOL_LINE (sym);
result->line = sym->line ();
result->pc = SYMBOL_VALUE_ADDRESS (sym);
result->pspace = result->symtab->pspace ();
result->explicit_pc = 1;
@ -4461,13 +4461,13 @@ symbol_to_sal (struct symtab_and_line *result,
{
/* Nothing. */
}
else if (SYMBOL_LINE (sym) != 0)
else if (sym->line () != 0)
{
/* We know its line number. */
*result = {};
result->symtab = symbol_symtab (sym);
result->symbol = sym;
result->line = SYMBOL_LINE (sym);
result->line = sym->line ();
result->pc = SYMBOL_VALUE_ADDRESS (sym);
result->pspace = result->symtab->pspace ();
return 1;

4
gdb/mi/mi-symbol-cmds.c
View File

@ -74,8 +74,8 @@ output_debug_symbol (ui_out *uiout, enum search_domain kind,
{
ui_out_emit_tuple tuple_emitter (uiout, NULL);
if (SYMBOL_LINE (sym) != 0)
uiout->field_unsigned ("line", SYMBOL_LINE (sym));
if (sym->line () != 0)
uiout->field_unsigned ("line", sym->line ());
uiout->field_string ("name", sym->print_name ());
if (kind == FUNCTIONS_DOMAIN || kind == VARIABLES_DOMAIN)

2
gdb/python/py-symbol.c
View File

@ -221,7 +221,7 @@ sympy_line (PyObject *self, void *closure)
SYMPY_REQUIRE_VALID (self, symbol);
return gdb_py_object_from_longest (SYMBOL_LINE (symbol)).release ();
return gdb_py_object_from_longest (symbol->line ()).release ();
}
/* Implementation of gdb.Symbol.is_valid (self) -> Boolean.

4
gdb/stabsread.c
View File

@ -693,11 +693,11 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type,
{
/* GCC 2.x puts the line number in desc. SunOS apparently puts in the
number of bytes occupied by a type or object, which we ignore. */
SYMBOL_LINE (sym) = desc;
sym->set_line (desc);
}
else
{
SYMBOL_LINE (sym) = 0; /* unknown */
sym->set_line (0); /* unknown */
}
sym->set_language (get_current_subfile ()->language,

10
gdb/symtab.c
View File

@ -3987,9 +3987,9 @@ skip_prologue_sal (struct symtab_and_line *sal)
b = BLOCK_SUPERBLOCK (b);
}
if (function_block != NULL
&& SYMBOL_LINE (BLOCK_FUNCTION (function_block)) != 0)
&& BLOCK_FUNCTION (function_block)->line () != 0)
{
sal->line = SYMBOL_LINE (BLOCK_FUNCTION (function_block));
sal->line = BLOCK_FUNCTION (function_block)->line ();
sal->symtab = symbol_symtab (BLOCK_FUNCTION (function_block));
}
}
@ -4850,7 +4850,7 @@ global_symbol_searcher::add_matching_symbols
&& sym->domain () != MODULE_DOMAIN)
|| (kind == MODULES_DOMAIN
&& sym->domain () == MODULE_DOMAIN
&& SYMBOL_LINE (sym) != 0))))
&& sym->line () != 0))))
{
if (result_set->size () < m_max_search_results)
{
@ -5098,8 +5098,8 @@ print_symbol_info (enum search_domain kind,
s_filename));
}
if (SYMBOL_LINE (sym) != 0)
printf_filtered ("%d:\t", SYMBOL_LINE (sym));
if (sym->line () != 0)
printf_filtered ("%d:\t", sym->line ());
else
puts_filtered ("\t");
}

13
gdb/symtab.h
View File

@ -1213,6 +1213,16 @@ struct symbol : public general_symbol_info, public allocate_on_obstack
m_type = type;
}
unsigned short line () const
{
return m_line;
}
void set_line (unsigned short line)
{
m_line = line;
}
/* Data type of value */
struct type *m_type = nullptr;
@ -1280,7 +1290,7 @@ struct symbol : public general_symbol_info, public allocate_on_obstack
to debug files longer than 64K lines? What about machine
generated programs? */
unsigned short line = 0;
unsigned short m_line = 0;
/* An arbitrary data pointer, allowing symbol readers to record
additional information on a per-symbol basis. Note that this data
@ -1315,7 +1325,6 @@ struct block_symbol
/* Note: There is no accessor macro for symbol.owner because it is
"private". */
#define SYMBOL_LINE(symbol) (symbol)->line
#define SYMBOL_COMPUTED_OPS(symbol) ((symbol)->impl ().ops_computed)
#define SYMBOL_BLOCK_OPS(symbol) ((symbol)->impl ().ops_block)
#define SYMBOL_REGISTER_OPS(symbol) ((symbol)->impl ().ops_register)