From 6395b62847e581acc3e8fa179444b824d17b3d68 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 6 Feb 2022 22:41:58 -0500 Subject: gdb: remove BLOCK_ENTRY_PC macro Replace with equivalent method. Change-Id: I0e033095e7358799930775e61028b48246971a7d --- gdb/compile/compile-c-symbols.c | 4 ++-- gdb/compile/compile-object-run.c | 2 +- gdb/compile/compile.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/compile') diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c index 4c30ae9..e1f94ec 100644 --- a/gdb/compile/compile-c-symbols.c +++ b/gdb/compile/compile-c-symbols.c @@ -93,7 +93,7 @@ convert_one_symbol (compile_c_instance *context, case LOC_BLOCK: kind = GCC_C_SYMBOL_FUNCTION; - addr = BLOCK_ENTRY_PC (sym.symbol->value_block ()); + addr = sym.symbol->value_block ()->entry_pc (); if (is_global && sym.symbol->type ()->is_gnu_ifunc ()) addr = gnu_ifunc_resolve_addr (target_gdbarch (), addr); break; @@ -404,7 +404,7 @@ gcc_symbol_address (void *datum, struct gcc_c_context *gcc_context, gdb_printf (gdb_stdlog, "gcc_symbol_address \"%s\": full symbol\n", identifier); - result = BLOCK_ENTRY_PC (sym->value_block ()); + result = sym->value_block ()->entry_pc (); if (sym->type ()->is_gnu_ifunc ()) result = gnu_ifunc_resolve_addr (target_gdbarch (), result); found = 1; diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c index d5742a5..331ae35 100644 --- a/gdb/compile/compile-object-run.c +++ b/gdb/compile/compile-object-run.c @@ -145,7 +145,7 @@ compile_object_run (compile_module_up &&module) gdb_assert (func_type->code () == TYPE_CODE_FUNC); func_val = value_from_pointer (lookup_pointer_type (func_type), - BLOCK_ENTRY_PC (func_sym->value_block ())); + func_sym->value_block ()->entry_pc ()); vargs = XALLOCAVEC (struct value *, func_type->num_fields ()); if (func_type->num_fields () >= 1) diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c index 5cbb341..1c3a618 100644 --- a/gdb/compile/compile.c +++ b/gdb/compile/compile.c @@ -487,10 +487,10 @@ get_expr_block_and_pc (CORE_ADDR *pc) block = BLOCKVECTOR_BLOCK (cursal.symtab->compunit ()->blockvector (), STATIC_BLOCK); if (block != NULL) - *pc = BLOCK_ENTRY_PC (block); + *pc = block->entry_pc (); } else - *pc = BLOCK_ENTRY_PC (block); + *pc = block->entry_pc (); return block; } -- cgit v1.1