mi/mi-cmd-stack.c|frame filters: print_values <-> ext_lang_frame_args

The enums are value compatible by design, but building in C++ mode trips
on them, like:

  ...
  gdb/mi/mi-cmd-stack.c:363:34: error: cannot convert ‘print_values’ to ‘ext_lang_frame_args’ for argument ‘3’ to ‘ext_lang_bt_status apply_ext_lang_frame_filter(frame_info*, int, ext_lang_frame_args, ui_out*, int, int)’
  ...

Fix this by adding a helper function.

gdb/ChangeLog:
2015-02-27  Pedro Alves  <palves@redhat.com>

	* mi/mi-cmd-stack.c (mi_apply_ext_lang_frame_filter): New
	function.
	(mi_cmd_stack_list_locals, mi_cmd_stack_list_args)
	(mi_cmd_stack_list_variables): Use it.
This commit is contained in:
Pedro Alves 2014-10-22 05:09:07 +01:00
parent 4180215b9d
commit 10367c7c94
2 changed files with 31 additions and 7 deletions

View file

@ -1,3 +1,10 @@
2015-02-27 Pedro Alves <palves@redhat.com>
* mi/mi-cmd-stack.c (mi_apply_ext_lang_frame_filter): New
function.
(mi_cmd_stack_list_locals, mi_cmd_stack_list_args)
(mi_cmd_stack_list_variables): Use it.
2015-02-27 Pedro Alves <palves@redhat.com>
* x86-linux-nat.c (u_debugreg_offset): New function.

View file

@ -53,6 +53,22 @@ mi_cmd_enable_frame_filters (char *command, char **argv, int argc)
frame_filters = 1;
}
/* Like apply_ext_lang_frame_filter, but take a print_values */
static enum ext_lang_bt_status
mi_apply_ext_lang_frame_filter (struct frame_info *frame, int flags,
enum print_values print_values,
struct ui_out *out,
int frame_low, int frame_high)
{
/* ext_lang_frame_args's MI options are compatible with MI print
values. */
return apply_ext_lang_frame_filter (frame, flags,
(enum ext_lang_frame_args) print_values,
out,
frame_low, frame_high);
}
/* Print a list of the stack frames. Args can be none, in which case
we want to print the whole backtrace, or a pair of numbers
specifying the frame numbers at which to start and stop the
@ -252,8 +268,8 @@ mi_cmd_stack_list_locals (char *command, char **argv, int argc)
{
int flags = PRINT_LEVEL | PRINT_LOCALS;
result = apply_ext_lang_frame_filter (frame, flags, print_value,
current_uiout, 0, 0);
result = mi_apply_ext_lang_frame_filter (frame, flags, print_value,
current_uiout, 0, 0);
}
/* Run the inbuilt backtrace if there are no filters registered, or
@ -358,9 +374,9 @@ mi_cmd_stack_list_args (char *command, char **argv, int argc)
if (py_frame_low == -1)
py_frame_low++;
result = apply_ext_lang_frame_filter (get_current_frame (), flags,
print_values, current_uiout,
py_frame_low, frame_high);
result = mi_apply_ext_lang_frame_filter (get_current_frame (), flags,
print_values, current_uiout,
py_frame_low, frame_high);
}
/* Run the inbuilt backtrace if there are no filters registered, or
@ -448,8 +464,9 @@ mi_cmd_stack_list_variables (char *command, char **argv, int argc)
{
int flags = PRINT_LEVEL | PRINT_ARGS | PRINT_LOCALS;
result = apply_ext_lang_frame_filter (frame, flags, print_value,
current_uiout, 0, 0);
result = mi_apply_ext_lang_frame_filter (frame, flags,
print_value,
current_uiout, 0, 0);
}
/* Run the inbuilt backtrace if there are no filters registered, or