Re: [PATCH v4 03/13] gdb: Add get_main_func_start_pc to refactor frame.c:inside_main_func.

[Thiago Jung Bauermann <thiago.bauermann@linaro.org>]

Christina Schimpe <christina.schimpe@intel.com> writes:

> Refactor frame.c:inside_main_func to use the new function
> get_main_func_start_pc, which will be called in a following commmit.
> ---
>  gdb/frame.c | 37 +++++++++++++++++++++++++------------
>  gdb/frame.h |  6 ++++++
>  2 files changed, 31 insertions(+), 12 deletions(-)
>
> diff --git a/gdb/frame.c b/gdb/frame.c
> index cefdde5ed1e..a9f2675ce3a 100644
> --- a/gdb/frame.c
> +++ b/gdb/frame.c
> @@ -2641,27 +2641,26 @@ frame_debug_got_null_frame (const frame_info_ptr &this_frame,
>      }
>  }
>  
> -/* Is this (non-sentinel) frame in the "main"() function?  */
> +/* See frame.h.  */
>  
> -static bool
> -inside_main_func (const frame_info_ptr &this_frame)
> +std::optional<CORE_ADDR>
> +get_main_func_start_pc (gdbarch* gdbarch, const language lang)

The nittest of nits: GDB style is to put the '*' with the variable, not
the type.

Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>


>  {
>    if (current_program_space->symfile_object_file == nullptr)
> -    return false;
> +    return {};
>  
> -  CORE_ADDR sym_addr = 0;
>    const char *name = main_name ();
>    bound_minimal_symbol msymbol
>      = lookup_minimal_symbol (current_program_space, name,
>  			     current_program_space->symfile_object_file);
>  
> +  CORE_ADDR sym_addr = 0;
>    if (msymbol.minsym != nullptr)
>      sym_addr = msymbol.value_address ();
>  
>    /* Favor a full symbol in Fortran, for the case where the Fortran main
>       is also called "main".  */
> -  if (msymbol.minsym == nullptr
> -      || get_frame_language (this_frame) == language_fortran)
> +  if (msymbol.minsym == nullptr || lang == language_fortran)
>      {
>        /* In some language (for example Fortran) there will be no minimal
>  	 symbol with the name of the main function.  In this case we should

-- 
Thiago
(he/him)