From cc16e6c91580e68369250f5a65c6e01559cdd467 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 15 Apr 2013 18:13:01 +0000 Subject: PR c++/13588: * NEWS: Update. * break-catch-throw.c (struct exception_catchpoint) : New fields. (fetch_probe_arguments, dtor_exception_catchpoint) (check_status_exception_catchpoint) (print_one_detail_exception_catchpoint): New functions. (handle_gnu_v3_exceptions): Add "except_rx" argument. Compile regular expression if needed. (extract_exception_regexp): New function. (catch_exception_command_1): Use extract_exception_regexp. (compute_exception): Use fetch_probe_arguments. (initialize_throw_catchpoint_ops): Set dtor, print_one_detail, and check_status fields. * cp-abi.c (cplus_typename_from_type_info): New function. * cp-abi.h (cplus_typename_from_type_info): Declare. (struct cp_abi_ops) : New field. * gdb_regex.h (compile_rx_or_error): Declare. * gnu-v3-abi.c (gnuv3_get_typename_from_type_info): Update comment. (init_gnuv3_ops): Set get_type_from_type_info field. * probe.c (compile_rx_or_error): Move... * utils.c (compile_rx_or_error): ... here. gdb/doc * gdb.texinfo (Set Catchpoints): Document regexp syntax for exception catchpoints. gdb/testsuite * gdb.cp/exceptprint.exp: Add regexp catchpoint tests. --- gdb/probe.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gdb/probe.c') diff --git a/gdb/probe.c b/gdb/probe.c index dfb6e7e..05bdd1b 100644 --- a/gdb/probe.c +++ b/gdb/probe.c @@ -229,30 +229,6 @@ find_probe_by_pc (CORE_ADDR pc) -/* A helper function for collect_probes that compiles a regexp and - throws an exception on error. This installs a cleanup to free the - resulting pattern on success. If RX is NULL, this does nothing. */ - -static void -compile_rx_or_error (regex_t *pattern, const char *rx, const char *message) -{ - int code; - - if (!rx) - return; - - code = regcomp (pattern, rx, REG_NOSUB); - if (code == 0) - make_regfree_cleanup (pattern); - else - { - char *err = get_regcomp_error (code, pattern); - - make_cleanup (xfree, err); - error (("%s: %s"), message, err); - } -} - /* Make a vector of probes matching OBJNAME, PROVIDER, and PROBE_NAME. If POPS is not NULL, only probes of this certain probe_ops will match. Each argument is a regexp, or NULL, which matches anything. */ -- cgit v1.1