Re: [PATCH 2/2 ver 3] PowerPC, fix support for printing the function return value for non-trivial values.

[Lancelot SIX via Gdb-patches <gdb-patches@sourceware.org>]

Hi Carl,

Thanks for the fix.

> diff --git a/gdb/infcmd.c b/gdb/infcmd.c
> index b71dc10370b..a72df2d6a01 100644
> --- a/gdb/infcmd.c
> +++ b/gdb/infcmd.c
> @@ -1877,26 +1877,28 @@ finish_command (const char *arg, int from_tty)
>    /* Find the function we will return from.  */
>    frame_info_ptr callee_frame = get_selected_frame (NULL);
>    sm->function = find_pc_function (get_frame_pc (callee_frame));
> +  sm->return_buf = 0;    /* Initialize buffer address is not available.  */
>  
>    /* Determine the return convention.  If it is RETURN_VALUE_STRUCT_CONVENTION,
>       attempt to determine the address of the return buffer.  */
> -  enum return_value_convention return_value;
> -  struct gdbarch *gdbarch = get_frame_arch (callee_frame);
> +  if (sm->function != NULL)

I know that Ulrich has already approved the patch, but to follow the
coding standard the NULL should be replaced by nullptr.  If this is not
too much trouble and is OK with maintainers, I think it would be nice to
do this minor tweak.

> +    {
> +      enum return_value_convention return_value;
> +      struct gdbarch *gdbarch = get_frame_arch (callee_frame);
>  
> -  struct type * val_type
> -    = check_typedef (sm->function->type ()->target_type ());
> +      struct type * val_type
> +	= check_typedef (sm->function->type ()->target_type ());
>  
> -  return_value = gdbarch_return_value (gdbarch,
> -				       read_var_value (sm->function, NULL,
> -						       callee_frame),
> -				       val_type, NULL, NULL, NULL);
> +      return_value = gdbarch_return_value (gdbarch,
> +					   read_var_value (sm->function, NULL,
> +							   callee_frame),
> +					   val_type, NULL, NULL, NULL);

While at it, those NULL could probably be updated I guess.

Best,
Lancelot.

>  
> -  if (return_value == RETURN_VALUE_STRUCT_CONVENTION
> -      && val_type->code () != TYPE_CODE_VOID)
> -    sm->return_buf = gdbarch_get_return_buf_addr (gdbarch, val_type,
> -						  callee_frame);
> -  else
> -    sm->return_buf = 0;
> +      if (return_value == RETURN_VALUE_STRUCT_CONVENTION
> +	  && val_type->code () != TYPE_CODE_VOID)
> +	sm->return_buf = gdbarch_get_return_buf_addr (gdbarch, val_type,
> +						      callee_frame);
> +    }
>  
>    /* Print info on the selected frame, including level number but not
>       source.  */
> -- 
> 2.31.1
> 
>