@@ -5189,8 +5189,11 @@ bpstat_check_watchpoint (bpstat bs)
= xstrprintf ("Error evaluating expression for watchpoint %d\n",
b->number);
struct cleanup *cleanups = make_cleanup (xfree, message);
- int e = catch_errors (watchpoint_check, bs, message,
- RETURN_MASK_ALL);
+ int e = catch_errors ([&] ()
+ {
+ return watchpoint_check (bs);
+ },
+ message, RETURN_MASK_ALL);
do_cleanups (cleanups);
switch (e)
{
@@ -5421,7 +5424,10 @@ bpstat_check_breakpoint_conditions (bpstat bs, ptid_t ptid)
}
if (within_current_scope)
value_is_zero
- = catch_errors (breakpoint_cond_eval, cond,
+ = catch_errors ([&] ()
+ {
+ return breakpoint_cond_eval (cond);
+ },
"Error in testing breakpoint condition:\n",
RETURN_MASK_ALL);
else
@@ -6597,22 +6603,15 @@ breakpoint_address_bits (struct breakpoint *b)
return print_address_bits;
}
-struct captured_breakpoint_query_args
- {
- int bnum;
- };
-
static int
-do_captured_breakpoint_query (struct ui_out *uiout, void *data)
+do_captured_breakpoint_query (int bnum)
{
- struct captured_breakpoint_query_args *args
- = (struct captured_breakpoint_query_args *) data;
struct breakpoint *b;
struct bp_location *dummy_loc = NULL;
ALL_BREAKPOINTS (b)
{
- if (args->bnum == b->number)
+ if (bnum == b->number)
{
print_one_breakpoint (b, &dummy_loc, 0);
return GDB_RC_OK;
@@ -6625,13 +6624,15 @@ enum gdb_rc
gdb_breakpoint_query (struct ui_out *uiout, int bnum,
char **error_message)
{
- struct captured_breakpoint_query_args args;
-
- args.bnum = bnum;
/* For the moment we don't trust print_one_breakpoint() to not throw
an error. */
- if (catch_exceptions_with_msg (uiout, do_captured_breakpoint_query, &args,
- error_message, RETURN_MASK_ALL) < 0)
+ if (catch_exceptions_with_msg
+ (uiout,
+ [&] (struct ui_out *)
+ {
+ return do_captured_breakpoint_query (bnum);
+ },
+ error_message, RETURN_MASK_ALL) < 0)
return GDB_RC_FAIL;
else
return GDB_RC_OK;
@@ -14192,7 +14193,11 @@ breakpoint_re_set (void)
char *message = xstrprintf ("Error in re-setting breakpoint %d: ",
b->number);
struct cleanup *cleanups = make_cleanup (xfree, message);
- catch_errors (breakpoint_re_set_one, b, message, RETURN_MASK_ALL);
+ catch_errors ([&] ()
+ {
+ return breakpoint_re_set_one (b);
+ },
+ message, RETURN_MASK_ALL);
do_cleanups (cleanups);
}
set_language (save_language);
@@ -155,17 +155,15 @@ exception_fprintf (struct ui_file *file, struct gdb_exception e,
int
catch_exceptions (struct ui_out *uiout,
- catch_exceptions_ftype *func,
- void *func_args,
+ gdb::function_view<catch_exceptions_ftype> func,
return_mask mask)
{
- return catch_exceptions_with_msg (uiout, func, func_args, NULL, mask);
+ return catch_exceptions_with_msg (uiout, func, NULL, mask);
}
int
catch_exceptions_with_msg (struct ui_out *func_uiout,
- catch_exceptions_ftype *func,
- void *func_args,
+ gdb::function_view<catch_exceptions_ftype> func,
char **gdberrmsg,
return_mask mask)
{
@@ -179,7 +177,7 @@ catch_exceptions_with_msg (struct ui_out *func_uiout,
TRY
{
- val = (*func) (current_uiout, func_args);
+ val = func (current_uiout);
}
CATCH (ex, RETURN_MASK_ALL)
{
@@ -220,7 +218,7 @@ catch_exceptions_with_msg (struct ui_out *func_uiout,
/* This function is superseded by catch_exceptions(). */
int
-catch_errors (catch_errors_ftype *func, void *func_args,
+catch_errors (gdb::function_view<catch_errors_ftype> func,
const char *errstring, return_mask mask)
{
struct gdb_exception exception = exception_none;
@@ -232,7 +230,7 @@ catch_errors (catch_errors_ftype *func, void *func_args,
TRY
{
- val = func (func_args);
+ val = func ();
}
CATCH (ex, RETURN_MASK_ALL)
{
@@ -65,16 +65,15 @@ extern void exception_fprintf (struct ui_file *file, struct gdb_exception e,
This function uses SETJMP() and LONGJUMP(). */
struct ui_out;
-typedef int (catch_exceptions_ftype) (struct ui_out *ui_out, void *args);
+typedef int (catch_exceptions_ftype) (struct ui_out *ui_out);
extern int catch_exceptions (struct ui_out *uiout,
- catch_exceptions_ftype *func, void *func_args,
+ gdb::function_view<catch_exceptions_ftype> func,
return_mask mask);
-typedef void (catch_exception_ftype) (struct ui_out *ui_out, void *args);
-extern int catch_exceptions_with_msg (struct ui_out *uiout,
- catch_exceptions_ftype *func,
- void *func_args,
- char **gdberrmsg,
- return_mask mask);
+extern int catch_exceptions_with_msg
+ (struct ui_out *uiout,
+ gdb::function_view<catch_exceptions_ftype> func,
+ char **gdberrmsg,
+ return_mask mask);
/* If CATCH_ERRORS_FTYPE throws an error, catch_errors() returns zero
otherwize the result from CATCH_ERRORS_FTYPE is returned. It is
@@ -85,8 +84,8 @@ extern int catch_exceptions_with_msg (struct ui_out *uiout,
This function is superseded by catch_exceptions(). */
-typedef int (catch_errors_ftype) (void *);
-extern int catch_errors (catch_errors_ftype *, void *,
+typedef int (catch_errors_ftype) ();
+extern int catch_errors (gdb::function_view<catch_errors_ftype>,
const char *, return_mask);
/* Compare two exception objects for print equality. */
@@ -80,10 +80,6 @@ static void sig_print_header (void);
static void resume_cleanups (void *);
-static int hook_stop_stub (void *);
-
-static int restore_selected_frame (void *);
-
static int follow_fork (void);
static int follow_fork_inferior (int follow_child, int detach_fork);
@@ -8312,7 +8308,11 @@ normal_stop (void)
struct cleanup *old_chain
= make_cleanup (release_stop_context_cleanup, saved_context);
- catch_errors (hook_stop_stub, stop_command,
+ catch_errors ([&] ()
+ {
+ execute_cmd_pre_hook (stop_command);
+ return 0;
+ },
"Error while running hook_stop:\n", RETURN_MASK_ALL);
/* If the stop hook resumes the target, then there's no point in
@@ -8354,13 +8354,6 @@ normal_stop (void)
return 0;
}
-
-static int
-hook_stop_stub (void *cmd)
-{
- execute_cmd_pre_hook ((struct cmd_list_element *) cmd);
- return (0);
-}
int
signal_stop_state (int signo)
@@ -8982,9 +8975,8 @@ save_infcall_control_state (void)
}
static int
-restore_selected_frame (void *args)
+restore_selected_frame (struct frame_id *fid)
{
- struct frame_id *fid = (struct frame_id *) args;
struct frame_info *frame;
frame = frame_find_by_id (*fid);
@@ -9033,7 +9025,10 @@ restore_infcall_control_state (struct infcall_control_state *inf_status)
walking the stack might encounter a garbage pointer and
error() trying to dereference it. */
if (catch_errors
- (restore_selected_frame, &inf_status->selected_frame_id,
+ ([&] ()
+ {
+ return restore_selected_frame (&inf_status->selected_frame_id);
+ },
"Unable to restore previously selected frame:\n",
RETURN_MASK_ERROR) == 0)
/* Error in restoring the selected frame. Select the innermost
@@ -309,7 +309,7 @@ setup_alternate_signal_stack (void)
non-zero return status. */
static int
-captured_command_loop (void *data)
+captured_command_loop ()
{
struct ui *ui = current_ui;
@@ -1147,7 +1147,7 @@ captured_main (void *data)
change - SET_TOP_LEVEL() - has been eliminated. */
while (1)
{
- catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
+ catch_errors (captured_command_loop, "", RETURN_MASK_ALL);
}
/* No exit -- exit is through quit_command. */
}
@@ -1310,37 +1310,18 @@ find_objc_msgsend (void)
* dependent modules.
*/
-struct objc_submethod_helper_data {
- int (*f) (CORE_ADDR, CORE_ADDR *);
- CORE_ADDR pc;
- CORE_ADDR *new_pc;
-};
-
-static int
-find_objc_msgcall_submethod_helper (void * arg)
-{
- struct objc_submethod_helper_data *s =
- (struct objc_submethod_helper_data *) arg;
-
- if (s->f (s->pc, s->new_pc) == 0)
- return 1;
- else
- return 0;
-}
-
static int
find_objc_msgcall_submethod (int (*f) (CORE_ADDR, CORE_ADDR *),
CORE_ADDR pc,
CORE_ADDR *new_pc)
{
- struct objc_submethod_helper_data s;
-
- s.f = f;
- s.pc = pc;
- s.new_pc = new_pc;
-
- if (catch_errors (find_objc_msgcall_submethod_helper,
- (void *) &s,
+ if (catch_errors ([&] ()
+ {
+ if (f (pc, new_pc) == 0)
+ return 1;
+ else
+ return 0;
+ },
"Unable to determine target of "
"Objective-C method call (ignoring):\n",
RETURN_MASK_ALL) == 0)
@@ -637,32 +637,15 @@ record_full_message (struct regcache *regcache, enum gdb_signal signal)
return 1;
}
-struct record_full_message_args {
- struct regcache *regcache;
- enum gdb_signal signal;
-};
-
-static int
-record_full_message_wrapper (void *args)
-{
- struct record_full_message_args *record_full_args
- = (struct record_full_message_args *) args;
-
- return record_full_message (record_full_args->regcache,
- record_full_args->signal);
-}
-
static int
record_full_message_wrapper_safe (struct regcache *regcache,
enum gdb_signal signal)
{
- struct record_full_message_args args;
-
- args.regcache = regcache;
- args.signal = signal;
-
- return catch_errors (record_full_message_wrapper, &args, "",
- RETURN_MASK_ALL);
+ return catch_errors ([&] ()
+ {
+ return record_full_message (regcache, signal);
+ },
+ "", RETURN_MASK_ALL);
}
/* Set to 1 if record_full_store_registers and record_full_xfer_partial
@@ -1189,7 +1189,10 @@ remote_fileio_request (char *buf, int ctrlc_pending_p)
else
{
ex = catch_exceptions (current_uiout,
- do_remote_fileio_request, (void *)buf,
+ [&] (ui_out *uiout)
+ {
+ return do_remote_fileio_request (uiout, buf);
+ },
RETURN_MASK_ALL);
switch (ex)
{
@@ -589,7 +589,7 @@ solib_aix_current_sos (void)
/* Implement the "open_symbol_file_object" target_so_ops method. */
static int
-solib_aix_open_symbol_file_object (void *from_ttyp)
+solib_aix_open_symbol_file_object (int from_tty)
{
return 0;
}
@@ -222,7 +222,7 @@ find_program_interpreter (void)
Note that darwin-nat.c implements pid_to_exec_file. */
static int
-open_symbol_file_object (void *from_ttyp)
+open_symbol_file_object (int from_tty)
{
return 0;
}
@@ -507,16 +507,10 @@ scan_dyntag (int dyntag, bfd *abfd, CORE_ADDR *ptr)
return 0;
}
-/* If no open symbol file, attempt to locate and open the main symbol
- file.
-
- If FROM_TTYP dereferences to a non-zero integer, allow messages to
- be printed. This parameter is a pointer rather than an int because
- open_symbol_file_object is called via catch_errors and
- catch_errors requires a pointer argument. */
+/* See solist.h. */
static int
-open_symbol_file_object (void *from_ttyp)
+open_symbol_file_object (int from_tty)
{
/* Unimplemented. */
return 0;
@@ -246,7 +246,7 @@ static int enable_break2 (void);
/* Implement the "open_symbol_file_object" target_so_ops method. */
static int
-open_symbol_file_object (void *from_ttyp)
+open_symbol_file_object (int from_tty)
{
/* Unimplemented. */
return 0;
@@ -984,20 +984,14 @@ svr4_keep_data_in_core (CORE_ADDR vaddr, unsigned long size)
return (name_lm >= vaddr && name_lm < vaddr + size);
}
-/* Implement the "open_symbol_file_object" target_so_ops method.
-
- If no open symbol file, attempt to locate and open the main symbol
- file. On SVR4 systems, this is the first link map entry. If its
- name is here, we can open it. Useful when attaching to a process
- without first loading its symbol file. */
+/* See solist.h. */
static int
-open_symbol_file_object (void *from_ttyp)
+open_symbol_file_object (int from_tty)
{
CORE_ADDR lm, l_name;
char *filename;
int errcode;
- int from_tty = *(int *)from_ttyp;
struct link_map_offsets *lmo = svr4_fetch_link_map_offsets ();
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
int l_name_size = TYPE_LENGTH (ptr_type);
@@ -452,7 +452,7 @@ Could not relocate shared library \"%s\": bad offsets"), so->so_name);
}
static int
-solib_target_open_symbol_file_object (void *from_ttyp)
+solib_target_open_symbol_file_object (int from_tty)
{
/* We can't locate the main symbol file based on the target's
knowledge; the user has to specify it. */
@@ -760,7 +760,10 @@ update_solib_list (int from_tty)
have not opened a symbol file, we may be able to get its
symbols now! */
if (inf->attach_flag && symfile_objfile == NULL)
- catch_errors (ops->open_symbol_file_object, &from_tty,
+ catch_errors ([&] ()
+ {
+ return ops->open_symbol_file_object (from_tty);
+ },
"Error reading attached process's symbol file.\n",
RETURN_MASK_ALL);
}
@@ -121,11 +121,8 @@ struct target_so_ops
struct so_list *(*current_sos) (void);
/* Find, open, and read the symbols for the main executable. If
- FROM_TTYP dereferences to a non-zero integer, allow messages to
- be printed. This parameter is a pointer rather than an int
- because open_symbol_file_object is called via catch_errors and
- catch_errors requires a pointer argument. */
- int (*open_symbol_file_object) (void *from_ttyp);
+ FROM_TTY is non-zero, allow messages to be printed. */
+ int (*open_symbol_file_object) (int from_ttyp);
/* Determine if PC lies in the dynamic symbol resolution code of
the run time loader. */
@@ -231,8 +231,13 @@ add_vsyscall_page (struct target_ops *target, int from_tty)
vsyscall DSO was not triggered by the user, even if the user
typed "run" at the TTY. */
args.from_tty = 0;
- catch_exceptions (current_uiout, symbol_file_add_from_memory_wrapper,
- &args, RETURN_MASK_ALL);
+ catch_exceptions (current_uiout,
+ [&] (ui_out *uiout)
+ {
+ return symbol_file_add_from_memory_wrapper (uiout,
+ &args);
+ },
+ RETURN_MASK_ALL);
}
}
@@ -62,7 +62,8 @@ struct print_symbol_args
struct ui_file *outfile;
};
-static int print_symbol (void *);
+static int print_symbol (struct gdbarch *gdbarch, struct symbol *symbol,
+ int depth, struct ui_file *outfile);
void
@@ -357,13 +358,12 @@ dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile)
block, not any blocks from included symtabs. */
ALL_DICT_SYMBOLS (BLOCK_DICT (b), iter, sym)
{
- struct print_symbol_args s;
-
- s.gdbarch = gdbarch;
- s.symbol = sym;
- s.depth = depth + 1;
- s.outfile = outfile;
- catch_errors (print_symbol, &s, "Error printing symbol:\n",
+ catch_errors ([&] ()
+ {
+ return print_symbol (gdbarch, sym, depth + 1,
+ outfile);
+ },
+ "Error printing symbol:\n",
RETURN_MASK_ERROR);
}
}
@@ -515,18 +515,13 @@ maintenance_print_symbols (const char *args, int from_tty)
}
}
-/* Print symbol ARGS->SYMBOL on ARGS->OUTFILE. ARGS->DEPTH says how
- far to indent. ARGS is really a struct print_symbol_args *, but is
- declared as char * to get it past catch_errors. Returns 0 for error,
- 1 for success. */
+/* Print symbol SYMBOL on OUTFILE. DEPTH says how far to indent.
+ Returns 0 for error, 1 for success. */
static int
-print_symbol (void *args)
+print_symbol (struct gdbarch *gdbarch, struct symbol *symbol,
+ int depth, struct ui_file *outfile)
{
- struct gdbarch *gdbarch = ((struct print_symbol_args *) args)->gdbarch;
- struct symbol *symbol = ((struct print_symbol_args *) args)->symbol;
- int depth = ((struct print_symbol_args *) args)->depth;
- struct ui_file *outfile = ((struct print_symbol_args *) args)->outfile;
struct obj_section *section;
if (SYMBOL_OBJFILE_OWNED (symbol))
@@ -723,7 +723,7 @@ any_live_thread_of_process (int pid)
/* Print a list of thread ids currently known, and the total number of
threads. To be used from within catch_errors. */
static int
-do_captured_list_thread_ids (struct ui_out *uiout, void *arg)
+do_captured_list_thread_ids (struct ui_out *uiout)
{
struct thread_info *tp;
int num = 0;
@@ -758,7 +758,7 @@ do_captured_list_thread_ids (struct ui_out *uiout, void *arg)
enum gdb_rc
gdb_list_thread_ids (struct ui_out *uiout, char **error_message)
{
- if (catch_exceptions_with_msg (uiout, do_captured_list_thread_ids, NULL,
+ if (catch_exceptions_with_msg (uiout, do_captured_list_thread_ids,
error_message, RETURN_MASK_ALL) < 0)
return GDB_RC_FAIL;
return GDB_RC_OK;
@@ -1992,9 +1992,8 @@ show_print_thread_events (struct ui_file *file, int from_tty,
}
static int
-do_captured_thread_select (struct ui_out *uiout, void *tidstr_v)
+do_captured_thread_select (struct ui_out *uiout, const char *tidstr)
{
- const char *tidstr = (const char *) tidstr_v;
struct thread_info *tp;
if (uiout->is_mi_like_p ())
@@ -2070,8 +2069,13 @@ print_selected_thread_frame (struct ui_out *uiout,
enum gdb_rc
gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message)
{
- if (catch_exceptions_with_msg (uiout, do_captured_thread_select, tidstr,
- error_message, RETURN_MASK_ALL) < 0)
+ if (catch_exceptions_with_msg
+ (uiout,
+ [&] (struct ui_out *inner_uiout)
+ {
+ return do_captured_thread_select (inner_uiout, tidstr);
+ },
+ error_message, RETURN_MASK_ALL) < 0)
return GDB_RC_FAIL;
return GDB_RC_OK;
}
@@ -755,7 +755,7 @@ get_image_name (HANDLE h, void *address, int unicode)
on how we handle DLL loading during that phase). */
static int
-handle_load_dll (void *dummy)
+handle_load_dll ()
{
LOAD_DLL_DEBUG_INFO *event = ¤t_event.u.LoadDll;
char *dll_name;
@@ -1540,7 +1540,7 @@ get_windows_debug_event (struct target_ops *ops,
CloseHandle (current_event.u.LoadDll.hFile);
if (saw_create != 1 || ! windows_initialization_done)
break;
- catch_errors (handle_load_dll, NULL, (char *) "", RETURN_MASK_ALL);
+ catch_errors (handle_load_dll, (char *) "", RETURN_MASK_ALL);
ourstatus->kind = TARGET_WAITKIND_LOADED;
ourstatus->value.integer = 0;
thread_id = main_thread_id;
@@ -1553,7 +1553,7 @@ get_windows_debug_event (struct target_ops *ops,
"UNLOAD_DLL_DEBUG_EVENT"));
if (saw_create != 1 || ! windows_initialization_done)
break;
- catch_errors (handle_unload_dll, NULL, (char *) "", RETURN_MASK_ALL);
+ catch_errors (handle_unload_dll, (char *) "", RETURN_MASK_ALL);
ourstatus->kind = TARGET_WAITKIND_LOADED;
ourstatus->value.integer = 0;
thread_id = main_thread_id;