This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] mi/mi-cmd-stack.c|frame filters: print_values <-> ext_lang_frame_args
- From: Pedro Alves <palves at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 27 Feb 2015 17:49:35 -0000
- Subject: [binutils-gdb] mi/mi-cmd-stack.c|frame filters: print_values <-> ext_lang_frame_args
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=10367c7c946a123597cbc5efaa44c18912e5e43a
commit 10367c7c946a123597cbc5efaa44c18912e5e43a
Author: Pedro Alves <palves@redhat.com>
Date: Wed Oct 22 05:09:07 2014 +0100
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.
Diff:
---
gdb/ChangeLog | 7 +++++++
gdb/mi/mi-cmd-stack.c | 31 ++++++++++++++++++++++++-------
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd43e5a..12878f5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
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.
(x86_linux_dr_get, x86_linux_dr_set): Use it.
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 2cbb9bf..18a357e 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -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