a6d9a66e23
* breakpoint.c: Include "arch-utils.h". (set_raw_breakpoint_without_location): Add GDBARCH parameter. Use it to set breakpoint architecture. (set_raw_breakpoint): Add GDBARCH parameter. (create_internal_breakpoint): Likewise. (create_catchpoint): Likewise. (create_fork_vfork_event_catchpoint): Likewise. (create_breakpoint): Likewise. (create_breakpoints): Likewise. (break_command_really): Likewise. (create_ada_exception_breakpoint): Likewise. Update local callers to pass architecture: (create_internal_breakpoint): Update. (create_overlay_event_breakpoint): Update. (create_longjmp_master_breakpoint): Update. (create_thread_event_breakpoint): Update. (create_solib_event_breakpoint): Update. (create_catchpoint): Update. (create_fork_vfork_event_catchpoint): Update. (set_momentary_breakpoint): Update. (clone_momentary_breakpoint): Update. (create_breakpoint): Update. (create_breakpoints): Update. (break_command_really): Update. (break_command_1): Update. (set_breakpoint): Update. (watch_command_1): Update. (catch_fork_command_1): Update. (catch_exec_commnd_1): Update. (handle_gnu_v3_exceptions): Update. (create_ada_exception_breakpoint): Update. (catch_ada_exception_command): Update. (catch_assert_command): Update. (trace_command): Update. * breakpoint.h (struct bp_location): New member GDBARCH. * breakpoint.c (get_sal_arch): New function. (set_raw_breakpoint): Set location architecture. (add_location_to_breakpoint): Likewise. (clone_momentary_breakpoint): Likewise. (watch_command_1): Likewise. (update_watchpoint): Likewise. (bp_loc_is_permanent): Use location architecture instead of current_gdbarch. (adjust_breakpoint_address): Add GDBARCH parameter; use it instead of current_gdbarch. Update callers of adjust_breakpoint_address to pass breakpoint location architecture: (set_raw_breakpoint): Update. (watch_command_1): Update. * tracepoint.c: (collect_symbol): Add GDBARCH parameter, use instead of current_gdbarch. (add_local_symbols): Add GDBARCH parameter. Pass to collect_symbol. (encode_actions): Pass tracepoint architecture to add_local_symbols (encode_actions): Use tracepoint architecture instead of current_gdbarch. Pass it to add_local_symbols and collect_symbol. * breakpoint.h (struct breakpoint_ops): Replace last_addr parameter of print_one callback with last_loc. * breakpoint.c (print_one_breakpoint_location): Replace last_addr parameter with last_loc. (print_one_breakpoint): Likewise. (do_captured_breakpoint_query): Update call. (breakpoint_1): Pass last_loc instead of last_addr to print_one_breakpoint. Pass last location architecture instead of current_gdbarch to set_next_address. Update all implementations of the print_one callback: * breakpoint.c (print_one_catch_fork): Update. (print_one_catch_vfork): Update. (print_one_catch_exec): Update. (print_one_exception_catchpoint): Update. * ada-lang.c (print_one_exception): Update. (print_one_catch_exception): Update. (print_one_catch_exception_unhandled): Update. (print_one_catch_assert): Update. * breakpoint.c (print_one_breakpoint_location): Add PRINT_ADDRESS_BITS parameter. Use it instead of gdbarch_addr_bit (current_gdbarch). (print_one_breakpoint): Add PRINT_ADDRESS_BITS parameter and pass it to print_one_breakpoint_location. (breakpoint_address_bits): New function. (do_captured_breakpoint_query): Compute number of address bits to print and pass it to print_one_breakpoint. (breakpoint_1): Likewise. Use it instead of current_gdbarch. * breakpoint.h (create_thread_event_breakpoint): Add GDBARCH. * breakpoint.c (create_thread_event_breakpoint): Likewise. Update callers to create_thread_event_breakpoint: * aix-thread.c (pd_enable): Update. * linux-thread-db.c (enable_thread_event): Update. * breakpoint.h (create_solib_event_breakpoint): Add GDBARCH. * breakpoint.c (create_solib_event_breakpoint): Likewise. Update callers to create_solib_event_breakpoint: * solib-frv.c (enable_break, enable_break2): Update. * solib-pa64.c (pa64_solib_create_inferior_hook): Update. * solib-som.c (som_solib_create_inferior_hook): Update. * solib-darwin.c (darwin_solib_create_inferior_hook): Update. * solib-svr4.c (enable_break): Update. * breakpoint.h (insert_single_step_breakpoint): Add GDBARCH. * breakpoint.c (insert_single_step_breakpoint): Likewise. Update callers to insert_single_step_breakpoint: * alpha-tdep.c (alpha_software_single_step): Update. * arm-linux-tdep.c (arm_linux_software_single_step): Update. * arm-tdep.c (arm_software_single_step): Update. * cris-tdep.c (cris_software_single_step): Update. * rs6000-aix-tdep.c (rs6000_software_single_step): Update. * rs6000-tdep.c (ppc_deal_with_atomic_sequence): Update. * sparc-tdep.c (sparc_software_single_step): Update. * spu-tdep.c (spu_software_single_step): Update. * mips-tdep.c (deal_with_atomic_sequence): Add GDBARCH parameter. Pass it to insert_single_step_breakpoint. (mips_software_single_step): Pass architecture to deal_with_atomic_sequence and insert_single_step_breakpoint. * breakpoint.h (deprecated_insert_raw_breakpoint): Add GDBARCH. (deprecated_remove_raw_breakpoint): Likewise. * breakpoint.c (deprecated_insert_raw_breakpoint): Add GDBARCH. (deprecated_remove_raw_breakpoint): Likewise. Update callers to deprecated_insert_raw_breakpoint and deprecated_remove_raw_breakpoint: * breakpoint.c (single_step_gdbarch): New static variable. (insert_single_step_breakpoint): Pass GDBARCH parameter to deprecated_insert_raw_breakpoint. Store it in single_step_gdbarch. (remove_single_step_breakpoints): Pass architecture stored in single_step_gdbarch to deprecated_remove_raw_breakpoint. * rs6000-nat.c (exec_one_dummy_insn): Update. * solib-irix.c (enable_break, disable_break): Update. * procfs.c (procfs_mourn_inferior): Update. (remove_dbx_link_breakpoint): Update. * breakpoint.h (set_breakpoint): Add GDBARCH parameter. (set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise. * breakpoint.c (set_breakpoint): Add GDBARCH parameter. (set_momentary_breakpoint, set_momentary_breakpoint_at_pc): Likewise. Update callers to set_breakpoint, set_momentary_breakpoint and set_momentary_breakpoint_at_pc: * breakpoint.c (set_momentary_breakpoint_at_pc): Update. (until_break_command): Update. * infcall.c (call_function_by_hand): Update. * infcmd.c (finish_backward, finish_forward): Update. * infrun.c (insert_step_resume_breakpoint_at_sal): Add GDBARCH parameter. Pass it to set_momentary_breakpoint. (insert_longjmp_resume_breakpoint): Add GDBARCH parameter. Pass it to set_momentary_breakpoint_at_pc. (handle_inferior_event): Update. (insert_step_resume_breakpoint_at_frame): Update. (insert_step_resume_breakpoint_at_caller): Update.. * mi/mi-cmd-break.c: Include "arch-utils.h". (mi_cmd_break_insert): Update. * target.h (struct target_ops): Add GDBARCH parameter to to_insert_breakpoint, to_remove_breakpoint, to_insert_hw_breakpoint, and to_remove_hw_breakpoint members. (target_insert_breakpoint, target_remove_breakpoint, target_insert_hw_breakpoint, target_remove_hw_breakpoint): Add GDBARCH parameter, pass to target routine. (memory_remove_breakpoint, memory_insert_breakpoint): Add GDBARCH parameter. * target.c (debug_to_insert_breakpoint, debug_to_remove_breakpoint, debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint): Add GDBARCH parameter, pass to target routine. (update_current_target): Update function signature. * breakpoint.c (insert_bp_location, remove_breakpoint, deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint): Pass architecture to target_ routines. Update all implementations of the target breakpoint routines to take GDBARCH parameter and use it instead of GDBARCH as appropriate: * corelow.c (ignore): Update. * exec.c (ignore): Update. * mem-break.c (memory_insert_breakpoint): Update. (memory_remove_breakpoint): Update. * monitor.c (monitor_insert_breakpoint): Update. (monitor_remove_breakpoint): Update. * record.c (record_insert_breakpoint): Update. (record_beneath_to_insert_breakpoint): Update. (record_remove_breakpoint): Update. (record_beneath_to_remove_breakpoint): Update. * remote.c (remote_insert_breakpoint): Update. (remote_remove_breakpoint): Update. (remote_insert_hw_breakpoint): Update. (remote_remove_hw_breakpoint): Update. * remote-m32r-sdi.c (m32r_insert_breakpoint): Update. (m32r_remove_breakpoint): Update. * remote-mips.c (mips_insert_breakpoint): Update. (mips_remove_breakpoint): Update. * i386-nat.c (i386_insert_hw_breakpoint): Update. (i386_remove_hw_breakpoint): Update. * nto-procfs.c (procfs_insert_breakpoint): Update. (procfs_remove_breakpoint): Update. (procfs_insert_hw_breakpoint): Update. (procfs_remove_hw_breakpoint): Update. doc/ChangeLog: * gdbint.texi (Examples of Use of @code{ui_out} functions): Update example code extrated from breakpoint.c.
254 lines
5.9 KiB
C
254 lines
5.9 KiB
C
/* MI Command Set - breakpoint and watchpoint commands.
|
|
Copyright (C) 2000, 2001, 2002, 2007, 2008, 2009
|
|
Free Software Foundation, Inc.
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "arch-utils.h"
|
|
#include "mi-cmds.h"
|
|
#include "ui-out.h"
|
|
#include "mi-out.h"
|
|
#include "breakpoint.h"
|
|
#include "gdb_string.h"
|
|
#include "mi-getopt.h"
|
|
#include "gdb.h"
|
|
#include "exceptions.h"
|
|
#include "observer.h"
|
|
|
|
enum
|
|
{
|
|
FROM_TTY = 0
|
|
};
|
|
|
|
/* True if MI breakpoint observers have been registered. */
|
|
|
|
static int mi_breakpoint_observers_installed;
|
|
|
|
/* Control whether breakpoint_notify may act. */
|
|
|
|
static int mi_can_breakpoint_notify;
|
|
|
|
/* Output a single breakpoint, when allowed. */
|
|
|
|
static void
|
|
breakpoint_notify (int b)
|
|
{
|
|
if (mi_can_breakpoint_notify)
|
|
gdb_breakpoint_query (uiout, b, NULL);
|
|
}
|
|
|
|
enum bp_type
|
|
{
|
|
REG_BP,
|
|
HW_BP,
|
|
REGEXP_BP
|
|
};
|
|
|
|
/* Implements the -break-insert command.
|
|
See the MI manual for the list of possible options. */
|
|
|
|
void
|
|
mi_cmd_break_insert (char *command, char **argv, int argc)
|
|
{
|
|
char *address = NULL;
|
|
enum bp_type type = REG_BP;
|
|
int temp_p = 0;
|
|
int thread = -1;
|
|
int ignore_count = 0;
|
|
char *condition = NULL;
|
|
int pending = 0;
|
|
int enabled = 1;
|
|
|
|
struct gdb_exception e;
|
|
struct gdb_events *old_hooks;
|
|
enum opt
|
|
{
|
|
HARDWARE_OPT, TEMP_OPT /*, REGEXP_OPT */ , CONDITION_OPT,
|
|
IGNORE_COUNT_OPT, THREAD_OPT, PENDING_OPT, DISABLE_OPT
|
|
};
|
|
static struct mi_opt opts[] =
|
|
{
|
|
{"h", HARDWARE_OPT, 0},
|
|
{"t", TEMP_OPT, 0},
|
|
{"c", CONDITION_OPT, 1},
|
|
{"i", IGNORE_COUNT_OPT, 1},
|
|
{"p", THREAD_OPT, 1},
|
|
{"f", PENDING_OPT, 0},
|
|
{"d", DISABLE_OPT, 0},
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
/* Parse arguments. It could be -r or -h or -t, <location> or ``--''
|
|
to denote the end of the option list. */
|
|
int optind = 0;
|
|
char *optarg;
|
|
while (1)
|
|
{
|
|
int opt = mi_getopt ("mi_cmd_break_insert", argc, argv, opts, &optind, &optarg);
|
|
if (opt < 0)
|
|
break;
|
|
switch ((enum opt) opt)
|
|
{
|
|
case TEMP_OPT:
|
|
temp_p = 1;
|
|
break;
|
|
case HARDWARE_OPT:
|
|
type = HW_BP;
|
|
break;
|
|
#if 0
|
|
case REGEXP_OPT:
|
|
type = REGEXP_BP;
|
|
break;
|
|
#endif
|
|
case CONDITION_OPT:
|
|
condition = optarg;
|
|
break;
|
|
case IGNORE_COUNT_OPT:
|
|
ignore_count = atol (optarg);
|
|
break;
|
|
case THREAD_OPT:
|
|
thread = atol (optarg);
|
|
break;
|
|
case PENDING_OPT:
|
|
pending = 1;
|
|
break;
|
|
case DISABLE_OPT:
|
|
enabled = 0;
|
|
}
|
|
}
|
|
|
|
if (optind >= argc)
|
|
error (_("mi_cmd_break_insert: Missing <location>"));
|
|
if (optind < argc - 1)
|
|
error (_("mi_cmd_break_insert: Garbage following <location>"));
|
|
address = argv[optind];
|
|
|
|
/* Now we have what we need, let's insert the breakpoint! */
|
|
if (! mi_breakpoint_observers_installed)
|
|
{
|
|
observer_attach_breakpoint_created (breakpoint_notify);
|
|
observer_attach_breakpoint_modified (breakpoint_notify);
|
|
observer_attach_breakpoint_deleted (breakpoint_notify);
|
|
mi_breakpoint_observers_installed = 1;
|
|
}
|
|
|
|
mi_can_breakpoint_notify = 1;
|
|
/* Make sure we restore hooks even if exception is thrown. */
|
|
TRY_CATCH (e, RETURN_MASK_ALL)
|
|
{
|
|
switch (type)
|
|
{
|
|
case REG_BP:
|
|
set_breakpoint (get_current_arch (), address, condition,
|
|
0 /*hardwareflag */ , temp_p,
|
|
thread, ignore_count,
|
|
pending, enabled);
|
|
break;
|
|
case HW_BP:
|
|
set_breakpoint (get_current_arch (), address, condition,
|
|
1 /*hardwareflag */ , temp_p,
|
|
thread, ignore_count,
|
|
pending, enabled);
|
|
break;
|
|
#if 0
|
|
case REGEXP_BP:
|
|
if (temp_p)
|
|
error (_("mi_cmd_break_insert: Unsupported tempoary regexp breakpoint"));
|
|
else
|
|
rbreak_command_wrapper (address, FROM_TTY);
|
|
break;
|
|
#endif
|
|
default:
|
|
internal_error (__FILE__, __LINE__,
|
|
_("mi_cmd_break_insert: Bad switch."));
|
|
}
|
|
}
|
|
mi_can_breakpoint_notify = 0;
|
|
if (e.reason < 0)
|
|
throw_exception (e);
|
|
}
|
|
|
|
enum wp_type
|
|
{
|
|
REG_WP,
|
|
READ_WP,
|
|
ACCESS_WP
|
|
};
|
|
|
|
/* Insert a watchpoint. The type of watchpoint is specified by the
|
|
first argument:
|
|
-break-watch <expr> --> insert a regular wp.
|
|
-break-watch -r <expr> --> insert a read watchpoint.
|
|
-break-watch -a <expr> --> insert an access wp. */
|
|
|
|
void
|
|
mi_cmd_break_watch (char *command, char **argv, int argc)
|
|
{
|
|
char *expr = NULL;
|
|
enum wp_type type = REG_WP;
|
|
enum opt
|
|
{
|
|
READ_OPT, ACCESS_OPT
|
|
};
|
|
static struct mi_opt opts[] =
|
|
{
|
|
{"r", READ_OPT, 0},
|
|
{"a", ACCESS_OPT, 0},
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
/* Parse arguments. */
|
|
int optind = 0;
|
|
char *optarg;
|
|
while (1)
|
|
{
|
|
int opt = mi_getopt ("mi_cmd_break_watch", argc, argv, opts, &optind, &optarg);
|
|
if (opt < 0)
|
|
break;
|
|
switch ((enum opt) opt)
|
|
{
|
|
case READ_OPT:
|
|
type = READ_WP;
|
|
break;
|
|
case ACCESS_OPT:
|
|
type = ACCESS_WP;
|
|
break;
|
|
}
|
|
}
|
|
if (optind >= argc)
|
|
error (_("mi_cmd_break_watch: Missing <expression>"));
|
|
if (optind < argc - 1)
|
|
error (_("mi_cmd_break_watch: Garbage following <expression>"));
|
|
expr = argv[optind];
|
|
|
|
/* Now we have what we need, let's insert the watchpoint! */
|
|
switch (type)
|
|
{
|
|
case REG_WP:
|
|
watch_command_wrapper (expr, FROM_TTY);
|
|
break;
|
|
case READ_WP:
|
|
rwatch_command_wrapper (expr, FROM_TTY);
|
|
break;
|
|
case ACCESS_WP:
|
|
awatch_command_wrapper (expr, FROM_TTY);
|
|
break;
|
|
default:
|
|
error (_("mi_cmd_break_watch: Unknown watchpoint type."));
|
|
}
|
|
}
|