binutils-gdb/gdb/darwin-nat-info.c

870 lines
24 KiB
C
Raw Normal View History

/* Darwin support for GDB, the GNU debugger.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
Contributed by Apple Computer, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* The name of the ppc_thread_state structure, and the names of its
members, have been changed for Unix conformance reasons. The easiest
way to have gdb build on systems with the older names and systems
with the newer names is to build this compilation unit with the
non-conformant define below. This doesn't seem to cause the resulting
binary any problems but it seems like it could cause us problems in
the future. It'd be good to remove this at some point when compiling on
Tiger is no longer important. */
#include "defs.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "gdbcore.h"
#include "value.h"
#include "gdbcmd.h"
#include "inferior.h"
#include <sys/sysctl.h>
#include "darwin-nat.h"
#include <mach/thread_info.h>
#include <mach/thread_act.h>
#include <mach/task.h>
#include <mach/vm_map.h>
#include <mach/mach_port.h>
#include <mach/mach_init.h>
#include <mach/mach_vm.h>
#define CHECK_ARGS(what, args) do { \
if ((NULL == args) || ((args[0] != '0') && (args[1] != 'x'))) \
error(_("%s must be specified with 0x..."), what); \
} while (0)
#define PRINT_FIELD(structure, field) \
printf_unfiltered(_(#field":\t%#lx\n"), (unsigned long) (structure)->field)
#define PRINT_TV_FIELD(structure, field) \
printf_unfiltered(_(#field":\t%u.%06u sec\n"), \
(unsigned) (structure)->field.seconds, \
(unsigned) (structure)->field.microseconds)
#define task_self mach_task_self
#define task_by_unix_pid task_for_pid
#define port_name_array_t mach_port_array_t
#define port_type_array_t mach_port_array_t
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_tasks_command (const char *args, int from_tty)
{
int sysControl[4];
int count, index;
size_t length;
struct kinfo_proc *procInfo;
sysControl[0] = CTL_KERN;
sysControl[1] = KERN_PROC;
sysControl[2] = KERN_PROC_ALL;
sysctl (sysControl, 3, NULL, &length, NULL, 0);
procInfo = (struct kinfo_proc *) xmalloc (length);
sysctl (sysControl, 3, procInfo, &length, NULL, 0);
count = (length / sizeof (struct kinfo_proc));
printf_unfiltered (_("%d processes:\n"), count);
for (index = 0; index < count; ++index)
{
kern_return_t result;
mach_port_t taskPort;
result =
task_by_unix_pid (mach_task_self (), procInfo[index].kp_proc.p_pid,
&taskPort);
if (KERN_SUCCESS == result)
{
printf_unfiltered (_(" %s is %d has task %#x\n"),
procInfo[index].kp_proc.p_comm,
procInfo[index].kp_proc.p_pid, taskPort);
}
else
{
printf_unfiltered (_(" %s is %d unknown task port\n"),
procInfo[index].kp_proc.p_comm,
procInfo[index].kp_proc.p_pid);
}
}
xfree (procInfo);
}
static task_t
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
get_task_from_args (const char *args)
{
task_t task;
char *eptr;
if (args == NULL || *args == 0)
{
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
if (ptid_equal (inferior_ptid, null_ptid))
printf_unfiltered (_("No inferior running\n"));
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
darwin_inferior *priv = get_darwin_inferior (current_inferior ());
return priv->task;
}
if (strcmp (args, "gdb") == 0)
return mach_task_self ();
task = strtoul (args, &eptr, 0);
if (*eptr)
{
printf_unfiltered (_("cannot parse task id '%s'\n"), args);
return TASK_NULL;
}
return task;
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_task_command (const char *args, int from_tty)
{
union
{
struct task_basic_info basic;
struct task_events_info events;
struct task_thread_times_info thread_times;
} task_info_data;
kern_return_t result;
unsigned int info_count;
task_t task;
task = get_task_from_args (args);
if (task == TASK_NULL)
return;
printf_unfiltered (_("TASK_BASIC_INFO for 0x%x:\n"), task);
info_count = TASK_BASIC_INFO_COUNT;
result = task_info (task,
TASK_BASIC_INFO,
(task_info_t) & task_info_data.basic, &info_count);
MACH_CHECK_ERROR (result);
PRINT_FIELD (&task_info_data.basic, suspend_count);
PRINT_FIELD (&task_info_data.basic, virtual_size);
PRINT_FIELD (&task_info_data.basic, resident_size);
PRINT_TV_FIELD (&task_info_data.basic, user_time);
PRINT_TV_FIELD (&task_info_data.basic, system_time);
printf_unfiltered (_("\nTASK_EVENTS_INFO:\n"));
info_count = TASK_EVENTS_INFO_COUNT;
result = task_info (task,
TASK_EVENTS_INFO,
(task_info_t) & task_info_data.events, &info_count);
MACH_CHECK_ERROR (result);
PRINT_FIELD (&task_info_data.events, faults);
#if 0
PRINT_FIELD (&task_info_data.events, zero_fills);
PRINT_FIELD (&task_info_data.events, reactivations);
#endif
PRINT_FIELD (&task_info_data.events, pageins);
PRINT_FIELD (&task_info_data.events, cow_faults);
PRINT_FIELD (&task_info_data.events, messages_sent);
PRINT_FIELD (&task_info_data.events, messages_received);
printf_unfiltered (_("\nTASK_THREAD_TIMES_INFO:\n"));
info_count = TASK_THREAD_TIMES_INFO_COUNT;
result = task_info (task,
TASK_THREAD_TIMES_INFO,
(task_info_t) & task_info_data.thread_times,
&info_count);
MACH_CHECK_ERROR (result);
PRINT_TV_FIELD (&task_info_data.thread_times, user_time);
PRINT_TV_FIELD (&task_info_data.thread_times, system_time);
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_ports_command (const char *args, int from_tty)
{
port_name_array_t names;
port_type_array_t types;
unsigned int name_count, type_count;
kern_return_t result;
int index;
task_t task;
task = get_task_from_args (args);
if (task == TASK_NULL)
return;
result = mach_port_names (task, &names, &name_count, &types, &type_count);
MACH_CHECK_ERROR (result);
gdb_assert (name_count == type_count);
printf_unfiltered (_("Ports for task 0x%x:\n"), task);
printf_unfiltered (_("port type\n"));
for (index = 0; index < name_count; ++index)
{
mach_port_t port = names[index];
unsigned int j;
struct type_descr
{
mach_port_type_t type;
const char *name;
mach_port_right_t right;
};
static struct type_descr descrs[] =
{
{MACH_PORT_TYPE_SEND, "send", MACH_PORT_RIGHT_SEND},
{MACH_PORT_TYPE_SEND_ONCE, "send-once", MACH_PORT_RIGHT_SEND_ONCE},
{MACH_PORT_TYPE_RECEIVE, "receive", MACH_PORT_RIGHT_RECEIVE},
{MACH_PORT_TYPE_PORT_SET, "port-set", MACH_PORT_RIGHT_PORT_SET},
{MACH_PORT_TYPE_DEAD_NAME, "dead", MACH_PORT_RIGHT_DEAD_NAME}
};
printf_unfiltered (_("%04x: %08x "), port, types[index]);
for (j = 0; j < sizeof(descrs) / sizeof(*descrs); j++)
if (types[index] & descrs[j].type)
{
mach_port_urefs_t ref;
kern_return_t ret;
printf_unfiltered (_(" %s("), descrs[j].name);
ret = mach_port_get_refs (task, port, descrs[j].right, &ref);
if (ret != KERN_SUCCESS)
printf_unfiltered (_("??"));
else
printf_unfiltered (_("%u"), ref);
printf_unfiltered (_(" refs)"));
}
if (task == task_self ())
{
if (port == task_self())
printf_unfiltered (_(" gdb-task"));
else if (port == darwin_host_self)
printf_unfiltered (_(" host-self"));
else if (port == darwin_ex_port)
printf_unfiltered (_(" gdb-exception"));
else if (port == darwin_port_set)
printf_unfiltered (_(" gdb-port_set"));
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
else if (!ptid_equal (inferior_ptid, null_ptid))
{
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
struct inferior *inf = current_inferior ();
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
darwin_inferior *priv = get_darwin_inferior (inf);
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
if (port == priv->task)
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
printf_unfiltered (_(" inferior-task"));
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
else if (port == priv->notify_port)
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
printf_unfiltered (_(" inferior-notify"));
else
{
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
for (int k = 0; k < priv->exception_info.count; k++)
if (port == priv->exception_info.ports[k])
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
{
printf_unfiltered (_(" inferior-excp-port"));
break;
}
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
for (darwin_thread_t *t : priv->threads)
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
{
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
if (port == t->gdb_port)
{
printf_unfiltered (_(" inferior-thread for 0x%x"),
priv->task);
break;
}
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
}
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
}
}
}
printf_unfiltered (_("\n"));
}
vm_deallocate (task_self (), (vm_address_t) names,
(name_count * sizeof (mach_port_t)));
vm_deallocate (task_self (), (vm_address_t) types,
(type_count * sizeof (mach_port_type_t)));
}
static void
darwin_debug_port_info (task_t task, mach_port_t port)
{
kern_return_t kret;
mach_port_status_t status;
mach_msg_type_number_t len = sizeof (status);
kret = mach_port_get_attributes
(task, port, MACH_PORT_RECEIVE_STATUS, (mach_port_info_t)&status, &len);
MACH_CHECK_ERROR (kret);
printf_unfiltered (_("Port 0x%lx in task 0x%lx:\n"), (unsigned long) port,
(unsigned long) task);
printf_unfiltered (_(" port set: 0x%x\n"), status.mps_pset);
printf_unfiltered (_(" seqno: 0x%x\n"), status.mps_seqno);
printf_unfiltered (_(" mscount: 0x%x\n"), status.mps_mscount);
printf_unfiltered (_(" qlimit: 0x%x\n"), status.mps_qlimit);
printf_unfiltered (_(" msgcount: 0x%x\n"), status.mps_msgcount);
printf_unfiltered (_(" sorights: 0x%x\n"), status.mps_sorights);
printf_unfiltered (_(" srights: 0x%x\n"), status.mps_srights);
printf_unfiltered (_(" pdrequest: 0x%x\n"), status.mps_pdrequest);
printf_unfiltered (_(" nsrequest: 0x%x\n"), status.mps_nsrequest);
printf_unfiltered (_(" flags: 0x%x\n"), status.mps_flags);
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_port_command (const char *args, int from_tty)
{
task_t task;
mach_port_t port;
CHECK_ARGS (_("Task and port"), args);
sscanf (args, "0x%x 0x%x", &task, &port);
darwin_debug_port_info (task, port);
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_threads_command (const char *args, int from_tty)
{
thread_array_t threads;
unsigned int thread_count;
kern_return_t result;
task_t task;
int i;
task = get_task_from_args (args);
if (task == TASK_NULL)
return;
result = task_threads (task, &threads, &thread_count);
MACH_CHECK_ERROR (result);
printf_unfiltered (_("Threads in task %#x:\n"), task);
for (i = 0; i < thread_count; ++i)
{
printf_unfiltered (_(" %#x\n"), threads[i]);
mach_port_deallocate (task_self (), threads[i]);
}
vm_deallocate (task_self (), (vm_address_t) threads,
(thread_count * sizeof (thread_t)));
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_thread_command (const char *args, int from_tty)
{
union
{
struct thread_basic_info basic;
} thread_info_data;
thread_t thread;
kern_return_t result;
unsigned int info_count;
CHECK_ARGS (_("Thread"), args);
sscanf (args, "0x%x", &thread);
printf_unfiltered (_("THREAD_BASIC_INFO\n"));
info_count = THREAD_BASIC_INFO_COUNT;
result = thread_info (thread,
THREAD_BASIC_INFO,
(thread_info_t) & thread_info_data.basic,
&info_count);
MACH_CHECK_ERROR (result);
#if 0
PRINT_FIELD (&thread_info_data.basic, user_time);
PRINT_FIELD (&thread_info_data.basic, system_time);
#endif
PRINT_FIELD (&thread_info_data.basic, cpu_usage);
PRINT_FIELD (&thread_info_data.basic, run_state);
PRINT_FIELD (&thread_info_data.basic, flags);
PRINT_FIELD (&thread_info_data.basic, suspend_count);
PRINT_FIELD (&thread_info_data.basic, sleep_time);
}
static const char *
unparse_protection (vm_prot_t p)
{
switch (p)
{
case VM_PROT_NONE:
return "---";
case VM_PROT_READ:
return "r--";
case VM_PROT_WRITE:
return "-w-";
case VM_PROT_READ | VM_PROT_WRITE:
return "rw-";
case VM_PROT_EXECUTE:
return "--x";
case VM_PROT_EXECUTE | VM_PROT_READ:
return "r-x";
case VM_PROT_EXECUTE | VM_PROT_WRITE:
return "-wx";
case VM_PROT_EXECUTE | VM_PROT_WRITE | VM_PROT_READ:
return "rwx";
default:
return "???";
}
}
static const char *
unparse_inheritance (vm_inherit_t i)
{
switch (i)
{
case VM_INHERIT_SHARE:
return _("share");
case VM_INHERIT_COPY:
return _("copy ");
case VM_INHERIT_NONE:
return _("none ");
default:
return _("??? ");
}
}
static const char *
unparse_share_mode (unsigned char p)
{
switch (p)
{
case SM_COW:
return _("cow");
case SM_PRIVATE:
return _("private");
case SM_EMPTY:
return _("empty");
case SM_SHARED:
return _("shared");
case SM_TRUESHARED:
return _("true-shrd");
case SM_PRIVATE_ALIASED:
return _("prv-alias");
case SM_SHARED_ALIASED:
return _("shr-alias");
default:
return _("???");
}
}
static const char *
unparse_user_tag (unsigned int tag)
{
switch (tag)
{
case 0:
return _("default");
case VM_MEMORY_MALLOC:
return _("malloc");
case VM_MEMORY_MALLOC_SMALL:
return _("malloc_small");
case VM_MEMORY_MALLOC_LARGE:
return _("malloc_large");
case VM_MEMORY_MALLOC_HUGE:
return _("malloc_huge");
case VM_MEMORY_SBRK:
return _("sbrk");
case VM_MEMORY_REALLOC:
return _("realloc");
case VM_MEMORY_MALLOC_TINY:
return _("malloc_tiny");
case VM_MEMORY_ANALYSIS_TOOL:
return _("analysis_tool");
case VM_MEMORY_MACH_MSG:
return _("mach_msg");
case VM_MEMORY_IOKIT:
return _("iokit");
case VM_MEMORY_STACK:
return _("stack");
case VM_MEMORY_GUARD:
return _("guard");
case VM_MEMORY_SHARED_PMAP:
return _("shared_pmap");
case VM_MEMORY_DYLIB:
return _("dylib");
case VM_MEMORY_APPKIT:
return _("appkit");
case VM_MEMORY_FOUNDATION:
return _("foundation");
default:
return NULL;
}
}
static void
darwin_debug_regions (task_t task, mach_vm_address_t address, int max)
{
kern_return_t kret;
vm_region_basic_info_data_64_t info, prev_info;
mach_vm_address_t prev_address;
mach_vm_size_t size, prev_size;
mach_port_t object_name;
mach_msg_type_number_t count;
int nsubregions = 0;
int num_printed = 0;
count = VM_REGION_BASIC_INFO_COUNT_64;
kret = mach_vm_region (task, &address, &size, VM_REGION_BASIC_INFO_64,
(vm_region_info_t) &info, &count, &object_name);
if (kret != KERN_SUCCESS)
{
printf_filtered (_("No memory regions."));
return;
}
memcpy (&prev_info, &info, sizeof (vm_region_basic_info_data_64_t));
prev_address = address;
prev_size = size;
nsubregions = 1;
for (;;)
{
int print = 0;
int done = 0;
address = prev_address + prev_size;
2011-01-07 Michael Snyder <msnyder@vmware.com> * ada-lang.c: Comment cleanup, mostly periods and spaces. * ada-lang.h: Ditto. * ada-tasks.c: Ditto. * ada-valprint.c: Ditto. * aix-threads.c: Ditto. * alpha-linux-nat.c: Ditto. * alpha-linux-tdep.c: Ditto. * alpha-mdebug-tdep.c: Ditto. * alpha-nat.c: Ditto. * alpha-osf1-tdep.c: Ditto. * alpha-tdep.c: Ditto. * alphabsd-nat.c: Ditto. * alphabsd-tdep.c: Ditto. * amd64-darwin-tdep.c: Ditto. * amd64-linux-nat.c: Ditto. * amd64-linux-tdep.c: Ditto. * amd64-sol2-tdep.c: Ditto. * amd64-tdep.c: Ditto. * amd64-fbsd-tdep.c: Ditto. * amd64-nbsd-tdep.c: Ditto. * amd64-obsd-tdep.c: Ditto. * amd64-linux-nat.c: Ditto. * amd64-linux-tdep.c: Ditto. * arm-tdep.c: Ditto. * arm-tdep.h: Ditto. * armnbsd-nat.c: Ditto. * avr-tdep.c: Ditto. * bfin-tdep.c: Ditto. * bsd-kvm.c: Ditto. * c-typeprintc: Ditto. * c-valprint.c: Ditto. * coff-pe-read.h: Ditto. * coffreead.c: Ditto. * cris-tdep.c: Ditto. * d-lang.c: Ditto. * darwin-nat-info.c: Ditto. * darwin-nat.c: Ditto. * dbug-rom.c: Ditto. * dbxread.c: Ditto. * dcache.c: Ditto. * dcache.h: Ditto. * dec-thread.c: Ditto. * defs.h: Ditto. * demangle.c: Ditto. * dicos-tdep.c: Ditto. * dictionary.c: Ditto. * dictionary.h: Ditto. * dink32-rom.c: Ditto. * disasm.c: Ditto. * doublest.c: Ditto. * dsrec.c: Ditto. * dummy-frame.c: Ditto. * dwarf2-frame.c: Ditto. * dwarf2expr.c: Ditto. * dwarf2loc.c: Ditto. * dwarf2read.c: Ditto. * elfread.c: Ditto. * environ.c: Ditto. * eval.c: Ditto. * event-top.h: Ditto. * exceptions.c: Ditto. * exceptions.h: Ditto. * exec.c: Ditto. * expprint.c: Ditto. * expression.h: Ditto. * f-exp.y: Ditto. * f-lang.c: Ditto. * f-lang.h: Ditto. * f-typeprint.c: Ditto. * f-valprint.c: Ditto. * fbsd-nat.c: Ditto. * findvar.c: Ditto. * fork-child.c: Ditto. * frame.c: Ditto. * frame.h: Ditto. * frv-linux-tdep.c: Ditto. * frv-tdep.c: Ditto. * gcore.c: Ditto. * gdb-stabs.h: Ditto. * gdb_assert.h: Ditto. * gdb_string.h: Ditto. * gdb_thread_db.h: Ditto. * gdb_wait.h: Ditto. * gdbarch.sh: Ditto. * gdbcore.h: Ditto. * gdbthread.h: Ditto. * gdbtypes.c: Ditto. * gdbtypes.h: Ditto. * gnu-nat.c: Ditto. * gnu-nat.h: Ditto. * gnu-v2-abi.c: Ditto. * gnu-v3-abi.c: Ditto. * go32-nat.c: Ditto. * gdbarch.c: Regenerate. * gdbarch.h: Regenerate.
2011-01-07 20:36:19 +01:00
/* Check to see if address space has wrapped around. */
if (address == 0)
print = done = 1;
if (!done)
{
count = VM_REGION_BASIC_INFO_COUNT_64;
kret =
mach_vm_region (task, &address, &size, VM_REGION_BASIC_INFO_64,
(vm_region_info_t) &info, &count, &object_name);
if (kret != KERN_SUCCESS)
{
size = 0;
print = done = 1;
}
}
if (address != prev_address + prev_size)
print = 1;
if ((info.protection != prev_info.protection)
|| (info.max_protection != prev_info.max_protection)
|| (info.inheritance != prev_info.inheritance)
|| (info.shared != prev_info.reserved)
|| (info.reserved != prev_info.reserved))
print = 1;
if (print)
{
printf_filtered (_("%s-%s %s/%s %s %s %s"),
paddress (target_gdbarch (), prev_address),
paddress (target_gdbarch (), prev_address + prev_size),
unparse_protection (prev_info.protection),
unparse_protection (prev_info.max_protection),
unparse_inheritance (prev_info.inheritance),
prev_info.shared ? _("shrd") : _("priv"),
prev_info.reserved ? _("reserved") : _("not-rsvd"));
if (nsubregions > 1)
printf_filtered (_(" (%d sub-rgn)"), nsubregions);
printf_filtered (_("\n"));
prev_address = address;
prev_size = size;
memcpy (&prev_info, &info, sizeof (vm_region_basic_info_data_64_t));
nsubregions = 1;
num_printed++;
}
else
{
prev_size += size;
nsubregions++;
}
if ((max > 0) && (num_printed >= max))
done = 1;
if (done)
break;
}
}
static void
darwin_debug_regions_recurse (task_t task)
{
mach_vm_address_t r_addr;
mach_vm_address_t r_start;
mach_vm_size_t r_size;
natural_t r_depth;
mach_msg_type_number_t r_info_size;
vm_region_submap_short_info_data_64_t r_info;
kern_return_t kret;
int ret;
struct ui_out *uiout = current_uiout;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
ui_out_emit_table table_emitter (uiout, 9, -1, "regions");
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
if (gdbarch_addr_bit (target_gdbarch ()) <= 32)
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
{
Class-ify ui_out This patch finalizes the C++ conversion of the ui-out subsystem, by turning the ui_out and ui_out_impl structures into a single class hierarchy. ui_out functions are turned into virtual methods of that new class, so as a result there are a lot of call sites to update. In the previous version of the patchset, there were separate ui_out and ui_out_impl classes, but it wasn't really useful and added boilerplate. In this version there is simply an ui_out base class that is extended for CLI, TUI and MI. It's a bit hard to maintain a ChangeLog for such a big patch, I did my best but I'm sure there are some missing or outdated info in there... gdb/ChangeLog: * ui-out.h (ui_out_begin, ui_out_end, ui_out_table_header, ui_out_table_body, ui_out_field_int, ui_out_field_fmt_int, ui_out_field_core_addr, ui_out_field_string, ui_out_field_stream, ui_out_field_fmt, ui_out_field_skip, ui_out_spaces, ui_out_text, ui_out_message, ui_out_wrap_hint, ui_out_flush, ui_out_test_flags, ui_out_query_field, ui_out_is_mi_like_p, ui_out_redirect): Remove, replace with a method in class ui_out. (table_begin_ftype): Remove, replace with pure virtual method in class ui_out. (table_body_ftype): Likewise. (table_end_ftype): Likewise. (table_header_ftype): Likewise. (ui_out_begin_ftype): Likewise. (ui_out_end_ftype): Likewise. (field_int_ftype): Likewise. (field_skip_ftype): Likewise. (field_string_ftype): Likewise. (field_fmt_ftype): Likewise. (spaces_ftype): Likewise. (text_ftype): Likewise. (message_ftype): Likewise. (wrap_hint_ftype): Likewise. (flush_ftype): Likewise. (redirect_ftype): Likewise. (data_destroy_ftype): Likewise. (struct ui_out_impl): Remove, replace with class ui_out. (ui_out_new): Remove. (class ui_out): New class. * ui-out.c (struct ui_out): Remove, replaced with class ui_out. (current_level): Remove, replace with ui_out method. (push_level): Likewise. (pop_level): Likewise. (uo_table_begin, uo_table_body, uo_table_end, uo_table_header, uo_begin, uo_end, uo_field_int, uo_field_skip, uo_field_fmt, uo_spaces, uo_text, uo_message, uo_wrap_hint, uo_flush, uo_redirect, uo_field_string): Remove. (ui_out_table_begin): Replace with ... (ui_out::table_begin): ... this. (ui_out_table_body): Replace with ... (ui_out::table_body): ... this. (ui_out_table_end): Replace with ... (ui_out::table_end): ... this. (ui_out_table_header): Replace with ... (ui_out::table_header): ... this. (ui_out_begin): Replace with ... (ui_out::begin): ... this. (ui_out_end): Replace with ... (ui_out::end): ... this. (ui_out_field_int): Replace with ... (ui_out::field_int): ... this. (ui_out_field_fmt_int): Replace with ... (ui_out::field_fmt_int): ... this. (ui_out_field_core_addr): Replace with ... (ui_out::field_core_addr): ... this. (ui_out_field_stream): Replace with ... (ui_out::field_stream): ... this. (ui_out_field_skip): Replace with ... (ui_out::field_skip): ... this. (ui_out_field_string): Replace with ... (ui_out::field_string): ... this. (ui_out_field_fmt): Replace with ... (ui_out::field_fmt): ... this. (ui_out_spaces): Replace with ... (ui_out::spaces): ... this. (ui_out_text): Replace with ... (ui_out::text): ... this. (ui_out_message): Replace with ... (ui_out::message): ... this. (ui_out_wrap_hint): Replace with ... (ui_out::wrap_hint): ... this. (ui_out_flush): Replace with ... (ui_out::flush): ... this. (ui_out_redirect): Replace with ... (ui_out::redirect): ... this. (ui_out_test_flags): Replace with ... (ui_out::test_flags): ... this. (ui_out_is_mi_like_p): Replace with ... (ui_out::is_mi_like_p): ... this. (verify_field): Replace with ... (ui_out::verify_field): ... this. (ui_out_query_field): Replace with ... (ui_out::query_table_field): ... this. (ui_out_data): Remove. (ui_out_new): Remove, replace with ... (ui_out::ui_out): ... this constructor. (do_cleanup_table_end, make_cleanup_ui_out_tuple_begin_end, do_cleanup_end, make_cleanup_ui_out_tuple_begin_end, make_cleanup_ui_out_list_begin_end): Update fallouts of struct ui_out -> class ui_out change. * cli-out.c (cli_out_data): Remove. (cli_uiout_dtor): Remove. (cli_table_begin): Replace with ... (cli_ui_out::do_table_begin): ... this new method. (cli_table_body): Replace with ... (cli_ui_out::do_table_body): ... this new method. (cli_table_end): Replace with ... (cli_ui_out::do_table_end): ... this new method. (cli_table_header): Replace with ... (cli_ui_out::do_table_header): ... this new method. (cli_begin): Replace with ... (cli_ui_out::do_begin): ... this new method. (cli_end): Replace with ... (cli_ui_out::do_end): ... this new method. (cli_field_int): Replace with ... (cli_ui_out::do_field_int): ... this new method. (cli_field_skip): Replace with ... (cli_ui_out::do_field_skip): ... this new method. (cli_field_string): Replace with ... (cli_ui_out::do_field_string): ... this new method. (cli_field_fmt): Replace with ... (cli_ui_out::do_field_fmt): ... this new method. (cli_spaces): Replace with ... (cli_ui_out::do_spaces): ... this new method. (cli_text): Replace with ... (cli_ui_out::do_text): ... this new method. (cli_message): Replace with ... (cli_ui_out::do_message): ... this new method. (cli_wrap_hint): Replace with ... (cli_ui_out::do_wrap_hint): ... this new method. (cli_flush): Replace with ... (cli_ui_out::do_flush): ... this new method. (cli_redirect): Replace with ... (cli_ui_out::do_redirect): ... this new method. (out_field_fmt): Replace with ... (cli_ui_out::out_field_fmt): ... this new method. (field_separator): Replace with ... (cli_ui_out::field_separator): ... this new method. (cli_out_set_stream): Replace with ... (cli_ui_out::set_stream): ... this new method. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_ui_out_impl::cli_ui_out_impl): New constructor. (cli_ui_out_impl::~cli_ui_out_impl): New destructor. (cli_out_new): Change return type to cli_ui_out *, instantiate a cli_ui_out. * cli-out.h (cli_ui_out_data): Remove, replace with class cli_ui_out. (class cli_ui_out): New class. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_out_new): Change return type to cli_ui_out*. (cli_out_set_stream): Remove. * cli/cli-interp.c (struct cli_interp) <cli_uiout>: Change type to cli_ui_out*. (cli_interpreter_resume): Adapt. (cli_interpreter_exec): Adapt. * mi/mi-out.c (mi_ui_out_data, mi_out_data): Remove. (mi_ui_out_impl): Remove. (mi_table_begin): Replace with ... (mi_ui_out::do_table_begin): ... this. (mi_table_body): Replace with ... (mi_ui_out::do_table_body): ... this. (mi_table_end): Replace with ... (mi_ui_out::do_table_end): ... this. (mi_table_header): Replace with ... (mi_ui_out::do_table_header): ... this. (mi_begin): Replace with ... (mi_ui_out::do_begin): ... this. (mi_end): Replace with ... (mi_ui_out::do_end): ... this. (mi_field_int): Replace with ... (mi_ui_out::do_field_int): ... this. (mi_field_skip): Replace with ... (mi_ui_out::do_field_skip): ... this. (mi_field_string): Replace with ... (mi_ui_out::do_field_string): ... this. (mi_field_fmt): Replace with ... (mi_ui_out::do_field_fmt): ... this. (mi_spaces): Replace with ... (mi_ui_out::do_spaces): ... this. (mi_text): Replace with ... (mi_ui_out::do_text): ... this. (mi_message): Replace with ... (mi_ui_out::do_message): ... this. (mi_wrap_hint): Replace with ... (mi_ui_out::do_wrap_hint): ... this. (mi_flush): Replace with ... (mi_ui_out::do_flush): ... this. (mi_redirect): Replace with ... (mi_ui_out::do_redirect): (field_separator): Replace with ... (mi_ui_out::field_separator): (mi_open): Replace with ... (mi_ui_out::open): ... this. (mi_close): Replace with ... (mi_ui_out::close): ... this. (mi_out_rewind): Replace with ... (mi_ui_out::rewind): ... this. (mi_out_put): Replace with ... (mi_ui_out::put): ... this. (mi_version): Replace with ... (mi_ui_out::version): ... this. (mi_out_data_ctor): Replace with ... (mi_ui_out::mi_ui_out): ... this. (mi_out_data_dtor): Replace with ... (mi_ui_out::~mi_ui_out): ... this. (mi_out_new): Change return type to mi_ui_out*, instantiate an mi_ui_out object. (as_mi_ui_out): New function. (mi_version): Update fallouts of struct ui_out to class ui_out transition. (mi_out_put): Likewise. (mi_out_rewind): Likewise. * mi/mi-out.h (mi_out_new): Change return type to mi_ui_out*. * tui/tui-out.c (tui_ui_out_data, tui_out_data, tui_ui_out_impl): Remove. (tui_field_int): Replace with ... (tui_ui_out::do_field_int): ... this. (tui_field_string): Replace with ... (tui_ui_out::do_field_string): ... this. (tui_field_fmt): Replace with ... (tui_ui_out::do_field_fmt): ... this. (tui_text): Replace with ... (tui_ui_out::do_text): ... this. (tui_out_new): Change return type to tui_ui_out*, instantiate tui_ui_out object. (tui_ui_out::tui_ui_out): New. * tui/tui-out.h: New file. * tui/tui.h (tui_out_new): Move declaration to tui/tui-out.h. * tui/tui-io.c: Include tui/tui-out.h. (tui_old_uiout): Change type to cli_ui_out*. (tui_setup_io): Use dynamic_cast. * tui/tui-io.h (tui_old_uiout): Change type to cli_ui_out*. * tui/tui-interp.c (tui_resume): Adapt. * ada-lang.c (print_it_exception): Update fallouts of struct ui_out to class ui_out transition. (print_one_exception): Likewise. (print_mention_exception): Likewise. * ada-tasks.c (print_ada_task_info): Likewise. (info_task): Likewise. (task_command): Likewise. * auto-load.c (print_script): Likewise. (auto_load_info_scripts): Likewise. (info_auto_load_cmd): Likewise. * break-catch-sig.c (signal_catchpoint_print_one): Likewise. * break-catch-syscall.c (print_it_catch_syscall): Likewise. (print_one_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. (print_one_exception_catchpoint): Likewise. (print_one_detail_exception_catchpoint): Likewise. (print_mention_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): Likewise. (print_solib_event): Likewise. (watchpoint_check): Likewise. (wrap_indent_at_field): Likewise. (print_breakpoint_location): Likewise. (output_thread_groups): Likewise. (print_one_breakpoint_location): Likewise. (breakpoint_1): Likewise. (default_collect_info): Likewise. (watchpoints_info): Likewise. (print_it_catch_fork): Likewise. (print_one_catch_fork): Likewise. (print_it_catch_vfork): Likewise. (print_one_catch_vfork): Likewise. (print_it_catch_solib): Likewise. (print_one_catch_solib): Likewise. (print_it_catch_exec): Likewise. (print_one_catch_exec): Likewise. (mention): Likewise. (print_it_ranged_breakpoint): Likewise. (print_one_ranged_breakpoint): Likewise. (print_one_detail_ranged_breakpoint): Likewise. (print_mention_ranged_breakpoint): Likewise. (print_it_watchpoint): Likewise. (print_mention_watchpoint): Likewise. (print_it_masked_watchpoint): Likewise. (print_one_detail_masked_watchpoint): Likewise. (print_mention_masked_watchpoint): Likewise. (bkpt_print_it): Likewise. (tracepoint_print_one_detail): Likewise. (tracepoint_print_mention): Likewise. (update_static_tracepoint): Likewise. (tracepoints_info): Likewise. (save_breakpoints): Likewise. * cli/cli-cmds.c (complete_command): Likewise. * cli/cli-logging.c (set_logging_redirect): Likewise. (pop_output_files): Likewise. (handle_redirections): Likewise. * cli/cli-script.c (print_command_lines): Likewise. * cli/cli-setshow.c (do_show_command): Likewise. (cmd_show_list): Likewise. * cp-abi.c (list_cp_abis): Likewise. (show_cp_abi_cmd): Likewise. * darwin-nat-info.c (darwin_debug_regions_recurse): Likewise. * disasm.c (gdb_pretty_print_insn): Likewise. (do_mixed_source_and_assembly_deprecated): Likewise. (do_mixed_source_and_assembly): Likewise. * gdb_bfd.c (print_one_bfd): Likewise. (maintenance_info_bfds): Likewise. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Likewise. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Likewise. * i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Likewise. * i386-tdep.c (i386_mpx_print_bounds): Likewise. * infcmd.c (run_command_1): Likewise. (print_return_value_1): Likewise. * inferior.c (print_selected_inferior): Likewise. (print_inferior): Likewise. * infrun.c (print_end_stepping_range_reason): Likewise. (print_signal_exited_reason): Likewise. (print_exited_reason): Likewise. (print_signal_received_reason): Likewise. (print_no_history_reason): Likewise. * interps.c (interp_set): Likewise. * linespec.c (decode_line_full): Likewise. * linux-thread-db.c (info_auto_load_libthread_db): Likewise. * mi/mi-cmd-env.c (mi_cmd_env_pwd): Likewise. (mi_cmd_env_path): Likewise. (mi_cmd_env_dir): Likewise. (mi_cmd_inferior_tty_show): Likewise. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Likewise. (print_partial_file_name): Likewise. (mi_cmd_file_list_exec_source_files): Likewise. * mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions): Likewise. (mi_cmd_info_gdb_mi_command): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth): Likewise. (mi_cmd_stack_list_args): Likewise. (list_arg_or_local): Likewise. * mi/mi-cmd-var.c (print_varobj): Likewise. (mi_cmd_var_create): Likewise. (mi_cmd_var_delete): Likewise. (mi_cmd_var_set_format): Likewise. (mi_cmd_var_show_format): Likewise. (mi_cmd_var_info_num_children): Likewise. (mi_cmd_var_list_children): Likewise. (mi_cmd_var_info_type): Likewise. (mi_cmd_var_info_path_expression): Likewise. (mi_cmd_var_info_expression): Likewise. (mi_cmd_var_show_attributes): Likewise. (mi_cmd_var_evaluate_expression): Likewise. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. * mi/mi-interp.c (as_mi_interp): Likewise. (mi_on_normal_stop_1): Likewise. (mi_tsv_modified): Likewise. (mi_breakpoint_created): Likewise. (mi_breakpoint_modified): Likewise. (mi_solib_loaded): Likewise. (mi_solib_unloaded): Likewise. (mi_command_param_changed): Likewise. (mi_memory_changed): Likewise. (mi_user_selected_context_changed): Likewise. * mi/mi-main.c (print_one_inferior): Likewise. (output_cores): Likewise. (list_available_thread_groups): Likewise. (mi_cmd_data_list_register_names): Likewise. (mi_cmd_data_list_changed_registers): Likewise. (output_register): Likewise. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_list_features): Likewise. (mi_cmd_list_target_features): Likewise. (mi_cmd_add_inferior): Likewise. (mi_execute_command): Likewise. (mi_load_progress): Likewise. (print_variable_or_computed): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Likewise. * osdata.c (info_osdata_command): Likewise. * probe.c (gen_ui_out_table_header_info): Likewise. (print_ui_out_not_applicables): Likewise. (print_ui_out_info): Likewise. (info_probes_for_ops): Likewise. (enable_probes_command): Likewise. (disable_probes_command): Likewise. * progspace.c (print_program_space): Likewise. * python/py-breakpoint.c (bppy_get_commands): Likewise. * python/py-framefilter.c (py_print_type): Likewise. (py_print_value): Likewise. (py_print_single_arg): Likewise. (enumerate_args): Likewise. (enumerate_locals): Likewise. (py_print_args): Likewise. (py_print_frame): Likewise. * record-btrace.c (btrace_ui_out_decode_error): Likewise. (btrace_call_history_insn_range): Likewise. (btrace_call_history_src_line): Likewise. (btrace_call_history): Likewise. * remote.c (show_remote_cmd): Likewise. * skip.c (skip_info): Likewise. * solib.c (info_sharedlibrary_command): Likewise. * source.c (print_source_lines_base): Likewise. * spu-tdep.c (info_spu_event_command): Likewise. (info_spu_signal_command): Likewise. (info_spu_mailbox_list): Likewise. (info_spu_dma_cmdlist): Likewise. (info_spu_dma_command): Likewise. (info_spu_proxydma_command): Likewise. * stack.c (print_stack_frame): Likewise. (print_frame_arg): Likewise. (read_frame_arg): Likewise. (print_frame_args): Likewise. (print_frame_info): Likewise. (print_frame): Likewise. * symfile.c (load_progress): Likewise. (generic_load): Likewise. (print_transfer_performance): Likewise. * thread.c (do_captured_list_thread_ids): Likewise. (print_thread_info_1): Likewise. (restore_selected_frame): Likewise. (do_captured_thread_select): Likewise. (print_selected_thread_frame): Likewise. * top.c (execute_command_to_string): Likewise. * tracepoint.c (tvariables_info_1): Likewise. (trace_status_mi): Likewise. (tfind_1): Likewise. (print_one_static_tracepoint_marker): Likewise. (info_static_tracepoint_markers_command): Likewise. * utils.c (do_ui_out_redirect_pop): Likewise. (fputs_maybe_filtered): Likewise.
2016-12-22 22:17:31 +01:00
uiout->table_header (10, ui_left, "start", "Start");
uiout->table_header (10, ui_left, "end", "End");
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
}
else
{
Class-ify ui_out This patch finalizes the C++ conversion of the ui-out subsystem, by turning the ui_out and ui_out_impl structures into a single class hierarchy. ui_out functions are turned into virtual methods of that new class, so as a result there are a lot of call sites to update. In the previous version of the patchset, there were separate ui_out and ui_out_impl classes, but it wasn't really useful and added boilerplate. In this version there is simply an ui_out base class that is extended for CLI, TUI and MI. It's a bit hard to maintain a ChangeLog for such a big patch, I did my best but I'm sure there are some missing or outdated info in there... gdb/ChangeLog: * ui-out.h (ui_out_begin, ui_out_end, ui_out_table_header, ui_out_table_body, ui_out_field_int, ui_out_field_fmt_int, ui_out_field_core_addr, ui_out_field_string, ui_out_field_stream, ui_out_field_fmt, ui_out_field_skip, ui_out_spaces, ui_out_text, ui_out_message, ui_out_wrap_hint, ui_out_flush, ui_out_test_flags, ui_out_query_field, ui_out_is_mi_like_p, ui_out_redirect): Remove, replace with a method in class ui_out. (table_begin_ftype): Remove, replace with pure virtual method in class ui_out. (table_body_ftype): Likewise. (table_end_ftype): Likewise. (table_header_ftype): Likewise. (ui_out_begin_ftype): Likewise. (ui_out_end_ftype): Likewise. (field_int_ftype): Likewise. (field_skip_ftype): Likewise. (field_string_ftype): Likewise. (field_fmt_ftype): Likewise. (spaces_ftype): Likewise. (text_ftype): Likewise. (message_ftype): Likewise. (wrap_hint_ftype): Likewise. (flush_ftype): Likewise. (redirect_ftype): Likewise. (data_destroy_ftype): Likewise. (struct ui_out_impl): Remove, replace with class ui_out. (ui_out_new): Remove. (class ui_out): New class. * ui-out.c (struct ui_out): Remove, replaced with class ui_out. (current_level): Remove, replace with ui_out method. (push_level): Likewise. (pop_level): Likewise. (uo_table_begin, uo_table_body, uo_table_end, uo_table_header, uo_begin, uo_end, uo_field_int, uo_field_skip, uo_field_fmt, uo_spaces, uo_text, uo_message, uo_wrap_hint, uo_flush, uo_redirect, uo_field_string): Remove. (ui_out_table_begin): Replace with ... (ui_out::table_begin): ... this. (ui_out_table_body): Replace with ... (ui_out::table_body): ... this. (ui_out_table_end): Replace with ... (ui_out::table_end): ... this. (ui_out_table_header): Replace with ... (ui_out::table_header): ... this. (ui_out_begin): Replace with ... (ui_out::begin): ... this. (ui_out_end): Replace with ... (ui_out::end): ... this. (ui_out_field_int): Replace with ... (ui_out::field_int): ... this. (ui_out_field_fmt_int): Replace with ... (ui_out::field_fmt_int): ... this. (ui_out_field_core_addr): Replace with ... (ui_out::field_core_addr): ... this. (ui_out_field_stream): Replace with ... (ui_out::field_stream): ... this. (ui_out_field_skip): Replace with ... (ui_out::field_skip): ... this. (ui_out_field_string): Replace with ... (ui_out::field_string): ... this. (ui_out_field_fmt): Replace with ... (ui_out::field_fmt): ... this. (ui_out_spaces): Replace with ... (ui_out::spaces): ... this. (ui_out_text): Replace with ... (ui_out::text): ... this. (ui_out_message): Replace with ... (ui_out::message): ... this. (ui_out_wrap_hint): Replace with ... (ui_out::wrap_hint): ... this. (ui_out_flush): Replace with ... (ui_out::flush): ... this. (ui_out_redirect): Replace with ... (ui_out::redirect): ... this. (ui_out_test_flags): Replace with ... (ui_out::test_flags): ... this. (ui_out_is_mi_like_p): Replace with ... (ui_out::is_mi_like_p): ... this. (verify_field): Replace with ... (ui_out::verify_field): ... this. (ui_out_query_field): Replace with ... (ui_out::query_table_field): ... this. (ui_out_data): Remove. (ui_out_new): Remove, replace with ... (ui_out::ui_out): ... this constructor. (do_cleanup_table_end, make_cleanup_ui_out_tuple_begin_end, do_cleanup_end, make_cleanup_ui_out_tuple_begin_end, make_cleanup_ui_out_list_begin_end): Update fallouts of struct ui_out -> class ui_out change. * cli-out.c (cli_out_data): Remove. (cli_uiout_dtor): Remove. (cli_table_begin): Replace with ... (cli_ui_out::do_table_begin): ... this new method. (cli_table_body): Replace with ... (cli_ui_out::do_table_body): ... this new method. (cli_table_end): Replace with ... (cli_ui_out::do_table_end): ... this new method. (cli_table_header): Replace with ... (cli_ui_out::do_table_header): ... this new method. (cli_begin): Replace with ... (cli_ui_out::do_begin): ... this new method. (cli_end): Replace with ... (cli_ui_out::do_end): ... this new method. (cli_field_int): Replace with ... (cli_ui_out::do_field_int): ... this new method. (cli_field_skip): Replace with ... (cli_ui_out::do_field_skip): ... this new method. (cli_field_string): Replace with ... (cli_ui_out::do_field_string): ... this new method. (cli_field_fmt): Replace with ... (cli_ui_out::do_field_fmt): ... this new method. (cli_spaces): Replace with ... (cli_ui_out::do_spaces): ... this new method. (cli_text): Replace with ... (cli_ui_out::do_text): ... this new method. (cli_message): Replace with ... (cli_ui_out::do_message): ... this new method. (cli_wrap_hint): Replace with ... (cli_ui_out::do_wrap_hint): ... this new method. (cli_flush): Replace with ... (cli_ui_out::do_flush): ... this new method. (cli_redirect): Replace with ... (cli_ui_out::do_redirect): ... this new method. (out_field_fmt): Replace with ... (cli_ui_out::out_field_fmt): ... this new method. (field_separator): Replace with ... (cli_ui_out::field_separator): ... this new method. (cli_out_set_stream): Replace with ... (cli_ui_out::set_stream): ... this new method. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_ui_out_impl::cli_ui_out_impl): New constructor. (cli_ui_out_impl::~cli_ui_out_impl): New destructor. (cli_out_new): Change return type to cli_ui_out *, instantiate a cli_ui_out. * cli-out.h (cli_ui_out_data): Remove, replace with class cli_ui_out. (class cli_ui_out): New class. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_out_new): Change return type to cli_ui_out*. (cli_out_set_stream): Remove. * cli/cli-interp.c (struct cli_interp) <cli_uiout>: Change type to cli_ui_out*. (cli_interpreter_resume): Adapt. (cli_interpreter_exec): Adapt. * mi/mi-out.c (mi_ui_out_data, mi_out_data): Remove. (mi_ui_out_impl): Remove. (mi_table_begin): Replace with ... (mi_ui_out::do_table_begin): ... this. (mi_table_body): Replace with ... (mi_ui_out::do_table_body): ... this. (mi_table_end): Replace with ... (mi_ui_out::do_table_end): ... this. (mi_table_header): Replace with ... (mi_ui_out::do_table_header): ... this. (mi_begin): Replace with ... (mi_ui_out::do_begin): ... this. (mi_end): Replace with ... (mi_ui_out::do_end): ... this. (mi_field_int): Replace with ... (mi_ui_out::do_field_int): ... this. (mi_field_skip): Replace with ... (mi_ui_out::do_field_skip): ... this. (mi_field_string): Replace with ... (mi_ui_out::do_field_string): ... this. (mi_field_fmt): Replace with ... (mi_ui_out::do_field_fmt): ... this. (mi_spaces): Replace with ... (mi_ui_out::do_spaces): ... this. (mi_text): Replace with ... (mi_ui_out::do_text): ... this. (mi_message): Replace with ... (mi_ui_out::do_message): ... this. (mi_wrap_hint): Replace with ... (mi_ui_out::do_wrap_hint): ... this. (mi_flush): Replace with ... (mi_ui_out::do_flush): ... this. (mi_redirect): Replace with ... (mi_ui_out::do_redirect): (field_separator): Replace with ... (mi_ui_out::field_separator): (mi_open): Replace with ... (mi_ui_out::open): ... this. (mi_close): Replace with ... (mi_ui_out::close): ... this. (mi_out_rewind): Replace with ... (mi_ui_out::rewind): ... this. (mi_out_put): Replace with ... (mi_ui_out::put): ... this. (mi_version): Replace with ... (mi_ui_out::version): ... this. (mi_out_data_ctor): Replace with ... (mi_ui_out::mi_ui_out): ... this. (mi_out_data_dtor): Replace with ... (mi_ui_out::~mi_ui_out): ... this. (mi_out_new): Change return type to mi_ui_out*, instantiate an mi_ui_out object. (as_mi_ui_out): New function. (mi_version): Update fallouts of struct ui_out to class ui_out transition. (mi_out_put): Likewise. (mi_out_rewind): Likewise. * mi/mi-out.h (mi_out_new): Change return type to mi_ui_out*. * tui/tui-out.c (tui_ui_out_data, tui_out_data, tui_ui_out_impl): Remove. (tui_field_int): Replace with ... (tui_ui_out::do_field_int): ... this. (tui_field_string): Replace with ... (tui_ui_out::do_field_string): ... this. (tui_field_fmt): Replace with ... (tui_ui_out::do_field_fmt): ... this. (tui_text): Replace with ... (tui_ui_out::do_text): ... this. (tui_out_new): Change return type to tui_ui_out*, instantiate tui_ui_out object. (tui_ui_out::tui_ui_out): New. * tui/tui-out.h: New file. * tui/tui.h (tui_out_new): Move declaration to tui/tui-out.h. * tui/tui-io.c: Include tui/tui-out.h. (tui_old_uiout): Change type to cli_ui_out*. (tui_setup_io): Use dynamic_cast. * tui/tui-io.h (tui_old_uiout): Change type to cli_ui_out*. * tui/tui-interp.c (tui_resume): Adapt. * ada-lang.c (print_it_exception): Update fallouts of struct ui_out to class ui_out transition. (print_one_exception): Likewise. (print_mention_exception): Likewise. * ada-tasks.c (print_ada_task_info): Likewise. (info_task): Likewise. (task_command): Likewise. * auto-load.c (print_script): Likewise. (auto_load_info_scripts): Likewise. (info_auto_load_cmd): Likewise. * break-catch-sig.c (signal_catchpoint_print_one): Likewise. * break-catch-syscall.c (print_it_catch_syscall): Likewise. (print_one_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. (print_one_exception_catchpoint): Likewise. (print_one_detail_exception_catchpoint): Likewise. (print_mention_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): Likewise. (print_solib_event): Likewise. (watchpoint_check): Likewise. (wrap_indent_at_field): Likewise. (print_breakpoint_location): Likewise. (output_thread_groups): Likewise. (print_one_breakpoint_location): Likewise. (breakpoint_1): Likewise. (default_collect_info): Likewise. (watchpoints_info): Likewise. (print_it_catch_fork): Likewise. (print_one_catch_fork): Likewise. (print_it_catch_vfork): Likewise. (print_one_catch_vfork): Likewise. (print_it_catch_solib): Likewise. (print_one_catch_solib): Likewise. (print_it_catch_exec): Likewise. (print_one_catch_exec): Likewise. (mention): Likewise. (print_it_ranged_breakpoint): Likewise. (print_one_ranged_breakpoint): Likewise. (print_one_detail_ranged_breakpoint): Likewise. (print_mention_ranged_breakpoint): Likewise. (print_it_watchpoint): Likewise. (print_mention_watchpoint): Likewise. (print_it_masked_watchpoint): Likewise. (print_one_detail_masked_watchpoint): Likewise. (print_mention_masked_watchpoint): Likewise. (bkpt_print_it): Likewise. (tracepoint_print_one_detail): Likewise. (tracepoint_print_mention): Likewise. (update_static_tracepoint): Likewise. (tracepoints_info): Likewise. (save_breakpoints): Likewise. * cli/cli-cmds.c (complete_command): Likewise. * cli/cli-logging.c (set_logging_redirect): Likewise. (pop_output_files): Likewise. (handle_redirections): Likewise. * cli/cli-script.c (print_command_lines): Likewise. * cli/cli-setshow.c (do_show_command): Likewise. (cmd_show_list): Likewise. * cp-abi.c (list_cp_abis): Likewise. (show_cp_abi_cmd): Likewise. * darwin-nat-info.c (darwin_debug_regions_recurse): Likewise. * disasm.c (gdb_pretty_print_insn): Likewise. (do_mixed_source_and_assembly_deprecated): Likewise. (do_mixed_source_and_assembly): Likewise. * gdb_bfd.c (print_one_bfd): Likewise. (maintenance_info_bfds): Likewise. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Likewise. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Likewise. * i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Likewise. * i386-tdep.c (i386_mpx_print_bounds): Likewise. * infcmd.c (run_command_1): Likewise. (print_return_value_1): Likewise. * inferior.c (print_selected_inferior): Likewise. (print_inferior): Likewise. * infrun.c (print_end_stepping_range_reason): Likewise. (print_signal_exited_reason): Likewise. (print_exited_reason): Likewise. (print_signal_received_reason): Likewise. (print_no_history_reason): Likewise. * interps.c (interp_set): Likewise. * linespec.c (decode_line_full): Likewise. * linux-thread-db.c (info_auto_load_libthread_db): Likewise. * mi/mi-cmd-env.c (mi_cmd_env_pwd): Likewise. (mi_cmd_env_path): Likewise. (mi_cmd_env_dir): Likewise. (mi_cmd_inferior_tty_show): Likewise. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Likewise. (print_partial_file_name): Likewise. (mi_cmd_file_list_exec_source_files): Likewise. * mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions): Likewise. (mi_cmd_info_gdb_mi_command): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth): Likewise. (mi_cmd_stack_list_args): Likewise. (list_arg_or_local): Likewise. * mi/mi-cmd-var.c (print_varobj): Likewise. (mi_cmd_var_create): Likewise. (mi_cmd_var_delete): Likewise. (mi_cmd_var_set_format): Likewise. (mi_cmd_var_show_format): Likewise. (mi_cmd_var_info_num_children): Likewise. (mi_cmd_var_list_children): Likewise. (mi_cmd_var_info_type): Likewise. (mi_cmd_var_info_path_expression): Likewise. (mi_cmd_var_info_expression): Likewise. (mi_cmd_var_show_attributes): Likewise. (mi_cmd_var_evaluate_expression): Likewise. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. * mi/mi-interp.c (as_mi_interp): Likewise. (mi_on_normal_stop_1): Likewise. (mi_tsv_modified): Likewise. (mi_breakpoint_created): Likewise. (mi_breakpoint_modified): Likewise. (mi_solib_loaded): Likewise. (mi_solib_unloaded): Likewise. (mi_command_param_changed): Likewise. (mi_memory_changed): Likewise. (mi_user_selected_context_changed): Likewise. * mi/mi-main.c (print_one_inferior): Likewise. (output_cores): Likewise. (list_available_thread_groups): Likewise. (mi_cmd_data_list_register_names): Likewise. (mi_cmd_data_list_changed_registers): Likewise. (output_register): Likewise. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_list_features): Likewise. (mi_cmd_list_target_features): Likewise. (mi_cmd_add_inferior): Likewise. (mi_execute_command): Likewise. (mi_load_progress): Likewise. (print_variable_or_computed): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Likewise. * osdata.c (info_osdata_command): Likewise. * probe.c (gen_ui_out_table_header_info): Likewise. (print_ui_out_not_applicables): Likewise. (print_ui_out_info): Likewise. (info_probes_for_ops): Likewise. (enable_probes_command): Likewise. (disable_probes_command): Likewise. * progspace.c (print_program_space): Likewise. * python/py-breakpoint.c (bppy_get_commands): Likewise. * python/py-framefilter.c (py_print_type): Likewise. (py_print_value): Likewise. (py_print_single_arg): Likewise. (enumerate_args): Likewise. (enumerate_locals): Likewise. (py_print_args): Likewise. (py_print_frame): Likewise. * record-btrace.c (btrace_ui_out_decode_error): Likewise. (btrace_call_history_insn_range): Likewise. (btrace_call_history_src_line): Likewise. (btrace_call_history): Likewise. * remote.c (show_remote_cmd): Likewise. * skip.c (skip_info): Likewise. * solib.c (info_sharedlibrary_command): Likewise. * source.c (print_source_lines_base): Likewise. * spu-tdep.c (info_spu_event_command): Likewise. (info_spu_signal_command): Likewise. (info_spu_mailbox_list): Likewise. (info_spu_dma_cmdlist): Likewise. (info_spu_dma_command): Likewise. (info_spu_proxydma_command): Likewise. * stack.c (print_stack_frame): Likewise. (print_frame_arg): Likewise. (read_frame_arg): Likewise. (print_frame_args): Likewise. (print_frame_info): Likewise. (print_frame): Likewise. * symfile.c (load_progress): Likewise. (generic_load): Likewise. (print_transfer_performance): Likewise. * thread.c (do_captured_list_thread_ids): Likewise. (print_thread_info_1): Likewise. (restore_selected_frame): Likewise. (do_captured_thread_select): Likewise. (print_selected_thread_frame): Likewise. * top.c (execute_command_to_string): Likewise. * tracepoint.c (tvariables_info_1): Likewise. (trace_status_mi): Likewise. (tfind_1): Likewise. (print_one_static_tracepoint_marker): Likewise. (info_static_tracepoint_markers_command): Likewise. * utils.c (do_ui_out_redirect_pop): Likewise. (fputs_maybe_filtered): Likewise.
2016-12-22 22:17:31 +01:00
uiout->table_header (18, ui_left, "start", "Start");
uiout->table_header (18, ui_left, "end", "End");
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
}
Class-ify ui_out This patch finalizes the C++ conversion of the ui-out subsystem, by turning the ui_out and ui_out_impl structures into a single class hierarchy. ui_out functions are turned into virtual methods of that new class, so as a result there are a lot of call sites to update. In the previous version of the patchset, there were separate ui_out and ui_out_impl classes, but it wasn't really useful and added boilerplate. In this version there is simply an ui_out base class that is extended for CLI, TUI and MI. It's a bit hard to maintain a ChangeLog for such a big patch, I did my best but I'm sure there are some missing or outdated info in there... gdb/ChangeLog: * ui-out.h (ui_out_begin, ui_out_end, ui_out_table_header, ui_out_table_body, ui_out_field_int, ui_out_field_fmt_int, ui_out_field_core_addr, ui_out_field_string, ui_out_field_stream, ui_out_field_fmt, ui_out_field_skip, ui_out_spaces, ui_out_text, ui_out_message, ui_out_wrap_hint, ui_out_flush, ui_out_test_flags, ui_out_query_field, ui_out_is_mi_like_p, ui_out_redirect): Remove, replace with a method in class ui_out. (table_begin_ftype): Remove, replace with pure virtual method in class ui_out. (table_body_ftype): Likewise. (table_end_ftype): Likewise. (table_header_ftype): Likewise. (ui_out_begin_ftype): Likewise. (ui_out_end_ftype): Likewise. (field_int_ftype): Likewise. (field_skip_ftype): Likewise. (field_string_ftype): Likewise. (field_fmt_ftype): Likewise. (spaces_ftype): Likewise. (text_ftype): Likewise. (message_ftype): Likewise. (wrap_hint_ftype): Likewise. (flush_ftype): Likewise. (redirect_ftype): Likewise. (data_destroy_ftype): Likewise. (struct ui_out_impl): Remove, replace with class ui_out. (ui_out_new): Remove. (class ui_out): New class. * ui-out.c (struct ui_out): Remove, replaced with class ui_out. (current_level): Remove, replace with ui_out method. (push_level): Likewise. (pop_level): Likewise. (uo_table_begin, uo_table_body, uo_table_end, uo_table_header, uo_begin, uo_end, uo_field_int, uo_field_skip, uo_field_fmt, uo_spaces, uo_text, uo_message, uo_wrap_hint, uo_flush, uo_redirect, uo_field_string): Remove. (ui_out_table_begin): Replace with ... (ui_out::table_begin): ... this. (ui_out_table_body): Replace with ... (ui_out::table_body): ... this. (ui_out_table_end): Replace with ... (ui_out::table_end): ... this. (ui_out_table_header): Replace with ... (ui_out::table_header): ... this. (ui_out_begin): Replace with ... (ui_out::begin): ... this. (ui_out_end): Replace with ... (ui_out::end): ... this. (ui_out_field_int): Replace with ... (ui_out::field_int): ... this. (ui_out_field_fmt_int): Replace with ... (ui_out::field_fmt_int): ... this. (ui_out_field_core_addr): Replace with ... (ui_out::field_core_addr): ... this. (ui_out_field_stream): Replace with ... (ui_out::field_stream): ... this. (ui_out_field_skip): Replace with ... (ui_out::field_skip): ... this. (ui_out_field_string): Replace with ... (ui_out::field_string): ... this. (ui_out_field_fmt): Replace with ... (ui_out::field_fmt): ... this. (ui_out_spaces): Replace with ... (ui_out::spaces): ... this. (ui_out_text): Replace with ... (ui_out::text): ... this. (ui_out_message): Replace with ... (ui_out::message): ... this. (ui_out_wrap_hint): Replace with ... (ui_out::wrap_hint): ... this. (ui_out_flush): Replace with ... (ui_out::flush): ... this. (ui_out_redirect): Replace with ... (ui_out::redirect): ... this. (ui_out_test_flags): Replace with ... (ui_out::test_flags): ... this. (ui_out_is_mi_like_p): Replace with ... (ui_out::is_mi_like_p): ... this. (verify_field): Replace with ... (ui_out::verify_field): ... this. (ui_out_query_field): Replace with ... (ui_out::query_table_field): ... this. (ui_out_data): Remove. (ui_out_new): Remove, replace with ... (ui_out::ui_out): ... this constructor. (do_cleanup_table_end, make_cleanup_ui_out_tuple_begin_end, do_cleanup_end, make_cleanup_ui_out_tuple_begin_end, make_cleanup_ui_out_list_begin_end): Update fallouts of struct ui_out -> class ui_out change. * cli-out.c (cli_out_data): Remove. (cli_uiout_dtor): Remove. (cli_table_begin): Replace with ... (cli_ui_out::do_table_begin): ... this new method. (cli_table_body): Replace with ... (cli_ui_out::do_table_body): ... this new method. (cli_table_end): Replace with ... (cli_ui_out::do_table_end): ... this new method. (cli_table_header): Replace with ... (cli_ui_out::do_table_header): ... this new method. (cli_begin): Replace with ... (cli_ui_out::do_begin): ... this new method. (cli_end): Replace with ... (cli_ui_out::do_end): ... this new method. (cli_field_int): Replace with ... (cli_ui_out::do_field_int): ... this new method. (cli_field_skip): Replace with ... (cli_ui_out::do_field_skip): ... this new method. (cli_field_string): Replace with ... (cli_ui_out::do_field_string): ... this new method. (cli_field_fmt): Replace with ... (cli_ui_out::do_field_fmt): ... this new method. (cli_spaces): Replace with ... (cli_ui_out::do_spaces): ... this new method. (cli_text): Replace with ... (cli_ui_out::do_text): ... this new method. (cli_message): Replace with ... (cli_ui_out::do_message): ... this new method. (cli_wrap_hint): Replace with ... (cli_ui_out::do_wrap_hint): ... this new method. (cli_flush): Replace with ... (cli_ui_out::do_flush): ... this new method. (cli_redirect): Replace with ... (cli_ui_out::do_redirect): ... this new method. (out_field_fmt): Replace with ... (cli_ui_out::out_field_fmt): ... this new method. (field_separator): Replace with ... (cli_ui_out::field_separator): ... this new method. (cli_out_set_stream): Replace with ... (cli_ui_out::set_stream): ... this new method. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_ui_out_impl::cli_ui_out_impl): New constructor. (cli_ui_out_impl::~cli_ui_out_impl): New destructor. (cli_out_new): Change return type to cli_ui_out *, instantiate a cli_ui_out. * cli-out.h (cli_ui_out_data): Remove, replace with class cli_ui_out. (class cli_ui_out): New class. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_out_new): Change return type to cli_ui_out*. (cli_out_set_stream): Remove. * cli/cli-interp.c (struct cli_interp) <cli_uiout>: Change type to cli_ui_out*. (cli_interpreter_resume): Adapt. (cli_interpreter_exec): Adapt. * mi/mi-out.c (mi_ui_out_data, mi_out_data): Remove. (mi_ui_out_impl): Remove. (mi_table_begin): Replace with ... (mi_ui_out::do_table_begin): ... this. (mi_table_body): Replace with ... (mi_ui_out::do_table_body): ... this. (mi_table_end): Replace with ... (mi_ui_out::do_table_end): ... this. (mi_table_header): Replace with ... (mi_ui_out::do_table_header): ... this. (mi_begin): Replace with ... (mi_ui_out::do_begin): ... this. (mi_end): Replace with ... (mi_ui_out::do_end): ... this. (mi_field_int): Replace with ... (mi_ui_out::do_field_int): ... this. (mi_field_skip): Replace with ... (mi_ui_out::do_field_skip): ... this. (mi_field_string): Replace with ... (mi_ui_out::do_field_string): ... this. (mi_field_fmt): Replace with ... (mi_ui_out::do_field_fmt): ... this. (mi_spaces): Replace with ... (mi_ui_out::do_spaces): ... this. (mi_text): Replace with ... (mi_ui_out::do_text): ... this. (mi_message): Replace with ... (mi_ui_out::do_message): ... this. (mi_wrap_hint): Replace with ... (mi_ui_out::do_wrap_hint): ... this. (mi_flush): Replace with ... (mi_ui_out::do_flush): ... this. (mi_redirect): Replace with ... (mi_ui_out::do_redirect): (field_separator): Replace with ... (mi_ui_out::field_separator): (mi_open): Replace with ... (mi_ui_out::open): ... this. (mi_close): Replace with ... (mi_ui_out::close): ... this. (mi_out_rewind): Replace with ... (mi_ui_out::rewind): ... this. (mi_out_put): Replace with ... (mi_ui_out::put): ... this. (mi_version): Replace with ... (mi_ui_out::version): ... this. (mi_out_data_ctor): Replace with ... (mi_ui_out::mi_ui_out): ... this. (mi_out_data_dtor): Replace with ... (mi_ui_out::~mi_ui_out): ... this. (mi_out_new): Change return type to mi_ui_out*, instantiate an mi_ui_out object. (as_mi_ui_out): New function. (mi_version): Update fallouts of struct ui_out to class ui_out transition. (mi_out_put): Likewise. (mi_out_rewind): Likewise. * mi/mi-out.h (mi_out_new): Change return type to mi_ui_out*. * tui/tui-out.c (tui_ui_out_data, tui_out_data, tui_ui_out_impl): Remove. (tui_field_int): Replace with ... (tui_ui_out::do_field_int): ... this. (tui_field_string): Replace with ... (tui_ui_out::do_field_string): ... this. (tui_field_fmt): Replace with ... (tui_ui_out::do_field_fmt): ... this. (tui_text): Replace with ... (tui_ui_out::do_text): ... this. (tui_out_new): Change return type to tui_ui_out*, instantiate tui_ui_out object. (tui_ui_out::tui_ui_out): New. * tui/tui-out.h: New file. * tui/tui.h (tui_out_new): Move declaration to tui/tui-out.h. * tui/tui-io.c: Include tui/tui-out.h. (tui_old_uiout): Change type to cli_ui_out*. (tui_setup_io): Use dynamic_cast. * tui/tui-io.h (tui_old_uiout): Change type to cli_ui_out*. * tui/tui-interp.c (tui_resume): Adapt. * ada-lang.c (print_it_exception): Update fallouts of struct ui_out to class ui_out transition. (print_one_exception): Likewise. (print_mention_exception): Likewise. * ada-tasks.c (print_ada_task_info): Likewise. (info_task): Likewise. (task_command): Likewise. * auto-load.c (print_script): Likewise. (auto_load_info_scripts): Likewise. (info_auto_load_cmd): Likewise. * break-catch-sig.c (signal_catchpoint_print_one): Likewise. * break-catch-syscall.c (print_it_catch_syscall): Likewise. (print_one_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. (print_one_exception_catchpoint): Likewise. (print_one_detail_exception_catchpoint): Likewise. (print_mention_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): Likewise. (print_solib_event): Likewise. (watchpoint_check): Likewise. (wrap_indent_at_field): Likewise. (print_breakpoint_location): Likewise. (output_thread_groups): Likewise. (print_one_breakpoint_location): Likewise. (breakpoint_1): Likewise. (default_collect_info): Likewise. (watchpoints_info): Likewise. (print_it_catch_fork): Likewise. (print_one_catch_fork): Likewise. (print_it_catch_vfork): Likewise. (print_one_catch_vfork): Likewise. (print_it_catch_solib): Likewise. (print_one_catch_solib): Likewise. (print_it_catch_exec): Likewise. (print_one_catch_exec): Likewise. (mention): Likewise. (print_it_ranged_breakpoint): Likewise. (print_one_ranged_breakpoint): Likewise. (print_one_detail_ranged_breakpoint): Likewise. (print_mention_ranged_breakpoint): Likewise. (print_it_watchpoint): Likewise. (print_mention_watchpoint): Likewise. (print_it_masked_watchpoint): Likewise. (print_one_detail_masked_watchpoint): Likewise. (print_mention_masked_watchpoint): Likewise. (bkpt_print_it): Likewise. (tracepoint_print_one_detail): Likewise. (tracepoint_print_mention): Likewise. (update_static_tracepoint): Likewise. (tracepoints_info): Likewise. (save_breakpoints): Likewise. * cli/cli-cmds.c (complete_command): Likewise. * cli/cli-logging.c (set_logging_redirect): Likewise. (pop_output_files): Likewise. (handle_redirections): Likewise. * cli/cli-script.c (print_command_lines): Likewise. * cli/cli-setshow.c (do_show_command): Likewise. (cmd_show_list): Likewise. * cp-abi.c (list_cp_abis): Likewise. (show_cp_abi_cmd): Likewise. * darwin-nat-info.c (darwin_debug_regions_recurse): Likewise. * disasm.c (gdb_pretty_print_insn): Likewise. (do_mixed_source_and_assembly_deprecated): Likewise. (do_mixed_source_and_assembly): Likewise. * gdb_bfd.c (print_one_bfd): Likewise. (maintenance_info_bfds): Likewise. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Likewise. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Likewise. * i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Likewise. * i386-tdep.c (i386_mpx_print_bounds): Likewise. * infcmd.c (run_command_1): Likewise. (print_return_value_1): Likewise. * inferior.c (print_selected_inferior): Likewise. (print_inferior): Likewise. * infrun.c (print_end_stepping_range_reason): Likewise. (print_signal_exited_reason): Likewise. (print_exited_reason): Likewise. (print_signal_received_reason): Likewise. (print_no_history_reason): Likewise. * interps.c (interp_set): Likewise. * linespec.c (decode_line_full): Likewise. * linux-thread-db.c (info_auto_load_libthread_db): Likewise. * mi/mi-cmd-env.c (mi_cmd_env_pwd): Likewise. (mi_cmd_env_path): Likewise. (mi_cmd_env_dir): Likewise. (mi_cmd_inferior_tty_show): Likewise. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Likewise. (print_partial_file_name): Likewise. (mi_cmd_file_list_exec_source_files): Likewise. * mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions): Likewise. (mi_cmd_info_gdb_mi_command): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth): Likewise. (mi_cmd_stack_list_args): Likewise. (list_arg_or_local): Likewise. * mi/mi-cmd-var.c (print_varobj): Likewise. (mi_cmd_var_create): Likewise. (mi_cmd_var_delete): Likewise. (mi_cmd_var_set_format): Likewise. (mi_cmd_var_show_format): Likewise. (mi_cmd_var_info_num_children): Likewise. (mi_cmd_var_list_children): Likewise. (mi_cmd_var_info_type): Likewise. (mi_cmd_var_info_path_expression): Likewise. (mi_cmd_var_info_expression): Likewise. (mi_cmd_var_show_attributes): Likewise. (mi_cmd_var_evaluate_expression): Likewise. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. * mi/mi-interp.c (as_mi_interp): Likewise. (mi_on_normal_stop_1): Likewise. (mi_tsv_modified): Likewise. (mi_breakpoint_created): Likewise. (mi_breakpoint_modified): Likewise. (mi_solib_loaded): Likewise. (mi_solib_unloaded): Likewise. (mi_command_param_changed): Likewise. (mi_memory_changed): Likewise. (mi_user_selected_context_changed): Likewise. * mi/mi-main.c (print_one_inferior): Likewise. (output_cores): Likewise. (list_available_thread_groups): Likewise. (mi_cmd_data_list_register_names): Likewise. (mi_cmd_data_list_changed_registers): Likewise. (output_register): Likewise. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_list_features): Likewise. (mi_cmd_list_target_features): Likewise. (mi_cmd_add_inferior): Likewise. (mi_execute_command): Likewise. (mi_load_progress): Likewise. (print_variable_or_computed): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Likewise. * osdata.c (info_osdata_command): Likewise. * probe.c (gen_ui_out_table_header_info): Likewise. (print_ui_out_not_applicables): Likewise. (print_ui_out_info): Likewise. (info_probes_for_ops): Likewise. (enable_probes_command): Likewise. (disable_probes_command): Likewise. * progspace.c (print_program_space): Likewise. * python/py-breakpoint.c (bppy_get_commands): Likewise. * python/py-framefilter.c (py_print_type): Likewise. (py_print_value): Likewise. (py_print_single_arg): Likewise. (enumerate_args): Likewise. (enumerate_locals): Likewise. (py_print_args): Likewise. (py_print_frame): Likewise. * record-btrace.c (btrace_ui_out_decode_error): Likewise. (btrace_call_history_insn_range): Likewise. (btrace_call_history_src_line): Likewise. (btrace_call_history): Likewise. * remote.c (show_remote_cmd): Likewise. * skip.c (skip_info): Likewise. * solib.c (info_sharedlibrary_command): Likewise. * source.c (print_source_lines_base): Likewise. * spu-tdep.c (info_spu_event_command): Likewise. (info_spu_signal_command): Likewise. (info_spu_mailbox_list): Likewise. (info_spu_dma_cmdlist): Likewise. (info_spu_dma_command): Likewise. (info_spu_proxydma_command): Likewise. * stack.c (print_stack_frame): Likewise. (print_frame_arg): Likewise. (read_frame_arg): Likewise. (print_frame_args): Likewise. (print_frame_info): Likewise. (print_frame): Likewise. * symfile.c (load_progress): Likewise. (generic_load): Likewise. (print_transfer_performance): Likewise. * thread.c (do_captured_list_thread_ids): Likewise. (print_thread_info_1): Likewise. (restore_selected_frame): Likewise. (do_captured_thread_select): Likewise. (print_selected_thread_frame): Likewise. * top.c (execute_command_to_string): Likewise. * tracepoint.c (tvariables_info_1): Likewise. (trace_status_mi): Likewise. (tfind_1): Likewise. (print_one_static_tracepoint_marker): Likewise. (info_static_tracepoint_markers_command): Likewise. * utils.c (do_ui_out_redirect_pop): Likewise. (fputs_maybe_filtered): Likewise.
2016-12-22 22:17:31 +01:00
uiout->table_header (3, ui_left, "min-prot", "Min");
uiout->table_header (3, ui_left, "max-prot", "Max");
uiout->table_header (5, ui_left, "inheritence", "Inh");
uiout->table_header (9, ui_left, "share-mode", "Shr");
uiout->table_header (1, ui_left, "depth", "D");
uiout->table_header (3, ui_left, "submap", "Sm");
uiout->table_header (0, ui_noalign, "tag", "Tag");
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
Class-ify ui_out This patch finalizes the C++ conversion of the ui-out subsystem, by turning the ui_out and ui_out_impl structures into a single class hierarchy. ui_out functions are turned into virtual methods of that new class, so as a result there are a lot of call sites to update. In the previous version of the patchset, there were separate ui_out and ui_out_impl classes, but it wasn't really useful and added boilerplate. In this version there is simply an ui_out base class that is extended for CLI, TUI and MI. It's a bit hard to maintain a ChangeLog for such a big patch, I did my best but I'm sure there are some missing or outdated info in there... gdb/ChangeLog: * ui-out.h (ui_out_begin, ui_out_end, ui_out_table_header, ui_out_table_body, ui_out_field_int, ui_out_field_fmt_int, ui_out_field_core_addr, ui_out_field_string, ui_out_field_stream, ui_out_field_fmt, ui_out_field_skip, ui_out_spaces, ui_out_text, ui_out_message, ui_out_wrap_hint, ui_out_flush, ui_out_test_flags, ui_out_query_field, ui_out_is_mi_like_p, ui_out_redirect): Remove, replace with a method in class ui_out. (table_begin_ftype): Remove, replace with pure virtual method in class ui_out. (table_body_ftype): Likewise. (table_end_ftype): Likewise. (table_header_ftype): Likewise. (ui_out_begin_ftype): Likewise. (ui_out_end_ftype): Likewise. (field_int_ftype): Likewise. (field_skip_ftype): Likewise. (field_string_ftype): Likewise. (field_fmt_ftype): Likewise. (spaces_ftype): Likewise. (text_ftype): Likewise. (message_ftype): Likewise. (wrap_hint_ftype): Likewise. (flush_ftype): Likewise. (redirect_ftype): Likewise. (data_destroy_ftype): Likewise. (struct ui_out_impl): Remove, replace with class ui_out. (ui_out_new): Remove. (class ui_out): New class. * ui-out.c (struct ui_out): Remove, replaced with class ui_out. (current_level): Remove, replace with ui_out method. (push_level): Likewise. (pop_level): Likewise. (uo_table_begin, uo_table_body, uo_table_end, uo_table_header, uo_begin, uo_end, uo_field_int, uo_field_skip, uo_field_fmt, uo_spaces, uo_text, uo_message, uo_wrap_hint, uo_flush, uo_redirect, uo_field_string): Remove. (ui_out_table_begin): Replace with ... (ui_out::table_begin): ... this. (ui_out_table_body): Replace with ... (ui_out::table_body): ... this. (ui_out_table_end): Replace with ... (ui_out::table_end): ... this. (ui_out_table_header): Replace with ... (ui_out::table_header): ... this. (ui_out_begin): Replace with ... (ui_out::begin): ... this. (ui_out_end): Replace with ... (ui_out::end): ... this. (ui_out_field_int): Replace with ... (ui_out::field_int): ... this. (ui_out_field_fmt_int): Replace with ... (ui_out::field_fmt_int): ... this. (ui_out_field_core_addr): Replace with ... (ui_out::field_core_addr): ... this. (ui_out_field_stream): Replace with ... (ui_out::field_stream): ... this. (ui_out_field_skip): Replace with ... (ui_out::field_skip): ... this. (ui_out_field_string): Replace with ... (ui_out::field_string): ... this. (ui_out_field_fmt): Replace with ... (ui_out::field_fmt): ... this. (ui_out_spaces): Replace with ... (ui_out::spaces): ... this. (ui_out_text): Replace with ... (ui_out::text): ... this. (ui_out_message): Replace with ... (ui_out::message): ... this. (ui_out_wrap_hint): Replace with ... (ui_out::wrap_hint): ... this. (ui_out_flush): Replace with ... (ui_out::flush): ... this. (ui_out_redirect): Replace with ... (ui_out::redirect): ... this. (ui_out_test_flags): Replace with ... (ui_out::test_flags): ... this. (ui_out_is_mi_like_p): Replace with ... (ui_out::is_mi_like_p): ... this. (verify_field): Replace with ... (ui_out::verify_field): ... this. (ui_out_query_field): Replace with ... (ui_out::query_table_field): ... this. (ui_out_data): Remove. (ui_out_new): Remove, replace with ... (ui_out::ui_out): ... this constructor. (do_cleanup_table_end, make_cleanup_ui_out_tuple_begin_end, do_cleanup_end, make_cleanup_ui_out_tuple_begin_end, make_cleanup_ui_out_list_begin_end): Update fallouts of struct ui_out -> class ui_out change. * cli-out.c (cli_out_data): Remove. (cli_uiout_dtor): Remove. (cli_table_begin): Replace with ... (cli_ui_out::do_table_begin): ... this new method. (cli_table_body): Replace with ... (cli_ui_out::do_table_body): ... this new method. (cli_table_end): Replace with ... (cli_ui_out::do_table_end): ... this new method. (cli_table_header): Replace with ... (cli_ui_out::do_table_header): ... this new method. (cli_begin): Replace with ... (cli_ui_out::do_begin): ... this new method. (cli_end): Replace with ... (cli_ui_out::do_end): ... this new method. (cli_field_int): Replace with ... (cli_ui_out::do_field_int): ... this new method. (cli_field_skip): Replace with ... (cli_ui_out::do_field_skip): ... this new method. (cli_field_string): Replace with ... (cli_ui_out::do_field_string): ... this new method. (cli_field_fmt): Replace with ... (cli_ui_out::do_field_fmt): ... this new method. (cli_spaces): Replace with ... (cli_ui_out::do_spaces): ... this new method. (cli_text): Replace with ... (cli_ui_out::do_text): ... this new method. (cli_message): Replace with ... (cli_ui_out::do_message): ... this new method. (cli_wrap_hint): Replace with ... (cli_ui_out::do_wrap_hint): ... this new method. (cli_flush): Replace with ... (cli_ui_out::do_flush): ... this new method. (cli_redirect): Replace with ... (cli_ui_out::do_redirect): ... this new method. (out_field_fmt): Replace with ... (cli_ui_out::out_field_fmt): ... this new method. (field_separator): Replace with ... (cli_ui_out::field_separator): ... this new method. (cli_out_set_stream): Replace with ... (cli_ui_out::set_stream): ... this new method. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_ui_out_impl::cli_ui_out_impl): New constructor. (cli_ui_out_impl::~cli_ui_out_impl): New destructor. (cli_out_new): Change return type to cli_ui_out *, instantiate a cli_ui_out. * cli-out.h (cli_ui_out_data): Remove, replace with class cli_ui_out. (class cli_ui_out): New class. (cli_ui_out_impl): Remove. (cli_out_data_ctor): Remove. (cli_out_new): Change return type to cli_ui_out*. (cli_out_set_stream): Remove. * cli/cli-interp.c (struct cli_interp) <cli_uiout>: Change type to cli_ui_out*. (cli_interpreter_resume): Adapt. (cli_interpreter_exec): Adapt. * mi/mi-out.c (mi_ui_out_data, mi_out_data): Remove. (mi_ui_out_impl): Remove. (mi_table_begin): Replace with ... (mi_ui_out::do_table_begin): ... this. (mi_table_body): Replace with ... (mi_ui_out::do_table_body): ... this. (mi_table_end): Replace with ... (mi_ui_out::do_table_end): ... this. (mi_table_header): Replace with ... (mi_ui_out::do_table_header): ... this. (mi_begin): Replace with ... (mi_ui_out::do_begin): ... this. (mi_end): Replace with ... (mi_ui_out::do_end): ... this. (mi_field_int): Replace with ... (mi_ui_out::do_field_int): ... this. (mi_field_skip): Replace with ... (mi_ui_out::do_field_skip): ... this. (mi_field_string): Replace with ... (mi_ui_out::do_field_string): ... this. (mi_field_fmt): Replace with ... (mi_ui_out::do_field_fmt): ... this. (mi_spaces): Replace with ... (mi_ui_out::do_spaces): ... this. (mi_text): Replace with ... (mi_ui_out::do_text): ... this. (mi_message): Replace with ... (mi_ui_out::do_message): ... this. (mi_wrap_hint): Replace with ... (mi_ui_out::do_wrap_hint): ... this. (mi_flush): Replace with ... (mi_ui_out::do_flush): ... this. (mi_redirect): Replace with ... (mi_ui_out::do_redirect): (field_separator): Replace with ... (mi_ui_out::field_separator): (mi_open): Replace with ... (mi_ui_out::open): ... this. (mi_close): Replace with ... (mi_ui_out::close): ... this. (mi_out_rewind): Replace with ... (mi_ui_out::rewind): ... this. (mi_out_put): Replace with ... (mi_ui_out::put): ... this. (mi_version): Replace with ... (mi_ui_out::version): ... this. (mi_out_data_ctor): Replace with ... (mi_ui_out::mi_ui_out): ... this. (mi_out_data_dtor): Replace with ... (mi_ui_out::~mi_ui_out): ... this. (mi_out_new): Change return type to mi_ui_out*, instantiate an mi_ui_out object. (as_mi_ui_out): New function. (mi_version): Update fallouts of struct ui_out to class ui_out transition. (mi_out_put): Likewise. (mi_out_rewind): Likewise. * mi/mi-out.h (mi_out_new): Change return type to mi_ui_out*. * tui/tui-out.c (tui_ui_out_data, tui_out_data, tui_ui_out_impl): Remove. (tui_field_int): Replace with ... (tui_ui_out::do_field_int): ... this. (tui_field_string): Replace with ... (tui_ui_out::do_field_string): ... this. (tui_field_fmt): Replace with ... (tui_ui_out::do_field_fmt): ... this. (tui_text): Replace with ... (tui_ui_out::do_text): ... this. (tui_out_new): Change return type to tui_ui_out*, instantiate tui_ui_out object. (tui_ui_out::tui_ui_out): New. * tui/tui-out.h: New file. * tui/tui.h (tui_out_new): Move declaration to tui/tui-out.h. * tui/tui-io.c: Include tui/tui-out.h. (tui_old_uiout): Change type to cli_ui_out*. (tui_setup_io): Use dynamic_cast. * tui/tui-io.h (tui_old_uiout): Change type to cli_ui_out*. * tui/tui-interp.c (tui_resume): Adapt. * ada-lang.c (print_it_exception): Update fallouts of struct ui_out to class ui_out transition. (print_one_exception): Likewise. (print_mention_exception): Likewise. * ada-tasks.c (print_ada_task_info): Likewise. (info_task): Likewise. (task_command): Likewise. * auto-load.c (print_script): Likewise. (auto_load_info_scripts): Likewise. (info_auto_load_cmd): Likewise. * break-catch-sig.c (signal_catchpoint_print_one): Likewise. * break-catch-syscall.c (print_it_catch_syscall): Likewise. (print_one_catch_syscall): Likewise. * break-catch-throw.c (print_it_exception_catchpoint): Likewise. (print_one_exception_catchpoint): Likewise. (print_one_detail_exception_catchpoint): Likewise. (print_mention_exception_catchpoint): Likewise. * breakpoint.c (maybe_print_thread_hit_breakpoint): Likewise. (print_solib_event): Likewise. (watchpoint_check): Likewise. (wrap_indent_at_field): Likewise. (print_breakpoint_location): Likewise. (output_thread_groups): Likewise. (print_one_breakpoint_location): Likewise. (breakpoint_1): Likewise. (default_collect_info): Likewise. (watchpoints_info): Likewise. (print_it_catch_fork): Likewise. (print_one_catch_fork): Likewise. (print_it_catch_vfork): Likewise. (print_one_catch_vfork): Likewise. (print_it_catch_solib): Likewise. (print_one_catch_solib): Likewise. (print_it_catch_exec): Likewise. (print_one_catch_exec): Likewise. (mention): Likewise. (print_it_ranged_breakpoint): Likewise. (print_one_ranged_breakpoint): Likewise. (print_one_detail_ranged_breakpoint): Likewise. (print_mention_ranged_breakpoint): Likewise. (print_it_watchpoint): Likewise. (print_mention_watchpoint): Likewise. (print_it_masked_watchpoint): Likewise. (print_one_detail_masked_watchpoint): Likewise. (print_mention_masked_watchpoint): Likewise. (bkpt_print_it): Likewise. (tracepoint_print_one_detail): Likewise. (tracepoint_print_mention): Likewise. (update_static_tracepoint): Likewise. (tracepoints_info): Likewise. (save_breakpoints): Likewise. * cli/cli-cmds.c (complete_command): Likewise. * cli/cli-logging.c (set_logging_redirect): Likewise. (pop_output_files): Likewise. (handle_redirections): Likewise. * cli/cli-script.c (print_command_lines): Likewise. * cli/cli-setshow.c (do_show_command): Likewise. (cmd_show_list): Likewise. * cp-abi.c (list_cp_abis): Likewise. (show_cp_abi_cmd): Likewise. * darwin-nat-info.c (darwin_debug_regions_recurse): Likewise. * disasm.c (gdb_pretty_print_insn): Likewise. (do_mixed_source_and_assembly_deprecated): Likewise. (do_mixed_source_and_assembly): Likewise. * gdb_bfd.c (print_one_bfd): Likewise. (maintenance_info_bfds): Likewise. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Likewise. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Likewise. * i386-linux-tdep.c (i386_linux_handle_segmentation_fault): Likewise. * i386-tdep.c (i386_mpx_print_bounds): Likewise. * infcmd.c (run_command_1): Likewise. (print_return_value_1): Likewise. * inferior.c (print_selected_inferior): Likewise. (print_inferior): Likewise. * infrun.c (print_end_stepping_range_reason): Likewise. (print_signal_exited_reason): Likewise. (print_exited_reason): Likewise. (print_signal_received_reason): Likewise. (print_no_history_reason): Likewise. * interps.c (interp_set): Likewise. * linespec.c (decode_line_full): Likewise. * linux-thread-db.c (info_auto_load_libthread_db): Likewise. * mi/mi-cmd-env.c (mi_cmd_env_pwd): Likewise. (mi_cmd_env_path): Likewise. (mi_cmd_env_dir): Likewise. (mi_cmd_inferior_tty_show): Likewise. * mi/mi-cmd-file.c (mi_cmd_file_list_exec_source_file): Likewise. (print_partial_file_name): Likewise. (mi_cmd_file_list_exec_source_files): Likewise. * mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions): Likewise. (mi_cmd_info_gdb_mi_command): Likewise. * mi/mi-cmd-stack.c (mi_cmd_stack_info_depth): Likewise. (mi_cmd_stack_list_args): Likewise. (list_arg_or_local): Likewise. * mi/mi-cmd-var.c (print_varobj): Likewise. (mi_cmd_var_create): Likewise. (mi_cmd_var_delete): Likewise. (mi_cmd_var_set_format): Likewise. (mi_cmd_var_show_format): Likewise. (mi_cmd_var_info_num_children): Likewise. (mi_cmd_var_list_children): Likewise. (mi_cmd_var_info_type): Likewise. (mi_cmd_var_info_path_expression): Likewise. (mi_cmd_var_info_expression): Likewise. (mi_cmd_var_show_attributes): Likewise. (mi_cmd_var_evaluate_expression): Likewise. (mi_cmd_var_assign): Likewise. (varobj_update_one): Likewise. * mi/mi-interp.c (as_mi_interp): Likewise. (mi_on_normal_stop_1): Likewise. (mi_tsv_modified): Likewise. (mi_breakpoint_created): Likewise. (mi_breakpoint_modified): Likewise. (mi_solib_loaded): Likewise. (mi_solib_unloaded): Likewise. (mi_command_param_changed): Likewise. (mi_memory_changed): Likewise. (mi_user_selected_context_changed): Likewise. * mi/mi-main.c (print_one_inferior): Likewise. (output_cores): Likewise. (list_available_thread_groups): Likewise. (mi_cmd_data_list_register_names): Likewise. (mi_cmd_data_list_changed_registers): Likewise. (output_register): Likewise. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_list_features): Likewise. (mi_cmd_list_target_features): Likewise. (mi_cmd_add_inferior): Likewise. (mi_execute_command): Likewise. (mi_load_progress): Likewise. (print_variable_or_computed): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Likewise. * osdata.c (info_osdata_command): Likewise. * probe.c (gen_ui_out_table_header_info): Likewise. (print_ui_out_not_applicables): Likewise. (print_ui_out_info): Likewise. (info_probes_for_ops): Likewise. (enable_probes_command): Likewise. (disable_probes_command): Likewise. * progspace.c (print_program_space): Likewise. * python/py-breakpoint.c (bppy_get_commands): Likewise. * python/py-framefilter.c (py_print_type): Likewise. (py_print_value): Likewise. (py_print_single_arg): Likewise. (enumerate_args): Likewise. (enumerate_locals): Likewise. (py_print_args): Likewise. (py_print_frame): Likewise. * record-btrace.c (btrace_ui_out_decode_error): Likewise. (btrace_call_history_insn_range): Likewise. (btrace_call_history_src_line): Likewise. (btrace_call_history): Likewise. * remote.c (show_remote_cmd): Likewise. * skip.c (skip_info): Likewise. * solib.c (info_sharedlibrary_command): Likewise. * source.c (print_source_lines_base): Likewise. * spu-tdep.c (info_spu_event_command): Likewise. (info_spu_signal_command): Likewise. (info_spu_mailbox_list): Likewise. (info_spu_dma_cmdlist): Likewise. (info_spu_dma_command): Likewise. (info_spu_proxydma_command): Likewise. * stack.c (print_stack_frame): Likewise. (print_frame_arg): Likewise. (read_frame_arg): Likewise. (print_frame_args): Likewise. (print_frame_info): Likewise. (print_frame): Likewise. * symfile.c (load_progress): Likewise. (generic_load): Likewise. (print_transfer_performance): Likewise. * thread.c (do_captured_list_thread_ids): Likewise. (print_thread_info_1): Likewise. (restore_selected_frame): Likewise. (do_captured_thread_select): Likewise. (print_selected_thread_frame): Likewise. * top.c (execute_command_to_string): Likewise. * tracepoint.c (tvariables_info_1): Likewise. (trace_status_mi): Likewise. (tfind_1): Likewise. (print_one_static_tracepoint_marker): Likewise. (info_static_tracepoint_markers_command): Likewise. * utils.c (do_ui_out_redirect_pop): Likewise. (fputs_maybe_filtered): Likewise.
2016-12-22 22:17:31 +01:00
uiout->table_body ();
r_start = 0;
r_depth = 0;
while (1)
{
const char *tag;
r_info_size = VM_REGION_SUBMAP_SHORT_INFO_COUNT_64;
r_size = -1;
kret = mach_vm_region_recurse (task, &r_start, &r_size, &r_depth,
(vm_region_recurse_info_t) &r_info,
&r_info_size);
if (kret != KERN_SUCCESS)
break;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
{
ui_out_emit_tuple tuple_emitter (uiout, "regions-row");
uiout->field_core_addr ("start", target_gdbarch (), r_start);
uiout->field_core_addr ("end", target_gdbarch (), r_start + r_size);
uiout->field_string ("min-prot",
unparse_protection (r_info.protection));
uiout->field_string ("max-prot",
unparse_protection (r_info.max_protection));
uiout->field_string ("inheritence",
unparse_inheritance (r_info.inheritance));
uiout->field_string ("share-mode",
unparse_share_mode (r_info.share_mode));
uiout->field_int ("depth", r_depth);
uiout->field_string ("submap",
r_info.is_submap ? _("sm ") : _("obj"));
tag = unparse_user_tag (r_info.user_tag);
if (tag)
uiout->field_string ("tag", tag);
else
uiout->field_int ("tag", r_info.user_tag);
}
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
uiout->text ("\n");
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
if (r_info.is_submap)
r_depth++;
else
r_start += r_size;
}
}
static void
darwin_debug_region (task_t task, mach_vm_address_t address)
{
darwin_debug_regions (task, address, 1);
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_regions_command (const char *args, int from_tty)
{
task_t task;
task = get_task_from_args (args);
if (task == TASK_NULL)
return;
darwin_debug_regions (task, 0, -1);
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_regions_recurse_command (const char *args, int from_tty)
{
task_t task;
task = get_task_from_args (args);
if (task == TASK_NULL)
return;
darwin_debug_regions_recurse (task);
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_region_command (const char *exp, int from_tty)
{
struct value *val;
mach_vm_address_t address;
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
struct inferior *inf;
expression_up expr = parse_expression (exp);
val = evaluate_expression (expr.get ());
Convert lvalue reference type check to general reference type check In almost all contexts (except for overload resolution rules and expression semantics), lvalue and rvalue references are equivalent. That means that in all but these cases we can replace a TYPE_CODE_REF check to a TYPE_IS_REFERENCE check and, for switch statements, add a case label for a rvalue reference type next to a case label for an lvalue reference type. This patch does exactly that. gdb/ChangeLog PR gdb/14441 * aarch64-tdep.c (aarch64_type_align) (aarch64_extract_return_value, aarch64_store_return_value): Change lvalue reference type checks to general reference type checks. * amd64-tdep.c (amd64_classify): Likewise. * amd64-windows-tdep.c (amd64_windows_passed_by_integer_register): Likewise. * arm-tdep.c (arm_type_align, arm_extract_return_value) (arm_store_return_value): Likewise. * ax-gdb.c (gen_fetch, gen_cast): Likewise. * c-typeprint.c (c_print_type): Likewise. * c-varobj.c (adjust_value_for_child_access, c_value_of_variable) (cplus_number_of_children, cplus_describe_child): Likewise. * compile/compile-c-symbols.c (generate_vla_size): Likewise. * completer.c (expression_completer): Likewise. * cp-support.c (make_symbol_overload_list_adl_namespace): Likewise. * darwin-nat-info.c (info_mach_region_command): Likewise. * dwarf2loc.c (entry_data_value_coerce_ref) (value_of_dwarf_reg_entry): Likewise. * eval.c (ptrmath_type_p, evaluate_subexp_standard) (evaluate_subexp_for_address, evaluate_subexp_for_sizeof): Likewise. * findvar.c (extract_typed_address, store_typed_address): Likewise. * gdbtypes.c (rank_one_type): Likewise. * hppa-tdep.c (hppa64_integral_or_pointer_p): Likewise. * infcall.c (value_arg_coerce): Likewise. * language.c (pointer_type): Likewise. * m32c-tdep.c (m32c_reg_arg_type, m32c_m16c_address_to_pointer): Likewise. * m88k-tdep.c (m88k_integral_or_pointer_p): Likewise. * mn10300-tdep.c (mn10300_type_align): Likewise. * msp430-tdep.c (msp430_push_dummy_call): Likewise. * ppc-sysv-tdep.c (do_ppc_sysv_return_value) (ppc64_sysv_abi_push_param, ppc64_sysv_abi_return_value): Likewise. * printcmd.c (print_formatted, x_command): Likewise. * python/py-type.c (typy_get_composite, typy_template_argument): Likewise. * python/py-value.c (valpy_referenced_value) (valpy_get_dynamic_type, value_has_field): Likewise. * s390-linux-tdep.c (s390_function_arg_integer): Likewise. * sparc-tdep.c (sparc_integral_or_pointer_p): Likewise. * sparc64-tdep.c (sparc64_integral_or_pointer_p): Likewise. * spu-tdep.c (spu_scalar_value_p): Likewise. * symtab.c (lookup_symbol_aux): Likewise. * typeprint.c (whatis_exp, print_type_scalar): Likewise. * valarith.c (binop_types_user_defined_p, unop_user_defined_p): Likewise. * valops.c (value_cast_pointers, value_cast) (value_reinterpret_cast, value_dynamic_cast, value_addr, typecmp) (value_struct_elt, value_struct_elt_bitpos) (value_find_oload_method_list, find_overload_match) (value_rtti_indirect_type): Likewise. * valprint.c (val_print_scalar_type_p, generic_val_print): Likewise. * value.c (value_actual_type, value_as_address, unpack_long) (pack_long, pack_unsigned_long, coerce_ref_if_computed) (coerce_ref): Likewise. * varobj.c (varobj_get_value_type): Likewise.
2017-03-20 21:47:54 +01:00
if (TYPE_IS_REFERENCE (value_type (val)))
{
val = value_ind (val);
}
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
address = value_as_address (val);
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
if (ptid_equal (inferior_ptid, null_ptid))
error (_("Inferior not available"));
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
inf = current_inferior ();
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
darwin_inferior *priv = get_darwin_inferior (inf);
darwin_debug_region (priv->task, address);
}
static void
disp_exception (const darwin_exception_info *info)
{
int i;
printf_filtered (_("%d exceptions:\n"), info->count);
for (i = 0; i < info->count; i++)
{
exception_mask_t mask = info->masks[i];
printf_filtered (_("port 0x%04x, behavior: "), info->ports[i]);
switch (info->behaviors[i])
{
case EXCEPTION_DEFAULT:
printf_unfiltered (_("default"));
break;
case EXCEPTION_STATE:
printf_unfiltered (_("state"));
break;
case EXCEPTION_STATE_IDENTITY:
printf_unfiltered (_("state-identity"));
break;
default:
printf_unfiltered (_("0x%x"), info->behaviors[i]);
}
printf_unfiltered (_(", masks:"));
if (mask & EXC_MASK_BAD_ACCESS)
printf_unfiltered (_(" BAD_ACCESS"));
if (mask & EXC_MASK_BAD_INSTRUCTION)
printf_unfiltered (_(" BAD_INSTRUCTION"));
if (mask & EXC_MASK_ARITHMETIC)
printf_unfiltered (_(" ARITHMETIC"));
if (mask & EXC_MASK_EMULATION)
printf_unfiltered (_(" EMULATION"));
if (mask & EXC_MASK_SOFTWARE)
printf_unfiltered (_(" SOFTWARE"));
if (mask & EXC_MASK_BREAKPOINT)
printf_unfiltered (_(" BREAKPOINT"));
if (mask & EXC_MASK_SYSCALL)
printf_unfiltered (_(" SYSCALL"));
if (mask & EXC_MASK_MACH_SYSCALL)
printf_unfiltered (_(" MACH_SYSCALL"));
if (mask & EXC_MASK_RPC_ALERT)
printf_unfiltered (_(" RPC_ALERT"));
if (mask & EXC_MASK_CRASH)
printf_unfiltered (_(" CRASH"));
printf_unfiltered (_("\n"));
}
}
static void
Constify add_info This patch constifies add_info and updates all the info commands. The bulk of this patch was written using a script; and then I did a manual pass to fix up the remaining compilation errors. I could not compile every changed file; in particular nto-procfs.c, gnu-nat.c, and darwin-nat-info.c; but I at least tried to check the correctness by inspection. gdb/ChangeLog 2017-11-07 Tom Tromey <tom@tromey.com> * frame.h (info_locals_command, info_args_command): Constify. * auto-load.h (auto_load_info_scripts): Constify. * inferior.h (registers_info): Constify. * copying.c: Rebuild. * copying.awk: Constify generated commands. * auto-load.c (auto_load_info_scripts) (info_auto_load_gdb_scripts): Constify. * cli/cli-decode.c (struct cmd_list_element): Take a cmd_const_cfunc_ftype. * command.h (add_info): Take a cmd_const_cfunc_ftype. * tui/tui-win.c (tui_all_windows_info): Constify. * python/py-auto-load.c (info_auto_load_python_scripts): Constify. * cli/cli-cmds.c (show_command): Remove non-const overload. * tracepoint.c (info_tvariables_command, info_scope_command): Constify. (info_static_tracepoint_markers_command): Constify. * thread.c (info_threads_command): Constify. (print_thread_info_1): Constify. * target.c (info_target_command): Constify. * symtab.c (info_sources_command, info_functions_command) (info_types_command): Constify. (info_variables_command): Remove non-const overload. * symfile.c (info_ext_lang_command): Constify. * stack.c (info_frame_command, info_locals_command) (info_args_command): Constify. (backtrace_command): Remove non-const overload. * source.c (info_source_command, info_line_command): Constify. * solib.c (info_sharedlibrary_command): Constify. * skip.c (info_skip_command): Constify. * ser-go32.c (info_serial_command): Constify. * reverse.c (info_bookmarks_command): Constify. * printcmd.c (info_symbol_command, info_address_command) (info_display_command): Constify. * osdata.c (info_osdata_command): Constify. * objc-lang.c (info_selectors_command, info_classes_command): Constify. * nto-procfs.c (procfs_pidlist, procfs_meminfo): Constify. * memattr.c (info_mem_command): Constify. * macrocmd.c (info_macro_command, info_macros_command): Constify. * linux-fork.c (info_checkpoints_command): Constify. * infrun.c (info_signals_command): Constify. * inflow.c (info_terminal_command): Constify. * inferior.c (info_inferiors_command): Constify. (print_inferior): Constify. * infcmd.c (info_program_command, info_all_registers_command) (info_registers_command, info_vector_command) (info_float_command): Constify. (registers_info): Constify. * gnu-nat.c (info_send_rights_cmd, info_recv_rights_cmd) (info_port_sets_cmd, info_dead_names_cmd, info_port_rights_cmd): Constify. * f-valprint.c (info_common_command): Constify. * dcache.c (info_dcache_command): Constify. (dcache_info_1): Constify. * darwin-nat-info.c (info_mach_tasks_command) (info_mach_task_command, info_mach_ports_command) (info_mach_port_command, info_mach_threads_command) (info_mach_thread_command, info_mach_regions_command) (info_mach_regions_recurse_command, info_mach_region_command) (info_mach_exceptions_command): Constify. (get_task_from_args): Constify. * cp-support.c (info_vtbl_command): Constify. * breakpoint.c (info_watchpoints_command) (info_tracepoints_command): Constify. (info_breakpoints_command): Remove non-const overload. * avr-tdep.c (avr_io_reg_read_command): Constify. * auxv.c (info_auxv_command): Constify. * ada-tasks.c (info_tasks_command): Constify. (info_task): Constify. * ada-lang.c (info_exceptions_command): Constify.
2017-10-14 06:07:26 +02:00
info_mach_exceptions_command (const char *args, int from_tty)
{
int i;
task_t task;
kern_return_t kret;
darwin_exception_info info;
info.count = sizeof (info.ports) / sizeof (info.ports[0]);
if (args != NULL)
{
if (strcmp (args, "saved") == 0)
{
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
if (ptid_equal (inferior_ptid, null_ptid))
printf_unfiltered (_("No inferior running\n"));
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
darwin_inferior *priv = get_darwin_inferior (current_inferior ());
disp_exception (&priv->exception_info);
return;
}
else if (strcmp (args, "host") == 0)
{
/* FIXME: This need a privilegied host port! */
kret = host_get_exception_ports
(darwin_host_self, EXC_MASK_ALL, info.masks,
&info.count, info.ports, info.behaviors, info.flavors);
MACH_CHECK_ERROR (kret);
disp_exception (&info);
}
else
error (_("Parameter is saved, host or none"));
}
else
{
2009-06-19 Tristan Gingold <gingold@adacore.com> * machoread.c (macho_symtab_read): Adjust for bfd changes. * darwin-nat.h (struct darwin_exception_msg): New type to describe a mach exception. (struct private_thread_info): New type to describe the state of the thread. (DEF_VEC_I thread_t): Removed, replaced by ... (DEF_VEC_O darwin_thread_t): ... this new type. (struct darwin_inferior): Renamed to ... (struct private_inferior): ... this type. Fields added. (darwin_not_port): Moved into the private inferior structure. * darwin-nat.c: Add includes, improve comments. Rewrite to handle multiple threads and processes. (darwin_resume_to): New function and protype. (darwin_resume, darwin_wait_to, darwin_wait): Ditto. (darwin_kill_inferior): Add ops argument. (darwin_pid_to_str): New function. (darwin_thread_alive): Ditto. (darwin_inf, darwin_not_port): Removed. (darwin_inf_fake_stop): New variable. (msgin, msgout, msg_state, exc_msg): Removed. (mach_check_error): Use warning instead of error. (darwin_ptrace): Adjust debug level. (cmp_thread_t): Fix names (typo). (darwin_check_new_threads): Argument is now an inferior, adjust for new structures, add no change check, ignore dead ports, handle first thread case. (find_inferior_task_it): New function. (find_inferior_notify_it): Ditto. (darwin_find_inferior_by_task): Ditto. (darwin_find_inferior_by_notify): Ditto. (darwin_find_thread): Ditto. (darwin_suspend_inferior): Ditto. (darwin_resume_inferior): Ditto. (catch_exception_raise_state): Removed. (catch_exception_raise_state_identity): Removed. (darwin_suspend_inferior_it): New function. (darwin_resume_inferior_it): Ditto. (darwin_dump_message): New function, extracted from darwin_wait. (darwin_decode_exception_message): New function. (darwin_encode_reply): New function. (catch_exception_raise): Removed. (darwin_send_reply): New function, extracted from darwin_resume. (darwin_resume_thread): New function, extracted from darwin_resume. (struct resume_inferior_threads_param): New type. (darwin_resume_inferior_threads_it): New function. (darwin_resume_inferior_threads): New function. (darwin_suspend_inferior_threads): New function. (darwin_resume): Mostly rewritten to handle multiple threads and some corner cases. (darwin_decode_message): New function extracted from darwin_wait. (cancel_breakpoint): New function. (darwin_wait): Mostly rewritten. Handle multiple threads. (darwin_mourn_inferior): Adjust for per process structures. (darwin_reply_to_all_pending_messages): New function. (darwin_stop_inferior): Adjust for per inferior structures. (darwin_attach_pid): Ditto. (darwin_init_thread_list): Ditto. (darwin_attach): Ditto. (darwin_detach): Ditto. (darwin_files_info): Now empty. (darwin_pid_to_str): Adjust returns string to match one expected by the testsuite. (darwin_read_write_inferior): Rename err variable to match other uses. Adjust debug message. Handle submaps. (darwin_xfer_memory): Adjust for per inferior structures. (set_enable_mach_exceptions): Ditto. (darwin_pid_to_exec_file): New function. (darwin_get_ada_task_ptid): Ditto. (darwin_supports_multi_process): Ditto. (_initialize_darwin_inferior): Remove useless assertion, adjust for per inferior structures. Add new target operations.
2009-06-19 16:30:30 +02:00
struct inferior *inf;
if (ptid_equal (inferior_ptid, null_ptid))
printf_unfiltered (_("No inferior running\n"));
inf = current_inferior ();
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
darwin_inferior *priv = get_darwin_inferior (inf);
kret = task_get_exception_ports
Create private_inferior class hierarchy There are currently multiple definitions of private_inferior, defined in remote.c and darwin-nat.h. The patch that poisons XNEW and friends for non-POD types trips on that, because private_inferior is freed in ~inferior(), where it is an opaque type. Since the compiler can't tell whether the type is POD, it gives an error. Also, we can't start using C++ features in these structures (make them non-POD) as long as there are multiple definitions with the same name. For these reasons, this patch makes a class hierarchy, with private_inferior being the abstract base class, and darwin_inferior & remote_inferior inheriting from it. Destruction is done through the virtual destructor. I stumbled on some suspicious code in the darwin implementation though. darwin_check_new_threads does an XCNEW(darwin_thread_t) when it finds a new thread, allocating a new structure for it (darwin_thread_t is a typedef for private_thread_info). It then VEC_safe_pushes it in a vector defined as DEF_VEC_O (a vector of objects). This means that the structure content gets copied in the vector. The thread_info object is created with the XCNEW'ed structure as the private thread info, while the rest of the code works with the instance in the vector. We have therefore two distinct instances of darwin_thread_t/private_thread_info for each thread. This is not really a problem in practice, because thread_info::priv is not used in the darwin code. I still find it weird and far from ideal, so I tried to fix it by changing the vector to be a vector of pointers. There should now be a single instance of the structure for each thread. The deallocation of the darwin_thread_t/private_thread_info structure is done by the thread_info destructor. I am able to build on macOS, but not really test, since the port seems a bit broken. I am not able to debug reliably on the machine I have access to, which runs macOS 10.12.6. gdb/ChangeLog: * inferior.h (private_inferior): Define structure type, add virtual pure destructor. (inferior) <priv>: Change type to unique_ptr. * inferior.c (private_inferior::~private_inferior): Provide default implementation. (inferior::~inferior): Don't free priv field. (exit_inferior_1): Likewise. * darwin-nat.h (struct darwin_exception_info): Initialize fields. (darwin_exception_info): Remove typedef. (DEF_VEC_O (darwin_thread_t)); Remove. (private_inferior): Rename to ... (darwin_private_inferior): ... this, extend private_inferior. (get_darwin_inferior): New. <threads>: Change type to std::vector of darwin_thread_t pointers. * darwin-nat.c (darwin_check_new_threads): Adjust. (find_inferior_task_it): Adjust. (darwin_find_thread); Adjust. (darwin_suspend_inferior): Adjust. (darwin_resume_inferior): Adjust. (darwin_find_new_inferior): Adjust. (darwin_decode_notify_message): Adjust. (darwin_send_reply): Adjust. (darwin_resume_inferior_threads): Adjust. (darwin_suspend_inferior_threads): Adjust. (darwin_decode_message): Adjust. (darwin_wait): Adjust. (darwin_interrupt): Adjust. (darwin_deallocate_threads): Adjust. (darwin_mourn_inferior): Adjust, don't free private data. (darwin_reply_to_all_pending_messages): Adjust. (darwin_stop_inferior): Adjust. (darwin_setup_exceptions): Adjust. (darwin_kill_inferior): Adjust. (darwin_setup_request_notification): Adjust. (darwin_attach_pid): Adjust. (darwin_init_thread_list): Adjust. (darwin_setup_fake_stop_event): Adjust. (darwin_attach): Adjust. (darwin_detach): Adjust. (darwin_xfer_partial): Adjust. (set_enable_mach_exceptions): Adjust. (darwin_pid_to_exec_file): Adjust. (darwin_get_ada_task_ptid): Adjust. * darwin-nat-info.c (get_task_from_args): Adjust. (info_mach_ports_command): Adjust. (info_mach_region_command): Adjust. (info_mach_exceptions_command): Adjust. * remote.c (private_inferior): Rename to ... (remote_private_inferior): ... this, initialize fields. (get_remote_inferior); New. (remote_commit_resume): Use get_remote_inferior. (check_pending_event_prevents_wildcard_vcont_callback): Likewise.
2017-11-24 16:39:30 +01:00
(priv->task, EXC_MASK_ALL, info.masks,
&info.count, info.ports, info.behaviors, info.flavors);
MACH_CHECK_ERROR (kret);
disp_exception (&info);
}
}
void
_initialize_darwin_info_commands (void)
{
add_info ("mach-tasks", info_mach_tasks_command,
_("Get list of tasks in system."));
add_info ("mach-ports", info_mach_ports_command,
_("Get list of ports in a task."));
add_info ("mach-port", info_mach_port_command,
_("Get info on a specific port."));
add_info ("mach-task", info_mach_task_command,
_("Get info on a specific task."));
add_info ("mach-threads", info_mach_threads_command,
_("Get list of threads in a task."));
add_info ("mach-thread", info_mach_thread_command,
_("Get info on a specific thread."));
add_info ("mach-regions", info_mach_regions_command,
_("Get information on all mach region for the task."));
add_info ("mach-regions-rec", info_mach_regions_recurse_command,
_("Get information on all mach sub region for the task."));
add_info ("mach-region", info_mach_region_command,
_("Get information on mach region at given address."));
add_info ("mach-exceptions", info_mach_exceptions_command,
_("Disp mach exceptions."));
}