aboutsummaryrefslogtreecommitdiff
path: root/gdb/make-target-delegates
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2017-12-03 12:50:43 -0500
committerSimon Marchi <simon.marchi@polymtl.ca>2017-12-03 12:50:43 -0500
commit10f64178412d9c6e4f2faade0da271ab8be273c9 (patch)
treee75f837815c06fd77ded2af537afe44b86c7833d /gdb/make-target-delegates
parentf0fb2488c93c00fa1436a4813a375faa00a94de5 (diff)
downloadfsf-binutils-gdb-10f64178412d9c6e4f2faade0da271ab8be273c9.zip
fsf-binutils-gdb-10f64178412d9c6e4f2faade0da271ab8be273c9.tar.gz
fsf-binutils-gdb-10f64178412d9c6e4f2faade0da271ab8be273c9.tar.bz2
Make make-target-delegates grok namespace scope op and template params
The next patch will want to use gdb::array_view<int> as parameter type of a target_ops method. However, that runs into a make-target-delegates limitation: target_debug_foo calls in target-delegates.c for parameters/return types with namespace scope operators ("::") or template parameters, end up looking like: @@ -1313,9 +1313,7 @@ debug_set_syscall_catchpoint (struct target_ops *self, int arg1, int arg2, int a fputs_unfiltered (", ", gdb_stdlog); target_debug_print_int (arg3); fputs_unfiltered (", ", gdb_stdlog); - target_debug_print_int (arg4); - fputs_unfiltered (", ", gdb_stdlog); - target_debug_print_int_p (arg5); + target_debug_print_gdb::array_view<const_int> (arg4); which obviously isn't something that compiles. The problem is that make-target-delegates wasn't ever taught that '::', '<', and '>' can appear in parameter/return types. You could work around it by hidding the unsupported characters behind a typedef in the target method declaration, or by using an explicit TARGET_DEBUG_PRINTER, but it's better to just remove the limitation. While at it, also fix an "abuse" of reserved identifiers. gdb/ChangeLog: * make-target-delegates (munge_type): Also munge '<', '>', and ':'. Avoid double underscores in identifiers, and trailing underscores. * target-debug.h (target_debug_print_VEC_static_tracepoint_marker_p__p): Rename to ... (target_debug_print_VEC_static_tracepoint_marker_p_p): ... this. * target-delegates.c: Regenerate.
Diffstat (limited to 'gdb/make-target-delegates')
-rwxr-xr-xgdb/make-target-delegates12
1 files changed, 11 insertions, 1 deletions
diff --git a/gdb/make-target-delegates b/gdb/make-target-delegates
index fd51c64..1773232 100755
--- a/gdb/make-target-delegates
+++ b/gdb/make-target-delegates
@@ -232,8 +232,18 @@ sub munge_type($) {
$result = $1;
} else {
($result = $typename) =~ s/\s+$//;
- $result =~ s/[ ()]/_/g;
+ $result =~ s/[ ()<>:]/_/g;
$result =~ s/[*]/p/g;
+
+ # Identifers with double underscores are reserved to the C++
+ # implementation.
+ $result =~ s/_+/_/g;
+
+ # Avoid ending the function name with underscore, for
+ # cosmetics. Trailing underscores appear after munging types
+ # with template parameters, like e.g. "foo<int>".
+ $result =~ s/_$//g;
+
$result = 'target_debug_print_' . $result;
}