1991-03-29 00:26:26 +08:00
|
|
|
|
/* Everything about breakpoints, for GDB.
|
1994-07-14 10:15:39 +08:00
|
|
|
|
Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994
|
|
|
|
|
Free Software Foundation, Inc.
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
1991-03-29 00:26:26 +08:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
This program is distributed in the hope that it will be useful,
|
1991-03-29 00:26:26 +08:00
|
|
|
|
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
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
1992-03-30 06:33:35 +08:00
|
|
|
|
#include <ctype.h>
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include "symtab.h"
|
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "breakpoint.h"
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
#include "gdbtypes.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "gdbcore.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "ctype.h"
|
|
|
|
|
#include "command.h"
|
|
|
|
|
#include "inferior.h"
|
1993-11-02 06:25:23 +08:00
|
|
|
|
#include "thread.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include "target.h"
|
1991-09-19 10:54:17 +08:00
|
|
|
|
#include "language.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#include <string.h>
|
1992-06-18 05:53:28 +08:00
|
|
|
|
#include "demangle.h"
|
1994-07-14 10:15:39 +08:00
|
|
|
|
#include "annotate.h"
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* local function prototypes */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
catch_command_1 PARAMS ((char *, int, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_delete_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_delete_breakpoint PARAMS ((struct breakpoint *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_once_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_once_breakpoint PARAMS ((struct breakpoint *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
disable_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
disable_breakpoint PARAMS ((struct breakpoint *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_breakpoint PARAMS ((struct breakpoint *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
map_breakpoint_numbers PARAMS ((char *, void (*)(struct breakpoint *)));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ignore_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
breakpoint_re_set_one PARAMS ((char *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
delete_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
clear_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
catch_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
get_catch_sals PARAMS ((int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
watch_command PARAMS ((char *, int));
|
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
static int
|
1994-06-11 09:09:25 +08:00
|
|
|
|
can_use_hardware_watchpoint PARAMS ((struct value *));
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
static void
|
|
|
|
|
tbreak_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
break_command_1 PARAMS ((char *, int, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
mention PARAMS ((struct breakpoint *));
|
|
|
|
|
|
|
|
|
|
static struct breakpoint *
|
|
|
|
|
set_raw_breakpoint PARAMS ((struct symtab_and_line));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
check_duplicates PARAMS ((CORE_ADDR));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
describe_other_breakpoints PARAMS ((CORE_ADDR));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
breakpoints_info PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
1992-06-18 05:53:28 +08:00
|
|
|
|
breakpoint_1 PARAMS ((int, int));
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
|
|
|
|
static bpstat
|
|
|
|
|
bpstat_alloc PARAMS ((struct breakpoint *, bpstat));
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
breakpoint_cond_eval PARAMS ((char *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cleanup_executing_breakpoints PARAMS ((int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
commands_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
condition_command PARAMS ((char *, int));
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
get_number PARAMS ((char **));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_breakpoint_count PARAMS ((int));
|
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
static int
|
|
|
|
|
remove_breakpoint PARAMS ((struct breakpoint *));
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
extern int addressprint; /* Print machine addresses? */
|
|
|
|
|
|
|
|
|
|
/* Are we executing breakpoint commands? */
|
|
|
|
|
static int executing_breakpoint_commands;
|
|
|
|
|
|
1992-02-28 00:28:59 +08:00
|
|
|
|
/* Walk the following statement or block through all breakpoints.
|
|
|
|
|
ALL_BREAKPOINTS_SAFE does so even if the statment deletes the current
|
|
|
|
|
breakpoint. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#define ALL_BREAKPOINTS(b) for (b = breakpoint_chain; b; b = b->next)
|
|
|
|
|
|
1992-02-28 00:28:59 +08:00
|
|
|
|
#define ALL_BREAKPOINTS_SAFE(b,tmp) \
|
|
|
|
|
for (b = breakpoint_chain; \
|
|
|
|
|
b? (tmp=b->next, 1): 0; \
|
|
|
|
|
b = tmp)
|
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
/* By default no support for hardware watchpoints is assumed. */
|
|
|
|
|
#ifndef TARGET_CAN_USE_HARDWARE_WATCHPOINT
|
1994-06-11 09:09:25 +08:00
|
|
|
|
#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(TYPE,CNT,OTHERTYPE) 0
|
|
|
|
|
#define target_remove_watchpoint(ADDR,LEN,TYPE) -1
|
|
|
|
|
#define target_insert_watchpoint(ADDR,LEN,TYPE) -1
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef target_insert_hw_breakpoint
|
|
|
|
|
#define target_remove_hw_breakpoint(ADDR,SHADOW) -1
|
|
|
|
|
#define target_insert_hw_breakpoint(ADDR,SHADOW) -1
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef target_stopped_data_address
|
|
|
|
|
#define target_stopped_data_address() 0
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
#endif
|
|
|
|
|
|
1994-07-14 10:15:39 +08:00
|
|
|
|
/* True if breakpoint hit counts should be displayed in breakpoint info. */
|
|
|
|
|
|
|
|
|
|
int show_breakpoint_hit_counts = 1;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Chain of all breakpoints defined. */
|
|
|
|
|
|
1993-12-31 04:34:06 +08:00
|
|
|
|
static struct breakpoint *breakpoint_chain;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Number of last breakpoint made. */
|
|
|
|
|
|
|
|
|
|
static int breakpoint_count;
|
|
|
|
|
|
|
|
|
|
/* Set breakpoint count to NUM. */
|
1994-07-14 10:15:39 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
set_breakpoint_count (num)
|
|
|
|
|
int num;
|
|
|
|
|
{
|
|
|
|
|
breakpoint_count = num;
|
|
|
|
|
set_internalvar (lookup_internalvar ("bpnum"),
|
Fix some infrastructure to be able to cope with host and target
machines with different sized basic types (ints, ptrs, etc).
(Idea from pierre@la.tce.com (Pierre Willard).)
* value.c (value_from_longest): Rename from value_from_long.
Handle pointer types as well as integers, so that targets with
different pointer sizes from the host can be accomodated.
* breakpoint.c, convex-tdep.c, eval.c, expprint.c, printcmd.c,
valarith.c, valops.c, valprint.c, value.h, values.c: Rename
uses of value_from_long to value_from_longest.
* eval.c, findvar.c, printcmd.c, valarith.c, valops.c: Pass
the correct pointer type to value_from_long{est}.
* remote-vx.c: Remove obsolete code for calling functions via
vxworks kludge interface (it referenced value_from_long).
* valops.c (value_string): Find malloc with lookup_misc_func, not
raw search.
* breakpoint.c, remote-vx.c: Reword strings printed by
catch_errors callers.
1991-09-06 16:09:40 +09:00
|
|
|
|
value_from_longest (builtin_type_int, (LONGEST) num));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1994-07-14 10:15:39 +08:00
|
|
|
|
/* Used in run_command to zero the hit count when a new run starts. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
clear_breakpoint_hit_counts ()
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
b->hit_count = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Default address, symtab and line to put a breakpoint at
|
|
|
|
|
for "break" command with no arg.
|
|
|
|
|
if default_breakpoint_valid is zero, the other three are
|
|
|
|
|
not valid, and "break" with no arg is an error.
|
|
|
|
|
|
|
|
|
|
This set by print_stack_frame, which calls set_default_breakpoint. */
|
|
|
|
|
|
|
|
|
|
int default_breakpoint_valid;
|
|
|
|
|
CORE_ADDR default_breakpoint_address;
|
|
|
|
|
struct symtab *default_breakpoint_symtab;
|
|
|
|
|
int default_breakpoint_line;
|
|
|
|
|
|
|
|
|
|
/* *PP is a string denoting a breakpoint. Get the number of the breakpoint.
|
|
|
|
|
Advance *PP after the string and any trailing whitespace.
|
|
|
|
|
|
|
|
|
|
Currently the string can either be a number or "$" followed by the name
|
|
|
|
|
of a convenience variable. Making it an expression wouldn't work well
|
|
|
|
|
for map_breakpoint_numbers (e.g. "4 + 5 + 6"). */
|
|
|
|
|
static int
|
|
|
|
|
get_number (pp)
|
|
|
|
|
char **pp;
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
|
|
|
|
char *p = *pp;
|
|
|
|
|
|
|
|
|
|
if (p == NULL)
|
|
|
|
|
/* Empty line means refer to the last breakpoint. */
|
|
|
|
|
return breakpoint_count;
|
|
|
|
|
else if (*p == '$')
|
|
|
|
|
{
|
|
|
|
|
/* Make a copy of the name, so we can null-terminate it
|
|
|
|
|
to pass to lookup_internalvar(). */
|
|
|
|
|
char *varname;
|
|
|
|
|
char *start = ++p;
|
* breakpoint.c, breakpoint.h, c-valprint.c, ch-valprint.c,
cp-valprint.c, eval.c, expprint.c, findvar.c, language.c,
objfiles.h, infcmd.c, printcmd.c, stack.c, typeprint.c,
valarith.c, valops.c, valprint.c, value.h, values.c: Replace
value with value_ptr. This is for the ptx compiler.
* objfiles.h, target.h: Don't declare a "sec_ptr" field using a
"sec_ptr" typedef.
* symm-nat.c: Add a bunch of stuff for symmetry's ptrace stuff.
#if 0 i386_float_info.
* symm-tdep.c (round): Remove. Also remove sgttyb.
* symm-tdep.c: Remove lots of stuff which duplicates stuff from
i386-tdep.c. Remove register_addr and ptx_coff_regno_to_gdb.
* i386-tdep.c (i386_frame_find_saved_regs): Put in
I386_REGNO_TO_SYMMETRY check in case it is needed for Dynix
someday.
* config/i386/nm-symmetry.h: Change KERNEL_U_ADDR. Move
stuff from PTRACE_READ_REGS, PTRACE_WRITE_REGS macros to
symm-nat.c. Define CHILD_WAIT and declare child_wait().
* config/i386/tm-symmetry.h: Remove call function stuff; stuff in
tm-i386v.h is apparently OK.
* config/i386/xm-symmetry.h [_SEQUENT_]: Define HAVE_TERMIOS not
HAVE_TERMIO. Define MEM_FNS_DECLARED, NEED_POSIX_SETPGID, and
USE_O_NOCTTY.
1994-03-03 09:00:57 +08:00
|
|
|
|
value_ptr val;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
while (isalnum (*p) || *p == '_')
|
|
|
|
|
p++;
|
|
|
|
|
varname = (char *) alloca (p - start + 1);
|
|
|
|
|
strncpy (varname, start, p - start);
|
|
|
|
|
varname[p - start] = '\0';
|
|
|
|
|
val = value_of_internalvar (lookup_internalvar (varname));
|
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (val)) != TYPE_CODE_INT)
|
|
|
|
|
error (
|
|
|
|
|
"Convenience variables used to specify breakpoints must have integer values."
|
|
|
|
|
);
|
|
|
|
|
retval = (int) value_as_long (val);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
1992-02-28 01:45:02 +08:00
|
|
|
|
if (*p == '-')
|
|
|
|
|
++p;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
while (*p >= '0' && *p <= '9')
|
|
|
|
|
++p;
|
|
|
|
|
if (p == *pp)
|
|
|
|
|
/* There is no number here. (e.g. "cond a == b"). */
|
|
|
|
|
error_no_arg ("breakpoint number");
|
|
|
|
|
retval = atoi (*pp);
|
|
|
|
|
}
|
|
|
|
|
if (!(isspace (*p) || *p == '\0'))
|
|
|
|
|
error ("breakpoint number expected");
|
|
|
|
|
while (isspace (*p))
|
|
|
|
|
p++;
|
|
|
|
|
*pp = p;
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* condition N EXP -- set break condition of breakpoint N to EXP. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
condition_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
char *p;
|
|
|
|
|
register int bnum;
|
|
|
|
|
|
|
|
|
|
if (arg == 0)
|
|
|
|
|
error_no_arg ("breakpoint number");
|
|
|
|
|
|
|
|
|
|
p = arg;
|
|
|
|
|
bnum = get_number (&p);
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->number == bnum)
|
|
|
|
|
{
|
|
|
|
|
if (b->cond)
|
|
|
|
|
{
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)b->cond);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->cond = 0;
|
|
|
|
|
}
|
|
|
|
|
if (b->cond_string != NULL)
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)b->cond_string);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (*p == 0)
|
|
|
|
|
{
|
|
|
|
|
b->cond = 0;
|
|
|
|
|
b->cond_string = NULL;
|
|
|
|
|
if (from_tty)
|
1992-06-18 05:53:28 +08:00
|
|
|
|
printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
arg = p;
|
|
|
|
|
/* I don't know if it matters whether this is the string the user
|
|
|
|
|
typed in or the decompiled expression. */
|
|
|
|
|
b->cond_string = savestring (arg, strlen (arg));
|
1991-09-19 10:54:17 +08:00
|
|
|
|
b->cond = parse_exp_1 (&arg, block_for_pc (b->address), 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (*arg)
|
|
|
|
|
error ("Junk at end of expression");
|
|
|
|
|
}
|
The point of these changes is to avoid reading the frame pointer
and stack pointer during stepping, to speed things up.
A. Changes to not select a frame until we need a selected frame:
* blockframe.c (flush_cached_frames): Call select_frame (NULL, -1).
* infrun.c (wait_for_inferior): Move call to select_frame back to
normal_stop. This reverts a change of 13 Apr 94 (it says Jeff
Law, but the change was my idea); the only reason for that change
was so we could save and restore the selected frame in
wait_for_inferior, and now that flush_cached frames clears the
selected frame, that should work OK now.
B. Changes to not create a current_frame until we need one:
* blockframe.c (get_current_frame): If current_frame is NULL, try
to create an innermost frame.
* sparc-tdep.c (sparc_pop_frame), infcmd.c (run-stack_dummy),
infrun.c (wait_for_inferior), thread.c (thread_switch),
convex-tdep.c (set_thread_command), a29k-tdep.c (pop_frame),
alpha-tdep.c (alpha_pop_frame), convex-xdep.c (core_file_command),
h8300-tdep.c (h8300_pop_frame), h8500-tdep.c (h8300_pop_frame),
hppa-tdep.c (hppa_pop_frame), i386-tdep.c (i386_pop_frame),
i960-tdep.c (pop_frame), m68k-tdep.c
(m68k_pop_frame), mips-tdep.c (mips_pop_frame), rs6000-tdep.c
(push_dummy_frame, pop_dummy_frame, pop_frame), sh-tdep.c
(pop_frame), config/arm/tm-arm.h (POP_FRAME),
config/convex/tm-convex.h (POP_FRAME), config/gould/tm-pn.h
(POP_FRAME), config/ns32k/tm-merlin.h (POP_FRAME),
config/ns32k/tm-umax.h (POP_FRAME), config/tahoe/tm-tahoe.h
(POP_FRAME), config/vax/tm-vax.h (POP_FRAME): Don't
call create_new_frame.
* corelow.c (core_open), altos-xdep.c (core_file_command),
arm-xdep.c (core_file_command), gould-xdep.c (core_file_command),
m3-nat.c (select_thread), sun386-nat.c (core_file_command),
umax-xdep.c (core_file_command): Don't call create_new_frame; do
call flush_cached_frames.
* blockframe.c (reinit_frame_cache): Don't call create_new_frame
or select_frame.
C. Changes to get rid of stop_frame_address and instead only
fetch the frame pointer when we need it.
* breakpoint.c (bpstat_stop_status): Remove argument
frame_address; use FRAME_FP (get_current_frame ()).
* infrun.c (wait_for_inferior): Don't pass frame pointer to
bpstat_stop_status.
* infrun.c (wait_for_inferior): Use FRAME_FP (get_current_frame
()) instead of stop_frame_address.
* infrun.c (save_inferior_status, restore_inferior_status),
inferior.h (struct inferior_status): Don't save and restore
stop_frame_address.
* inferior.h, infcmd.c, thread.c (thread_switch), m3-nat.c
(select_thread): Remove stop_frame_address and uses thereof.
D. Same thing for the stack pointer.
* infrun.c (wait_for_inferior): Remove stop_sp and replace
uses thereof with read_sp ().
E. Change to eliminate one nasty little spot where we were
wanting to know the frame pointer from before the current step
(idea from GDB 3.5, which saved my ass, because my other ideas of
how to fix it were very baroque).
* infrun.c: Remove prev_frame_address.
* infrun.c (wait_for_inferior, step_over_function): Use
step_frame_address instead of prev_frame_address.
F. Same basic idea for the stack pointer.
* inferior.h, infcmd.c: New variable step_sp.
* infcmd.c (step_1, until_next_command): Set it.
* infrun.c: Remove prev_sp and replace uses by step_sp.
* infrun.c (wait_for_inferior): If we get out of the step
range, then set step_sp to the current stack pointer before we
start going again.
1994-10-08 11:41:21 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
error ("No breakpoint number %d.", bnum);
|
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
commands_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
char *p;
|
|
|
|
|
register int bnum;
|
|
|
|
|
struct command_line *l;
|
|
|
|
|
|
|
|
|
|
/* If we allowed this, we would have problems with when to
|
|
|
|
|
free the storage, if we change the commands currently
|
|
|
|
|
being read from. */
|
|
|
|
|
|
|
|
|
|
if (executing_breakpoint_commands)
|
|
|
|
|
error ("Can't use the \"commands\" command among a breakpoint's commands.");
|
|
|
|
|
|
|
|
|
|
p = arg;
|
|
|
|
|
bnum = get_number (&p);
|
|
|
|
|
if (p && *p)
|
|
|
|
|
error ("Unexpected extra arguments following breakpoint number.");
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->number == bnum)
|
|
|
|
|
{
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
if (from_tty && input_from_terminal_p ())
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
printf_filtered ("Type commands for when breakpoint %d is hit, one per line.\n\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
End with a line saying just \"end\".\n", bnum);
|
|
|
|
|
l = read_command_lines ();
|
|
|
|
|
free_command_lines (&b->commands);
|
|
|
|
|
b->commands = l;
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
error ("No breakpoint number %d.", bnum);
|
|
|
|
|
}
|
|
|
|
|
|
1991-04-19 12:22:12 +09:00
|
|
|
|
extern int memory_breakpoint_size; /* from mem-break.c */
|
|
|
|
|
|
|
|
|
|
/* Like target_read_memory() but if breakpoints are inserted, return
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
the shadow contents instead of the breakpoints themselves.
|
|
|
|
|
|
|
|
|
|
Read "memory data" from whatever target or inferior we have.
|
|
|
|
|
Returns zero if successful, errno value if not. EIO is used
|
|
|
|
|
for address out of bounds. If breakpoints are inserted, returns
|
|
|
|
|
shadow contents, not the breakpoints themselves. From breakpoint.c. */
|
|
|
|
|
|
1991-04-19 12:22:12 +09:00
|
|
|
|
int
|
|
|
|
|
read_memory_nobpt (memaddr, myaddr, len)
|
|
|
|
|
CORE_ADDR memaddr;
|
|
|
|
|
char *myaddr;
|
|
|
|
|
unsigned len;
|
|
|
|
|
{
|
|
|
|
|
int status;
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
if (memory_breakpoint_size < 0)
|
1993-07-14 23:12:05 +08:00
|
|
|
|
/* No breakpoints on this machine. FIXME: This should be
|
|
|
|
|
dependent on the debugging target. Probably want
|
|
|
|
|
target_insert_breakpoint to return a size, saying how many
|
|
|
|
|
bytes of the shadow contents are used, or perhaps have
|
|
|
|
|
something like target_xfer_shadow. */
|
1991-04-19 12:22:12 +09:00
|
|
|
|
return target_read_memory (memaddr, myaddr, len);
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
{
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (b->type == bp_watchpoint
|
|
|
|
|
|| b->type == bp_hardware_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
|| b->type == bp_read_watchpoint
|
|
|
|
|
|| b->type == bp_access_watchpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|| !b->inserted)
|
1991-04-19 12:22:12 +09:00
|
|
|
|
continue;
|
|
|
|
|
else if (b->address + memory_breakpoint_size <= memaddr)
|
|
|
|
|
/* The breakpoint is entirely before the chunk of memory
|
|
|
|
|
we are reading. */
|
|
|
|
|
continue;
|
|
|
|
|
else if (b->address >= memaddr + len)
|
|
|
|
|
/* The breakpoint is entirely after the chunk of memory we
|
|
|
|
|
are reading. */
|
|
|
|
|
continue;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Copy the breakpoint from the shadow contents, and recurse
|
|
|
|
|
for the things before and after. */
|
|
|
|
|
|
|
|
|
|
/* Addresses and length of the part of the breakpoint that
|
|
|
|
|
we need to copy. */
|
|
|
|
|
CORE_ADDR membpt = b->address;
|
|
|
|
|
unsigned int bptlen = memory_breakpoint_size;
|
|
|
|
|
/* Offset within shadow_contents. */
|
|
|
|
|
int bptoffset = 0;
|
|
|
|
|
|
|
|
|
|
if (membpt < memaddr)
|
|
|
|
|
{
|
|
|
|
|
/* Only copy the second part of the breakpoint. */
|
|
|
|
|
bptlen -= memaddr - membpt;
|
|
|
|
|
bptoffset = memaddr - membpt;
|
|
|
|
|
membpt = memaddr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (membpt + bptlen > memaddr + len)
|
|
|
|
|
{
|
|
|
|
|
/* Only copy the first part of the breakpoint. */
|
|
|
|
|
bptlen -= (membpt + bptlen) - (memaddr + len);
|
|
|
|
|
}
|
|
|
|
|
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 11:22:08 +08:00
|
|
|
|
memcpy (myaddr + membpt - memaddr,
|
|
|
|
|
b->shadow_contents + bptoffset, bptlen);
|
1991-04-19 12:22:12 +09:00
|
|
|
|
|
|
|
|
|
if (membpt > memaddr)
|
|
|
|
|
{
|
|
|
|
|
/* Copy the section of memory before the breakpoint. */
|
|
|
|
|
status = read_memory_nobpt (memaddr, myaddr, membpt - memaddr);
|
|
|
|
|
if (status != 0)
|
|
|
|
|
return status;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (membpt + bptlen < memaddr + len)
|
|
|
|
|
{
|
|
|
|
|
/* Copy the section of memory after the breakpoint. */
|
|
|
|
|
status = read_memory_nobpt
|
|
|
|
|
(membpt + bptlen,
|
|
|
|
|
myaddr + membpt + bptlen - memaddr,
|
|
|
|
|
memaddr + len - (membpt + bptlen));
|
|
|
|
|
if (status != 0)
|
|
|
|
|
return status;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Nothing overlaps. Just call read_memory_noerr. */
|
|
|
|
|
return target_read_memory (memaddr, myaddr, len);
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* insert_breakpoints is used when starting or continuing the program.
|
|
|
|
|
remove_breakpoints is used when the program stops.
|
|
|
|
|
Both return zero if successful,
|
|
|
|
|
or an `errno' value if could not write the inferior. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
insert_breakpoints ()
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
int val = 0;
|
|
|
|
|
int disabled_breaks = 0;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (b->type != bp_watchpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->type != bp_hardware_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->type != bp_read_watchpoint
|
|
|
|
|
&& b->type != bp_access_watchpoint
|
1991-03-29 00:26:26 +08:00
|
|
|
|
&& b->enable != disabled
|
|
|
|
|
&& ! b->inserted
|
|
|
|
|
&& ! b->duplicate)
|
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (b->type == bp_hardware_breakpoint)
|
|
|
|
|
val = target_insert_hw_breakpoint(b->address, b->shadow_contents);
|
|
|
|
|
else
|
|
|
|
|
val = target_insert_breakpoint(b->address, b->shadow_contents);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (val)
|
|
|
|
|
{
|
|
|
|
|
/* Can't set the breakpoint. */
|
|
|
|
|
#if defined (DISABLE_UNSETTABLE_BREAK)
|
|
|
|
|
if (DISABLE_UNSETTABLE_BREAK (b->address))
|
|
|
|
|
{
|
|
|
|
|
val = 0;
|
|
|
|
|
b->enable = disabled;
|
|
|
|
|
if (!disabled_breaks)
|
|
|
|
|
{
|
1993-12-31 04:34:06 +08:00
|
|
|
|
target_terminal_ours_for_output ();
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stderr,
|
1993-03-27 06:49:53 +08:00
|
|
|
|
"Cannot insert breakpoint %d:\n", b->number);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("Disabling shared library breakpoints:\n");
|
|
|
|
|
}
|
|
|
|
|
disabled_breaks = 1;
|
|
|
|
|
printf_filtered ("%d ", b->number);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
{
|
1993-12-31 04:34:06 +08:00
|
|
|
|
target_terminal_ours_for_output ();
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "Cannot insert breakpoint %d:\n", b->number);
|
1991-09-19 10:54:17 +08:00
|
|
|
|
#ifdef ONE_PROCESS_WRITETEXT
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stderr,
|
1993-03-27 06:49:53 +08:00
|
|
|
|
"The same program may be running in another process.\n");
|
1991-09-19 10:54:17 +08:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
memory_error (val, b->address); /* which bombs us out */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
b->inserted = 1;
|
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
else if ((b->type == bp_hardware_watchpoint ||
|
|
|
|
|
b->type == bp_read_watchpoint ||
|
|
|
|
|
b->type == bp_access_watchpoint)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->enable == enabled
|
|
|
|
|
&& ! b->inserted
|
|
|
|
|
&& ! b->duplicate)
|
|
|
|
|
{
|
|
|
|
|
FRAME saved_frame;
|
|
|
|
|
int saved_level, within_current_scope;
|
|
|
|
|
value_ptr mark = value_mark ();
|
|
|
|
|
value_ptr v;
|
|
|
|
|
|
|
|
|
|
/* Save the current frame and level so we can restore it after
|
|
|
|
|
evaluating the watchpoint expression on its own frame. */
|
|
|
|
|
saved_frame = selected_frame;
|
|
|
|
|
saved_level = selected_frame_level;
|
|
|
|
|
|
|
|
|
|
/* Determine if the watchpoint is within scope. */
|
|
|
|
|
if (b->exp_valid_block == NULL)
|
|
|
|
|
within_current_scope = 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
FRAME fr = find_frame_addr_in_frame_chain (b->watchpoint_frame);
|
|
|
|
|
within_current_scope = (fr != NULL);
|
|
|
|
|
if (within_current_scope)
|
|
|
|
|
select_frame (fr, -1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (within_current_scope)
|
|
|
|
|
{
|
|
|
|
|
/* Evaluate the expression and cut the chain of values
|
|
|
|
|
produced off from the value chain. */
|
|
|
|
|
v = evaluate_expression (b->exp);
|
|
|
|
|
value_release_to_mark (mark);
|
|
|
|
|
|
|
|
|
|
b->val_chain = v;
|
|
|
|
|
b->inserted = 1;
|
|
|
|
|
|
|
|
|
|
/* Look at each value on the value chain. */
|
|
|
|
|
for ( ; v; v=v->next)
|
|
|
|
|
{
|
|
|
|
|
/* If it's a memory location, then we must watch it. */
|
|
|
|
|
if (v->lval == lval_memory)
|
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int addr, len, type;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
|
|
|
|
addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
|
|
|
|
|
len = TYPE_LENGTH (VALUE_TYPE (v));
|
1994-06-11 09:09:25 +08:00
|
|
|
|
type = 0;
|
|
|
|
|
if (b->type == bp_read_watchpoint)
|
|
|
|
|
type = 1;
|
|
|
|
|
else if (b->type == bp_access_watchpoint)
|
|
|
|
|
type = 2;
|
|
|
|
|
|
|
|
|
|
val = target_insert_watchpoint (addr, len, type);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (val == -1)
|
|
|
|
|
{
|
|
|
|
|
b->inserted = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
val = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Failure to insert a watchpoint on any memory value in the
|
|
|
|
|
value chain brings us here. */
|
|
|
|
|
if (!b->inserted)
|
|
|
|
|
warning ("Hardware watchpoint %d: Could not insert watchpoint\n",
|
|
|
|
|
b->number);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf_filtered ("\
|
|
|
|
|
Hardware watchpoint %d deleted because the program has left the block in\n\
|
|
|
|
|
which its expression is valid.\n", b->number);
|
|
|
|
|
if (b->related_breakpoint)
|
|
|
|
|
delete_breakpoint (b->related_breakpoint);
|
|
|
|
|
delete_breakpoint (b);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Restore the frame and level. */
|
|
|
|
|
select_frame (saved_frame, saved_level);
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (disabled_breaks)
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int
|
|
|
|
|
remove_breakpoints ()
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
int val;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
{
|
|
|
|
|
if (b->inserted)
|
|
|
|
|
{
|
|
|
|
|
val = remove_breakpoint (b);
|
|
|
|
|
if (val != 0)
|
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
remove_breakpoint (b)
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
{
|
|
|
|
|
int val;
|
|
|
|
|
|
|
|
|
|
if (b->type != bp_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->type != bp_hardware_watchpoint
|
|
|
|
|
&& b->type != bp_read_watchpoint
|
|
|
|
|
&& b->type != bp_access_watchpoint)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (b->type == bp_hardware_breakpoint)
|
|
|
|
|
val = target_remove_hw_breakpoint(b->address, b->shadow_contents);
|
|
|
|
|
else
|
|
|
|
|
val = target_remove_breakpoint(b->address, b->shadow_contents);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (val)
|
|
|
|
|
return val;
|
|
|
|
|
b->inserted = 0;
|
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
else if ((b->type == bp_hardware_watchpoint ||
|
|
|
|
|
b->type == bp_read_watchpoint ||
|
|
|
|
|
b->type == bp_access_watchpoint)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->enable == enabled
|
|
|
|
|
&& ! b->duplicate)
|
|
|
|
|
{
|
|
|
|
|
value_ptr v, n;
|
|
|
|
|
|
|
|
|
|
b->inserted = 0;
|
|
|
|
|
/* Walk down the saved value chain. */
|
|
|
|
|
for (v = b->val_chain; v; v = v->next)
|
|
|
|
|
{
|
|
|
|
|
/* For each memory reference remove the watchpoint
|
|
|
|
|
at that address. */
|
|
|
|
|
if (v->lval == lval_memory)
|
|
|
|
|
{
|
|
|
|
|
int addr, len;
|
|
|
|
|
|
|
|
|
|
addr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
|
|
|
|
|
len = TYPE_LENGTH (VALUE_TYPE (v));
|
1994-06-11 09:09:25 +08:00
|
|
|
|
val = target_remove_watchpoint (addr, len, b->type);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (val == -1)
|
|
|
|
|
b->inserted = 1;
|
|
|
|
|
val = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Failure to remove any of the hardware watchpoints comes here. */
|
|
|
|
|
if (b->inserted)
|
|
|
|
|
error ("Hardware watchpoint %d: Could not remove watchpoint\n",
|
|
|
|
|
b->number);
|
|
|
|
|
|
|
|
|
|
/* Free the saved value chain. We will construct a new one
|
|
|
|
|
the next time the watchpoint is inserted. */
|
|
|
|
|
for (v = b->val_chain; v; v = n)
|
|
|
|
|
{
|
|
|
|
|
n = v->next;
|
|
|
|
|
value_free (v);
|
|
|
|
|
}
|
|
|
|
|
b->val_chain = NULL;
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1993-10-07 19:16:35 +08:00
|
|
|
|
/* Clear the "inserted" flag in all breakpoints. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
mark_breakpoints_out ()
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
b->inserted = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1993-10-07 19:16:35 +08:00
|
|
|
|
/* Clear the "inserted" flag in all breakpoints and delete any breakpoints
|
|
|
|
|
which should go away between runs of the program. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
breakpoint_init_inferior ()
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b, *temp;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS_SAFE (b, temp)
|
|
|
|
|
{
|
|
|
|
|
b->inserted = 0;
|
|
|
|
|
|
|
|
|
|
/* If the call dummy breakpoint is at the entry point it will
|
|
|
|
|
cause problems when the inferior is rerun, so we better
|
|
|
|
|
get rid of it. */
|
|
|
|
|
if (b->type == bp_call_dummy)
|
|
|
|
|
delete_breakpoint (b);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
|
|
|
|
/* Likewise for scope breakpoints. */
|
|
|
|
|
if (b->type == bp_watchpoint_scope)
|
|
|
|
|
delete_breakpoint (b);
|
|
|
|
|
|
|
|
|
|
/* Likewise for watchpoints on local expressions. */
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if ((b->type == bp_watchpoint || b->type == bp_hardware_watchpoint ||
|
|
|
|
|
b->type == bp_read_watchpoint || b->type == bp_access_watchpoint)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->exp_valid_block != NULL)
|
|
|
|
|
delete_breakpoint (b);
|
1993-10-07 19:16:35 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* breakpoint_here_p (PC) returns 1 if an enabled breakpoint exists at PC.
|
|
|
|
|
When continuing from a location with a breakpoint,
|
|
|
|
|
we actually single step once before calling insert_breakpoints. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
breakpoint_here_p (pc)
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->enable != disabled && b->address == pc)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1993-11-02 06:25:23 +08:00
|
|
|
|
|
1993-12-31 04:34:06 +08:00
|
|
|
|
/* Return nonzero if FRAME is a dummy frame. We can't use PC_IN_CALL_DUMMY
|
|
|
|
|
because figuring out the saved SP would take too much time, at least using
|
|
|
|
|
get_saved_register on the 68k. This means that for this function to
|
|
|
|
|
work right a port must use the bp_call_dummy breakpoint. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
frame_in_dummy (frame)
|
|
|
|
|
FRAME frame;
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
|
1994-01-20 05:14:40 +08:00
|
|
|
|
#ifdef CALL_DUMMY
|
1993-12-31 04:34:06 +08:00
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
{
|
1994-01-20 05:14:40 +08:00
|
|
|
|
static unsigned LONGEST dummy[] = CALL_DUMMY;
|
|
|
|
|
|
1993-12-31 04:34:06 +08:00
|
|
|
|
if (b->type == bp_call_dummy
|
1994-01-20 05:14:40 +08:00
|
|
|
|
&& b->frame == frame->frame
|
|
|
|
|
|
|
|
|
|
/* We need to check the PC as well as the frame on the sparc,
|
|
|
|
|
for signals.exp in the testsuite. */
|
|
|
|
|
&& (frame->pc
|
|
|
|
|
>= (b->address
|
|
|
|
|
- sizeof (dummy) / sizeof (LONGEST) * REGISTER_SIZE))
|
|
|
|
|
&& frame->pc <= b->address)
|
1993-12-31 04:34:06 +08:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
1994-01-20 05:14:40 +08:00
|
|
|
|
#endif /* CALL_DUMMY */
|
1993-12-31 04:34:06 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1993-11-02 06:25:23 +08:00
|
|
|
|
/* breakpoint_match_thread (PC, PID) returns true if the breakpoint at PC
|
|
|
|
|
is valid for process/thread PID. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
breakpoint_thread_match (pc, pid)
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
int pid;
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
int thread;
|
|
|
|
|
|
|
|
|
|
thread = pid_to_thread_id (pid);
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->enable != disabled
|
|
|
|
|
&& b->address == pc
|
|
|
|
|
&& (b->thread == -1 || b->thread == thread))
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* bpstat stuff. External routines' interfaces are documented
|
|
|
|
|
in breakpoint.h. */
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
|
|
|
|
/* Clear a bpstat so that it says we are not at any breakpoint.
|
|
|
|
|
Also free any storage that is part of a bpstat. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
void
|
|
|
|
|
bpstat_clear (bsp)
|
|
|
|
|
bpstat *bsp;
|
|
|
|
|
{
|
|
|
|
|
bpstat p;
|
|
|
|
|
bpstat q;
|
|
|
|
|
|
|
|
|
|
if (bsp == 0)
|
|
|
|
|
return;
|
|
|
|
|
p = *bsp;
|
|
|
|
|
while (p != NULL)
|
|
|
|
|
{
|
|
|
|
|
q = p->next;
|
|
|
|
|
if (p->old_val != NULL)
|
|
|
|
|
value_free (p->old_val);
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)p);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
p = q;
|
|
|
|
|
}
|
|
|
|
|
*bsp = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Return a copy of a bpstat. Like "bs1 = bs2" but all storage that
|
|
|
|
|
is part of the bpstat is copied as well. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
bpstat
|
|
|
|
|
bpstat_copy (bs)
|
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
bpstat p = NULL;
|
|
|
|
|
bpstat tmp;
|
1993-09-09 05:30:33 +08:00
|
|
|
|
bpstat retval = NULL;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (bs == NULL)
|
|
|
|
|
return bs;
|
|
|
|
|
|
|
|
|
|
for (; bs != NULL; bs = bs->next)
|
|
|
|
|
{
|
|
|
|
|
tmp = (bpstat) xmalloc (sizeof (*tmp));
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 11:22:08 +08:00
|
|
|
|
memcpy (tmp, bs, sizeof (*tmp));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (p == NULL)
|
|
|
|
|
/* This is the first thing in the chain. */
|
|
|
|
|
retval = tmp;
|
|
|
|
|
else
|
|
|
|
|
p->next = tmp;
|
|
|
|
|
p = tmp;
|
|
|
|
|
}
|
|
|
|
|
p->next = NULL;
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Find the bpstat associated with this breakpoint */
|
|
|
|
|
|
|
|
|
|
bpstat
|
|
|
|
|
bpstat_find_breakpoint(bsp, breakpoint)
|
|
|
|
|
bpstat bsp;
|
|
|
|
|
struct breakpoint *breakpoint;
|
|
|
|
|
{
|
|
|
|
|
if (bsp == NULL) return NULL;
|
|
|
|
|
|
|
|
|
|
for (;bsp != NULL; bsp = bsp->next) {
|
|
|
|
|
if (bsp->breakpoint_at == breakpoint) return bsp;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the breakpoint number of the first breakpoint we are stopped
|
|
|
|
|
at. *BSP upon return is a bpstat which points to the remaining
|
|
|
|
|
breakpoints stopped at (but which is not guaranteed to be good for
|
|
|
|
|
anything but further calls to bpstat_num).
|
|
|
|
|
Return 0 if passed a bpstat which does not indicate any breakpoints. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int
|
|
|
|
|
bpstat_num (bsp)
|
|
|
|
|
bpstat *bsp;
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
if ((*bsp) == NULL)
|
|
|
|
|
return 0; /* No more breakpoint values */
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
b = (*bsp)->breakpoint_at;
|
|
|
|
|
*bsp = (*bsp)->next;
|
|
|
|
|
if (b == NULL)
|
|
|
|
|
return -1; /* breakpoint that's been deleted since */
|
|
|
|
|
else
|
|
|
|
|
return b->number; /* We have its number */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Modify BS so that the actions will not be performed. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
void
|
|
|
|
|
bpstat_clear_actions (bs)
|
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
for (; bs != NULL; bs = bs->next)
|
|
|
|
|
{
|
|
|
|
|
bs->commands = NULL;
|
|
|
|
|
if (bs->old_val != NULL)
|
|
|
|
|
{
|
|
|
|
|
value_free (bs->old_val);
|
|
|
|
|
bs->old_val = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* Stub for cleaning up our state if we error-out of a breakpoint command */
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
static void
|
|
|
|
|
cleanup_executing_breakpoints (ignore)
|
|
|
|
|
int ignore;
|
|
|
|
|
{
|
|
|
|
|
executing_breakpoint_commands = 0;
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Execute all the commands associated with all the breakpoints at this
|
|
|
|
|
location. Any of these commands could cause the process to proceed
|
|
|
|
|
beyond this point, etc. We look out for such changes by checking
|
|
|
|
|
the global "breakpoint_proceeded" after each command. */
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
void
|
|
|
|
|
bpstat_do_actions (bsp)
|
|
|
|
|
bpstat *bsp;
|
|
|
|
|
{
|
|
|
|
|
bpstat bs;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
|
|
|
|
executing_breakpoint_commands = 1;
|
|
|
|
|
old_chain = make_cleanup (cleanup_executing_breakpoints, 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
top:
|
|
|
|
|
bs = *bsp;
|
|
|
|
|
|
|
|
|
|
breakpoint_proceeded = 0;
|
|
|
|
|
for (; bs != NULL; bs = bs->next)
|
|
|
|
|
{
|
|
|
|
|
while (bs->commands)
|
|
|
|
|
{
|
|
|
|
|
char *line = bs->commands->line;
|
|
|
|
|
bs->commands = bs->commands->next;
|
|
|
|
|
execute_command (line, 0);
|
|
|
|
|
/* If the inferior is proceeded by the command, bomb out now.
|
|
|
|
|
The bpstat chain has been blown away by wait_for_inferior.
|
|
|
|
|
But since execution has stopped again, there is a new bpstat
|
|
|
|
|
to look at, so start over. */
|
|
|
|
|
if (breakpoint_proceeded)
|
|
|
|
|
goto top;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
executing_breakpoint_commands = 0;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
discard_cleanups (old_chain);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* This is the normal print_it function for a bpstat. In the future,
|
|
|
|
|
much of this logic could (should?) be moved to bpstat_stop_status,
|
|
|
|
|
by having it set different print_it functions. */
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
static int
|
|
|
|
|
print_it_normal (bs)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
/* bs->breakpoint_at can be NULL if it was a momentary breakpoint
|
|
|
|
|
which has since been deleted. */
|
1993-03-31 02:55:20 +08:00
|
|
|
|
if (bs->breakpoint_at == NULL
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|| (bs->breakpoint_at->type != bp_breakpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& bs->breakpoint_at->type != bp_hardware_breakpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& bs->breakpoint_at->type != bp_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& bs->breakpoint_at->type != bp_read_watchpoint
|
|
|
|
|
&& bs->breakpoint_at->type != bp_access_watchpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& bs->breakpoint_at->type != bp_hardware_watchpoint))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return 0;
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (bs->breakpoint_at->type == bp_breakpoint ||
|
|
|
|
|
bs->breakpoint_at->type == bp_hardware_breakpoint)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
/* I think the user probably only wants to see one breakpoint
|
|
|
|
|
number, not all of them. */
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_breakpoint (bs->breakpoint_at->number);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("\nBreakpoint %d, ", bs->breakpoint_at->number);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
else if ((bs->old_val != NULL) &&
|
|
|
|
|
(bs->breakpoint_at->type == bp_watchpoint ||
|
|
|
|
|
bs->breakpoint_at->type == bp_access_watchpoint ||
|
|
|
|
|
bs->breakpoint_at->type == bp_hardware_watchpoint))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_watchpoint (bs->breakpoint_at->number);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
mention (bs->breakpoint_at);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("\nOld value = ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
value_print (bs->old_val, gdb_stdout, 0, Val_pretty_default);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("\nNew value = ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
value_print (bs->breakpoint_at->val, gdb_stdout, 0,
|
1991-03-29 00:26:26 +08:00
|
|
|
|
Val_pretty_default);
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
value_free (bs->old_val);
|
|
|
|
|
bs->old_val = NULL;
|
1994-03-31 01:17:01 +08:00
|
|
|
|
/* More than one watchpoint may have been triggered. */
|
|
|
|
|
return -1;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
else if (bs->breakpoint_at->type == bp_access_watchpoint ||
|
|
|
|
|
bs->breakpoint_at->type == bp_read_watchpoint)
|
|
|
|
|
{
|
|
|
|
|
mention (bs->breakpoint_at);
|
|
|
|
|
printf_filtered ("\nValue = ");
|
|
|
|
|
value_print (bs->breakpoint_at->val, gdb_stdout, 0,
|
|
|
|
|
Val_pretty_default);
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* We can't deal with it. Maybe another member of the bpstat chain can. */
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print a message indicating what happened. Returns nonzero to
|
|
|
|
|
say that only the source line should be printed after this (zero
|
|
|
|
|
return means print the frame as well as the source line). */
|
1993-03-31 03:10:31 +08:00
|
|
|
|
/* Currently we always return zero. */
|
1993-03-31 02:55:20 +08:00
|
|
|
|
int
|
|
|
|
|
bpstat_print (bs)
|
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
int val;
|
|
|
|
|
|
|
|
|
|
if (bs == NULL)
|
|
|
|
|
return 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
val = (*bs->print_it) (bs);
|
|
|
|
|
if (val >= 0)
|
|
|
|
|
return val;
|
|
|
|
|
|
1991-04-22 16:08:07 +09:00
|
|
|
|
/* Maybe another breakpoint in the chain caused us to stop.
|
|
|
|
|
(Currently all watchpoints go on the bpstat whether hit or
|
|
|
|
|
not. That probably could (should) be changed, provided care is taken
|
|
|
|
|
with respect to bpstat_explains_signal). */
|
|
|
|
|
if (bs->next)
|
|
|
|
|
return bpstat_print (bs->next);
|
|
|
|
|
|
1993-04-09 11:17:45 +08:00
|
|
|
|
/* We reached the end of the chain without printing anything. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Evaluate the expression EXP and return 1 if value is zero.
|
|
|
|
|
This is used inside a catch_errors to evaluate the breakpoint condition.
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
The argument is a "struct expression *" that has been cast to char * to
|
1991-03-29 00:26:26 +08:00
|
|
|
|
make it pass through catch_errors. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
breakpoint_cond_eval (exp)
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
char *exp;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
value_ptr mark = value_mark ();
|
|
|
|
|
int i = !value_true (evaluate_expression ((struct expression *)exp));
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
return i;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allocate a new bpstat and chain it to the current one. */
|
|
|
|
|
|
|
|
|
|
static bpstat
|
|
|
|
|
bpstat_alloc (b, cbs)
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
bpstat cbs; /* Current "bs" value */
|
|
|
|
|
{
|
|
|
|
|
bpstat bs;
|
|
|
|
|
|
|
|
|
|
bs = (bpstat) xmalloc (sizeof (*bs));
|
|
|
|
|
cbs->next = bs;
|
|
|
|
|
bs->breakpoint_at = b;
|
|
|
|
|
/* If the condition is false, etc., don't do the commands. */
|
|
|
|
|
bs->commands = NULL;
|
|
|
|
|
bs->old_val = NULL;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
bs->print_it = print_it_normal;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return bs;
|
|
|
|
|
}
|
1993-04-15 09:45:35 +08:00
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* Possible return values for watchpoint_check (this can't be an enum
|
|
|
|
|
because of check_errors). */
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
/* The watchpoint has been deleted. */
|
|
|
|
|
#define WP_DELETED 1
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* The value has changed. */
|
|
|
|
|
#define WP_VALUE_CHANGED 2
|
|
|
|
|
/* The value has not changed. */
|
|
|
|
|
#define WP_VALUE_NOT_CHANGED 3
|
|
|
|
|
|
|
|
|
|
/* Check watchpoint condition. */
|
1994-07-24 06:01:44 +08:00
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
static int
|
|
|
|
|
watchpoint_check (p)
|
1993-07-11 12:52:50 +08:00
|
|
|
|
char *p;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
{
|
|
|
|
|
bpstat bs = (bpstat) p;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
struct breakpoint *b;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
FRAME saved_frame, fr;
|
|
|
|
|
int within_current_scope, saved_level;
|
|
|
|
|
|
|
|
|
|
/* Save the current frame and level so we can restore it after
|
|
|
|
|
evaluating the watchpoint expression on its own frame. */
|
|
|
|
|
saved_frame = selected_frame;
|
|
|
|
|
saved_level = selected_frame_level;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
|
1994-07-24 06:01:44 +08:00
|
|
|
|
b = bs->breakpoint_at;
|
|
|
|
|
|
|
|
|
|
if (b->exp_valid_block == NULL)
|
1993-03-31 02:55:20 +08:00
|
|
|
|
within_current_scope = 1;
|
1993-04-15 09:45:35 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
1994-07-24 06:01:44 +08:00
|
|
|
|
fr = find_frame_addr_in_frame_chain (b->watchpoint_frame);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
within_current_scope = (fr != NULL);
|
1993-04-15 09:45:35 +08:00
|
|
|
|
if (within_current_scope)
|
|
|
|
|
/* If we end up stopping, the current frame will get selected
|
|
|
|
|
in normal_stop. So this call to select_frame won't affect
|
|
|
|
|
the user. */
|
|
|
|
|
select_frame (fr, -1);
|
|
|
|
|
}
|
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
if (within_current_scope)
|
|
|
|
|
{
|
|
|
|
|
/* We use value_{,free_to_}mark because it could be a
|
|
|
|
|
*long* time before we return to the command level and
|
Changes to support alpha OSF/1 in native mode.
* alpha-nat.c, alpha-tdep.c, config/alpha/alpha-osf1.mt,
config/alpha/nm-alpha.h, config/alpha/tm-alpha.h, osfsolib.c:
New files.
* Makefile.in: Add new files and dependencies.
* configure.in: Add alpha target.
* config/alpha/alpha-osf1.mh (NATDEPFILES): Add osfsolib.o
* config/alpha/alpha-osf1.mh (MH_CFLAGS): Remove, we can handle
shared libraries now.
* config/alpha/xm-alpha.h: Cleanup, get MAKEVA_* defines right.
* defs.h (CORE_ADDR): Make its type overridable via CORE_ADDR_TYPE,
provide `unsigned int' default.
* breakpoint.c (breakpoint_auto_delete): Delete only if we really
stopped for the breakpoint.
* stabsread.c, stabsread.h (define_symbol): Change valu parameter
to a CORE_ADDR.
* stabsread.c (read_range_type): Handle the case where the lower
bound overflows and the upper doesn't and the range is legal.
* infrun.c (resume): Do not step a breakpoint instruction if
CANNOT_STEP_BREAKPOINT is defined.
* inferior.h (CALL_DUMMY_LOCATION): New variant AT_ENTRY_POINT.
Now that we have the bp_call_dummy breakpoint the call dummy code
is no longer needed. PUSH_DUMMY_FRAME, PUSH_ARGUMENTS and
FIX_CALL_DUMMY can be used to set up everything for the dummy.
The breakpoint for the dummy is set at the entry point and thats it.
* blockframe.c (inside_entry_file, inside_entry_func): Do not stop
backtraces if pc is in the call dummy at the entry point.
* infcmd.c (run_stack_dummy): Handle AT_ENTRY_POINT case. Use
the expected breakpoint pc when setting up the frame for
set_momentary_breakpoint.
* symfile.c (entry_point_address): New function for AT_ENTRY_POINT
support.
* valops.c (call_function_by_hand): Handle AT_ENTRY_POINT case.
1993-10-06 03:44:57 +08:00
|
|
|
|
call free_all_values. We can't call free_all_values because
|
|
|
|
|
we might be in the middle of evaluating a function call. */
|
1993-03-31 02:55:20 +08:00
|
|
|
|
|
* breakpoint.c, breakpoint.h, c-valprint.c, ch-valprint.c,
cp-valprint.c, eval.c, expprint.c, findvar.c, language.c,
objfiles.h, infcmd.c, printcmd.c, stack.c, typeprint.c,
valarith.c, valops.c, valprint.c, value.h, values.c: Replace
value with value_ptr. This is for the ptx compiler.
* objfiles.h, target.h: Don't declare a "sec_ptr" field using a
"sec_ptr" typedef.
* symm-nat.c: Add a bunch of stuff for symmetry's ptrace stuff.
#if 0 i386_float_info.
* symm-tdep.c (round): Remove. Also remove sgttyb.
* symm-tdep.c: Remove lots of stuff which duplicates stuff from
i386-tdep.c. Remove register_addr and ptx_coff_regno_to_gdb.
* i386-tdep.c (i386_frame_find_saved_regs): Put in
I386_REGNO_TO_SYMMETRY check in case it is needed for Dynix
someday.
* config/i386/nm-symmetry.h: Change KERNEL_U_ADDR. Move
stuff from PTRACE_READ_REGS, PTRACE_WRITE_REGS macros to
symm-nat.c. Define CHILD_WAIT and declare child_wait().
* config/i386/tm-symmetry.h: Remove call function stuff; stuff in
tm-i386v.h is apparently OK.
* config/i386/xm-symmetry.h [_SEQUENT_]: Define HAVE_TERMIOS not
HAVE_TERMIO. Define MEM_FNS_DECLARED, NEED_POSIX_SETPGID, and
USE_O_NOCTTY.
1994-03-03 09:00:57 +08:00
|
|
|
|
value_ptr mark = value_mark ();
|
|
|
|
|
value_ptr new_val = evaluate_expression (bs->breakpoint_at->exp);
|
1994-07-24 06:01:44 +08:00
|
|
|
|
if (!value_equal (b->val, new_val))
|
1993-03-31 02:55:20 +08:00
|
|
|
|
{
|
|
|
|
|
release_value (new_val);
|
|
|
|
|
value_free_to_mark (mark);
|
1994-07-24 06:01:44 +08:00
|
|
|
|
bs->old_val = b->val;
|
|
|
|
|
b->val = new_val;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* We will stop here */
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
select_frame (saved_frame, saved_level);
|
1993-03-31 02:55:20 +08:00
|
|
|
|
return WP_VALUE_CHANGED;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Nothing changed, don't do anything. */
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
/* We won't stop here */
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
select_frame (saved_frame, saved_level);
|
1993-03-31 02:55:20 +08:00
|
|
|
|
return WP_VALUE_NOT_CHANGED;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* This seems like the only logical thing to do because
|
|
|
|
|
if we temporarily ignored the watchpoint, then when
|
|
|
|
|
we reenter the block in which it is valid it contains
|
|
|
|
|
garbage (in the case of a function, it may have two
|
|
|
|
|
garbage values, one before and one after the prologue).
|
|
|
|
|
So we can't even detect the first assignment to it and
|
|
|
|
|
watch after that (since the garbage may or may not equal
|
|
|
|
|
the first value assigned). */
|
|
|
|
|
printf_filtered ("\
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
Watchpoint %d deleted because the program has left the block in\n\
|
1993-03-31 02:55:20 +08:00
|
|
|
|
which its expression is valid.\n", bs->breakpoint_at->number);
|
1994-07-24 06:01:44 +08:00
|
|
|
|
if (b->related_breakpoint)
|
|
|
|
|
delete_breakpoint (b->related_breakpoint);
|
|
|
|
|
delete_breakpoint (b);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
|
|
|
|
select_frame (saved_frame, saved_level);
|
|
|
|
|
return WP_DELETED;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is used when everything which needs to be printed has
|
|
|
|
|
already been printed. But we still want to print the frame. */
|
|
|
|
|
static int
|
1993-04-09 11:17:45 +08:00
|
|
|
|
print_it_done (bs)
|
1993-03-31 02:55:20 +08:00
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1993-04-09 11:17:45 +08:00
|
|
|
|
/* This is used when nothing should be printed for this bpstat entry. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
print_it_noop (bs)
|
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
1993-09-22 09:16:50 +08:00
|
|
|
|
/* Get a bpstat associated with having just stopped at address *PC
|
|
|
|
|
and frame address FRAME_ADDRESS. Update *PC to point at the
|
|
|
|
|
breakpoint (if we hit a breakpoint). NOT_A_BREAKPOINT is nonzero
|
|
|
|
|
if this is known to not be a real breakpoint (it could still be a
|
|
|
|
|
watchpoint, though). */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Determine whether we stopped at a breakpoint, etc, or whether we
|
|
|
|
|
don't understand this stop. Result is a chain of bpstat's such that:
|
|
|
|
|
|
|
|
|
|
if we don't understand the stop, the result is a null pointer.
|
|
|
|
|
|
1993-09-22 09:16:50 +08:00
|
|
|
|
if we understand why we stopped, the result is not null.
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
Each element of the chain refers to a particular breakpoint or
|
|
|
|
|
watchpoint at which we have stopped. (We may have stopped for
|
1993-03-27 06:49:53 +08:00
|
|
|
|
several reasons concurrently.)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
Each element of the chain has valid next, breakpoint_at,
|
|
|
|
|
commands, FIXME??? fields.
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
bpstat
|
The point of these changes is to avoid reading the frame pointer
and stack pointer during stepping, to speed things up.
A. Changes to not select a frame until we need a selected frame:
* blockframe.c (flush_cached_frames): Call select_frame (NULL, -1).
* infrun.c (wait_for_inferior): Move call to select_frame back to
normal_stop. This reverts a change of 13 Apr 94 (it says Jeff
Law, but the change was my idea); the only reason for that change
was so we could save and restore the selected frame in
wait_for_inferior, and now that flush_cached frames clears the
selected frame, that should work OK now.
B. Changes to not create a current_frame until we need one:
* blockframe.c (get_current_frame): If current_frame is NULL, try
to create an innermost frame.
* sparc-tdep.c (sparc_pop_frame), infcmd.c (run-stack_dummy),
infrun.c (wait_for_inferior), thread.c (thread_switch),
convex-tdep.c (set_thread_command), a29k-tdep.c (pop_frame),
alpha-tdep.c (alpha_pop_frame), convex-xdep.c (core_file_command),
h8300-tdep.c (h8300_pop_frame), h8500-tdep.c (h8300_pop_frame),
hppa-tdep.c (hppa_pop_frame), i386-tdep.c (i386_pop_frame),
i960-tdep.c (pop_frame), m68k-tdep.c
(m68k_pop_frame), mips-tdep.c (mips_pop_frame), rs6000-tdep.c
(push_dummy_frame, pop_dummy_frame, pop_frame), sh-tdep.c
(pop_frame), config/arm/tm-arm.h (POP_FRAME),
config/convex/tm-convex.h (POP_FRAME), config/gould/tm-pn.h
(POP_FRAME), config/ns32k/tm-merlin.h (POP_FRAME),
config/ns32k/tm-umax.h (POP_FRAME), config/tahoe/tm-tahoe.h
(POP_FRAME), config/vax/tm-vax.h (POP_FRAME): Don't
call create_new_frame.
* corelow.c (core_open), altos-xdep.c (core_file_command),
arm-xdep.c (core_file_command), gould-xdep.c (core_file_command),
m3-nat.c (select_thread), sun386-nat.c (core_file_command),
umax-xdep.c (core_file_command): Don't call create_new_frame; do
call flush_cached_frames.
* blockframe.c (reinit_frame_cache): Don't call create_new_frame
or select_frame.
C. Changes to get rid of stop_frame_address and instead only
fetch the frame pointer when we need it.
* breakpoint.c (bpstat_stop_status): Remove argument
frame_address; use FRAME_FP (get_current_frame ()).
* infrun.c (wait_for_inferior): Don't pass frame pointer to
bpstat_stop_status.
* infrun.c (wait_for_inferior): Use FRAME_FP (get_current_frame
()) instead of stop_frame_address.
* infrun.c (save_inferior_status, restore_inferior_status),
inferior.h (struct inferior_status): Don't save and restore
stop_frame_address.
* inferior.h, infcmd.c, thread.c (thread_switch), m3-nat.c
(select_thread): Remove stop_frame_address and uses thereof.
D. Same thing for the stack pointer.
* infrun.c (wait_for_inferior): Remove stop_sp and replace
uses thereof with read_sp ().
E. Change to eliminate one nasty little spot where we were
wanting to know the frame pointer from before the current step
(idea from GDB 3.5, which saved my ass, because my other ideas of
how to fix it were very baroque).
* infrun.c: Remove prev_frame_address.
* infrun.c (wait_for_inferior, step_over_function): Use
step_frame_address instead of prev_frame_address.
F. Same basic idea for the stack pointer.
* inferior.h, infcmd.c: New variable step_sp.
* infcmd.c (step_1, until_next_command): Set it.
* infrun.c: Remove prev_sp and replace uses by step_sp.
* infrun.c (wait_for_inferior): If we get out of the step
range, then set step_sp to the current stack pointer before we
start going again.
1994-10-08 11:41:21 +08:00
|
|
|
|
bpstat_stop_status (pc, not_a_breakpoint)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
CORE_ADDR *pc;
|
1993-09-22 09:16:50 +08:00
|
|
|
|
int not_a_breakpoint;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
CORE_ADDR bp_addr;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if DECR_PC_AFTER_BREAK != 0 || defined (SHIFT_INST_REGS)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* True if we've hit a breakpoint (as opposed to a watchpoint). */
|
|
|
|
|
int real_breakpoint = 0;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Root of the chain of bpstat's */
|
1992-02-28 00:28:59 +08:00
|
|
|
|
struct bpstat root_bs[1];
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Pointer to the last thing in the chain currently. */
|
|
|
|
|
bpstat bs = root_bs;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
static char message1[] =
|
|
|
|
|
"Error evaluating expression for watchpoint %d\n";
|
|
|
|
|
char message[sizeof (message1) + 30 /* slop */];
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Get the address where the breakpoint would have been. */
|
|
|
|
|
bp_addr = *pc - DECR_PC_AFTER_BREAK;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
{
|
|
|
|
|
if (b->enable == disabled)
|
|
|
|
|
continue;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (b->type != bp_watchpoint
|
|
|
|
|
&& b->type != bp_hardware_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->type != bp_read_watchpoint
|
|
|
|
|
&& b->type != bp_access_watchpoint
|
|
|
|
|
&& b->type != bp_hardware_breakpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->address != bp_addr)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
continue;
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
#ifndef DECR_PC_AFTER_HW_BREAK
|
|
|
|
|
#define DECR_PC_AFTER_HW_BREAK 0
|
|
|
|
|
#endif
|
|
|
|
|
if (b->type == bp_hardware_breakpoint
|
|
|
|
|
&& b->address != (bp_addr - DECR_PC_AFTER_HW_BREAK))
|
|
|
|
|
continue;
|
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (b->type != bp_watchpoint
|
|
|
|
|
&& b->type != bp_hardware_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->type != bp_read_watchpoint
|
|
|
|
|
&& b->type != bp_access_watchpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& not_a_breakpoint)
|
1993-09-22 09:16:50 +08:00
|
|
|
|
continue;
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Come here if it's a watchpoint, or if the break address matches */
|
|
|
|
|
|
1994-07-14 10:15:39 +08:00
|
|
|
|
++(b->hit_count);
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
bs = bpstat_alloc (b, bs); /* Alloc a bpstat to explain stop */
|
|
|
|
|
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->stop = 1;
|
|
|
|
|
bs->print = 1;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
sprintf (message, message1, b->number);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (b->type == bp_watchpoint || b->type == bp_hardware_watchpoint)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-07-11 12:52:50 +08:00
|
|
|
|
switch (catch_errors (watchpoint_check, (char *) bs, message,
|
|
|
|
|
RETURN_MASK_ALL))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case WP_DELETED:
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* We've already printed what needs to be printed. */
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->print_it = print_it_done;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* Stop. */
|
|
|
|
|
break;
|
|
|
|
|
case WP_VALUE_CHANGED:
|
|
|
|
|
/* Stop. */
|
|
|
|
|
break;
|
|
|
|
|
case WP_VALUE_NOT_CHANGED:
|
|
|
|
|
/* Don't stop. */
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->print_it = print_it_noop;
|
|
|
|
|
bs->stop = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
continue;
|
1993-03-31 02:55:20 +08:00
|
|
|
|
default:
|
|
|
|
|
/* Can't happen. */
|
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
|
case 0:
|
|
|
|
|
/* Error from catch_errors. */
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
printf_filtered ("Watchpoint %d deleted.\n", b->number);
|
|
|
|
|
if (b->related_breakpoint)
|
|
|
|
|
delete_breakpoint (b->related_breakpoint);
|
|
|
|
|
delete_breakpoint (b);
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* We've already printed what needs to be printed. */
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->print_it = print_it_done;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
1993-03-31 02:55:20 +08:00
|
|
|
|
/* Stop. */
|
|
|
|
|
break;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
else if (b->type == bp_read_watchpoint || b->type == bp_access_watchpoint)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
value_ptr v;
|
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
|
|
addr = target_stopped_data_address();
|
|
|
|
|
if (addr == 0) continue;
|
|
|
|
|
for (v = b->val_chain; v; v = v->next)
|
|
|
|
|
{
|
|
|
|
|
if (v->lval == lval_memory)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR vaddr;
|
|
|
|
|
|
|
|
|
|
vaddr = VALUE_ADDRESS (v) + VALUE_OFFSET (v);
|
|
|
|
|
if (addr == vaddr)
|
|
|
|
|
found = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (found)
|
|
|
|
|
switch (catch_errors (watchpoint_check, (char *) bs, message,
|
|
|
|
|
RETURN_MASK_ALL))
|
|
|
|
|
{
|
|
|
|
|
case WP_DELETED:
|
|
|
|
|
/* We've already printed what needs to be printed. */
|
|
|
|
|
bs->print_it = print_it_done;
|
|
|
|
|
/* Stop. */
|
|
|
|
|
break;
|
|
|
|
|
case WP_VALUE_CHANGED:
|
|
|
|
|
case WP_VALUE_NOT_CHANGED:
|
|
|
|
|
/* Stop. */
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* Can't happen. */
|
|
|
|
|
case 0:
|
|
|
|
|
/* Error from catch_errors. */
|
|
|
|
|
printf_filtered ("Watchpoint %d deleted.\n", b->number);
|
|
|
|
|
if (b->related_breakpoint)
|
|
|
|
|
delete_breakpoint (b->related_breakpoint);
|
|
|
|
|
delete_breakpoint (b);
|
|
|
|
|
/* We've already printed what needs to be printed. */
|
|
|
|
|
bs->print_it = print_it_done;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if DECR_PC_AFTER_BREAK != 0 || defined (SHIFT_INST_REGS)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
real_breakpoint = 1;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
The point of these changes is to avoid reading the frame pointer
and stack pointer during stepping, to speed things up.
A. Changes to not select a frame until we need a selected frame:
* blockframe.c (flush_cached_frames): Call select_frame (NULL, -1).
* infrun.c (wait_for_inferior): Move call to select_frame back to
normal_stop. This reverts a change of 13 Apr 94 (it says Jeff
Law, but the change was my idea); the only reason for that change
was so we could save and restore the selected frame in
wait_for_inferior, and now that flush_cached frames clears the
selected frame, that should work OK now.
B. Changes to not create a current_frame until we need one:
* blockframe.c (get_current_frame): If current_frame is NULL, try
to create an innermost frame.
* sparc-tdep.c (sparc_pop_frame), infcmd.c (run-stack_dummy),
infrun.c (wait_for_inferior), thread.c (thread_switch),
convex-tdep.c (set_thread_command), a29k-tdep.c (pop_frame),
alpha-tdep.c (alpha_pop_frame), convex-xdep.c (core_file_command),
h8300-tdep.c (h8300_pop_frame), h8500-tdep.c (h8300_pop_frame),
hppa-tdep.c (hppa_pop_frame), i386-tdep.c (i386_pop_frame),
i960-tdep.c (pop_frame), m68k-tdep.c
(m68k_pop_frame), mips-tdep.c (mips_pop_frame), rs6000-tdep.c
(push_dummy_frame, pop_dummy_frame, pop_frame), sh-tdep.c
(pop_frame), config/arm/tm-arm.h (POP_FRAME),
config/convex/tm-convex.h (POP_FRAME), config/gould/tm-pn.h
(POP_FRAME), config/ns32k/tm-merlin.h (POP_FRAME),
config/ns32k/tm-umax.h (POP_FRAME), config/tahoe/tm-tahoe.h
(POP_FRAME), config/vax/tm-vax.h (POP_FRAME): Don't
call create_new_frame.
* corelow.c (core_open), altos-xdep.c (core_file_command),
arm-xdep.c (core_file_command), gould-xdep.c (core_file_command),
m3-nat.c (select_thread), sun386-nat.c (core_file_command),
umax-xdep.c (core_file_command): Don't call create_new_frame; do
call flush_cached_frames.
* blockframe.c (reinit_frame_cache): Don't call create_new_frame
or select_frame.
C. Changes to get rid of stop_frame_address and instead only
fetch the frame pointer when we need it.
* breakpoint.c (bpstat_stop_status): Remove argument
frame_address; use FRAME_FP (get_current_frame ()).
* infrun.c (wait_for_inferior): Don't pass frame pointer to
bpstat_stop_status.
* infrun.c (wait_for_inferior): Use FRAME_FP (get_current_frame
()) instead of stop_frame_address.
* infrun.c (save_inferior_status, restore_inferior_status),
inferior.h (struct inferior_status): Don't save and restore
stop_frame_address.
* inferior.h, infcmd.c, thread.c (thread_switch), m3-nat.c
(select_thread): Remove stop_frame_address and uses thereof.
D. Same thing for the stack pointer.
* infrun.c (wait_for_inferior): Remove stop_sp and replace
uses thereof with read_sp ().
E. Change to eliminate one nasty little spot where we were
wanting to know the frame pointer from before the current step
(idea from GDB 3.5, which saved my ass, because my other ideas of
how to fix it were very baroque).
* infrun.c: Remove prev_frame_address.
* infrun.c (wait_for_inferior, step_over_function): Use
step_frame_address instead of prev_frame_address.
F. Same basic idea for the stack pointer.
* inferior.h, infcmd.c: New variable step_sp.
* infcmd.c (step_1, until_next_command): Set it.
* infrun.c: Remove prev_sp and replace uses by step_sp.
* infrun.c (wait_for_inferior): If we get out of the step
range, then set step_sp to the current stack pointer before we
start going again.
1994-10-08 11:41:21 +08:00
|
|
|
|
if (b->frame && b->frame != FRAME_FP (get_current_frame ()))
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->stop = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
{
|
1993-09-09 05:30:33 +08:00
|
|
|
|
int value_is_zero = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (b->cond)
|
|
|
|
|
{
|
|
|
|
|
/* Need to select the frame, with all that implies
|
|
|
|
|
so that the conditions will have the right context. */
|
|
|
|
|
select_frame (get_current_frame (), 0);
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
value_is_zero
|
|
|
|
|
= catch_errors (breakpoint_cond_eval, (char *)(b->cond),
|
1993-07-11 12:52:50 +08:00
|
|
|
|
"Error in testing breakpoint condition:\n",
|
|
|
|
|
RETURN_MASK_ALL);
|
Fix some infrastructure to be able to cope with host and target
machines with different sized basic types (ints, ptrs, etc).
(Idea from pierre@la.tce.com (Pierre Willard).)
* value.c (value_from_longest): Rename from value_from_long.
Handle pointer types as well as integers, so that targets with
different pointer sizes from the host can be accomodated.
* breakpoint.c, convex-tdep.c, eval.c, expprint.c, printcmd.c,
valarith.c, valops.c, valprint.c, value.h, values.c: Rename
uses of value_from_long to value_from_longest.
* eval.c, findvar.c, printcmd.c, valarith.c, valops.c: Pass
the correct pointer type to value_from_long{est}.
* remote-vx.c: Remove obsolete code for calling functions via
vxworks kludge interface (it referenced value_from_long).
* valops.c (value_string): Find malloc with lookup_misc_func, not
raw search.
* breakpoint.c, remote-vx.c: Reword strings printed by
catch_errors callers.
1991-09-06 16:09:40 +09:00
|
|
|
|
/* FIXME-someday, should give breakpoint # */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
free_all_values ();
|
|
|
|
|
}
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
if (b->cond && value_is_zero)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->stop = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
else if (b->ignore_count > 0)
|
|
|
|
|
{
|
|
|
|
|
b->ignore_count--;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->stop = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We will stop here */
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (b->disposition == disable)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->enable = disabled;
|
|
|
|
|
bs->commands = b->commands;
|
|
|
|
|
if (b->silent)
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->print = 0;
|
1993-03-27 06:49:53 +08:00
|
|
|
|
if (bs->commands && STREQ ("silent", bs->commands->line))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
bs->commands = bs->commands->next;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bs->print = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
1993-04-09 11:17:45 +08:00
|
|
|
|
/* Print nothing for this entry if we dont stop or if we dont print. */
|
|
|
|
|
if (bs->stop == 0 || bs->print == 0)
|
|
|
|
|
bs->print_it = print_it_noop;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bs->next = NULL; /* Terminate the chain */
|
|
|
|
|
bs = root_bs->next; /* Re-grab the head of the chain */
|
1993-04-09 11:17:45 +08:00
|
|
|
|
#if DECR_PC_AFTER_BREAK != 0 || defined (SHIFT_INST_REGS)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (bs)
|
|
|
|
|
{
|
|
|
|
|
if (real_breakpoint)
|
|
|
|
|
{
|
|
|
|
|
*pc = bp_addr;
|
|
|
|
|
#if defined (SHIFT_INST_REGS)
|
1993-09-22 08:43:55 +08:00
|
|
|
|
SHIFT_INST_REGS();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
#else /* No SHIFT_INST_REGS. */
|
|
|
|
|
write_pc (bp_addr);
|
|
|
|
|
#endif /* No SHIFT_INST_REGS. */
|
|
|
|
|
}
|
|
|
|
|
}
|
1993-04-09 11:17:45 +08:00
|
|
|
|
#endif /* DECR_PC_AFTER_BREAK != 0. */
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
|
|
|
|
/* The value of a hardware watchpoint hasn't changed, but the
|
|
|
|
|
intermediate memory locations we are watching may have. */
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (bs && ! bs->stop &&
|
|
|
|
|
(bs->breakpoint_at->type == bp_hardware_watchpoint ||
|
|
|
|
|
bs->breakpoint_at->type == bp_read_watchpoint ||
|
|
|
|
|
bs->breakpoint_at->type == bp_access_watchpoint))
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
{
|
|
|
|
|
remove_breakpoints ();
|
|
|
|
|
insert_breakpoints ();
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return bs;
|
|
|
|
|
}
|
1993-04-09 11:17:45 +08:00
|
|
|
|
|
|
|
|
|
/* Tell what to do about this bpstat. */
|
1993-07-11 12:52:50 +08:00
|
|
|
|
struct bpstat_what
|
1993-04-09 11:17:45 +08:00
|
|
|
|
bpstat_what (bs)
|
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
/* Classify each bpstat as one of the following. */
|
|
|
|
|
enum class {
|
1993-07-11 12:52:50 +08:00
|
|
|
|
/* This bpstat element has no effect on the main_action. */
|
|
|
|
|
no_effect = 0,
|
1993-04-09 11:17:45 +08:00
|
|
|
|
|
|
|
|
|
/* There was a watchpoint, stop but don't print. */
|
|
|
|
|
wp_silent,
|
|
|
|
|
|
|
|
|
|
/* There was a watchpoint, stop and print. */
|
|
|
|
|
wp_noisy,
|
|
|
|
|
|
|
|
|
|
/* There was a breakpoint but we're not stopping. */
|
|
|
|
|
bp_nostop,
|
|
|
|
|
|
|
|
|
|
/* There was a breakpoint, stop but don't print. */
|
|
|
|
|
bp_silent,
|
|
|
|
|
|
|
|
|
|
/* There was a breakpoint, stop and print. */
|
|
|
|
|
bp_noisy,
|
|
|
|
|
|
|
|
|
|
/* We hit the longjmp breakpoint. */
|
|
|
|
|
long_jump,
|
|
|
|
|
|
|
|
|
|
/* We hit the longjmp_resume breakpoint. */
|
|
|
|
|
long_resume,
|
|
|
|
|
|
1994-01-20 05:14:40 +08:00
|
|
|
|
/* We hit the step_resume breakpoint. */
|
|
|
|
|
step_resume,
|
|
|
|
|
|
1994-02-25 17:12:29 +08:00
|
|
|
|
/* We hit the through_sigtramp breakpoint. */
|
|
|
|
|
through_sig,
|
|
|
|
|
|
1993-04-09 11:17:45 +08:00
|
|
|
|
/* This is just used to count how many enums there are. */
|
|
|
|
|
class_last
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Here is the table which drives this routine. So that we can
|
|
|
|
|
format it pretty, we define some abbreviations for the
|
|
|
|
|
enum bpstat_what codes. */
|
|
|
|
|
#define keep_c BPSTAT_WHAT_KEEP_CHECKING
|
|
|
|
|
#define stop_s BPSTAT_WHAT_STOP_SILENT
|
|
|
|
|
#define stop_n BPSTAT_WHAT_STOP_NOISY
|
|
|
|
|
#define single BPSTAT_WHAT_SINGLE
|
|
|
|
|
#define setlr BPSTAT_WHAT_SET_LONGJMP_RESUME
|
|
|
|
|
#define clrlr BPSTAT_WHAT_CLEAR_LONGJMP_RESUME
|
|
|
|
|
#define clrlrs BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE
|
1994-01-20 05:14:40 +08:00
|
|
|
|
#define sr BPSTAT_WHAT_STEP_RESUME
|
1994-02-25 17:12:29 +08:00
|
|
|
|
#define ts BPSTAT_WHAT_THROUGH_SIGTRAMP
|
1994-01-20 05:14:40 +08:00
|
|
|
|
|
1993-04-09 11:17:45 +08:00
|
|
|
|
/* "Can't happen." Might want to print an error message.
|
|
|
|
|
abort() is not out of the question, but chances are GDB is just
|
|
|
|
|
a bit confused, not unusable. */
|
|
|
|
|
#define err BPSTAT_WHAT_STOP_NOISY
|
|
|
|
|
|
|
|
|
|
/* Given an old action and a class, come up with a new action. */
|
1993-09-19 03:15:36 +08:00
|
|
|
|
/* One interesting property of this table is that wp_silent is the same
|
|
|
|
|
as bp_silent and wp_noisy is the same as bp_noisy. That is because
|
|
|
|
|
after stopping, the check for whether to step over a breakpoint
|
|
|
|
|
(BPSTAT_WHAT_SINGLE type stuff) is handled in proceed() without
|
|
|
|
|
reference to how we stopped. We retain separate wp_silent and bp_silent
|
|
|
|
|
codes in case we want to change that someday. */
|
1994-01-20 05:14:40 +08:00
|
|
|
|
|
|
|
|
|
/* step_resume entries: a step resume breakpoint overrides another
|
|
|
|
|
breakpoint of signal handling (see comment in wait_for_inferior
|
|
|
|
|
at first IN_SIGTRAMP where we set the step_resume breakpoint). */
|
1994-02-25 17:12:29 +08:00
|
|
|
|
/* We handle the through_sigtramp_breakpoint the same way; having both
|
|
|
|
|
one of those and a step_resume_breakpoint is probably very rare (?). */
|
1994-01-20 05:14:40 +08:00
|
|
|
|
|
1993-07-11 12:52:50 +08:00
|
|
|
|
static const enum bpstat_what_main_action
|
1993-04-09 11:17:45 +08:00
|
|
|
|
table[(int)class_last][(int)BPSTAT_WHAT_LAST] =
|
|
|
|
|
{
|
|
|
|
|
/* old action */
|
1994-02-25 17:12:29 +08:00
|
|
|
|
/* keep_c stop_s stop_n single setlr clrlr clrlrs sr ts
|
|
|
|
|
*/
|
|
|
|
|
/*no_effect*/ {keep_c,stop_s,stop_n,single, setlr , clrlr , clrlrs, sr, ts},
|
|
|
|
|
/*wp_silent*/ {stop_s,stop_s,stop_n,stop_s, stop_s, stop_s, stop_s, sr, ts},
|
|
|
|
|
/*wp_noisy*/ {stop_n,stop_n,stop_n,stop_n, stop_n, stop_n, stop_n, sr, ts},
|
|
|
|
|
/*bp_nostop*/ {single,stop_s,stop_n,single, setlr , clrlrs, clrlrs, sr, ts},
|
|
|
|
|
/*bp_silent*/ {stop_s,stop_s,stop_n,stop_s, stop_s, stop_s, stop_s, sr, ts},
|
|
|
|
|
/*bp_noisy*/ {stop_n,stop_n,stop_n,stop_n, stop_n, stop_n, stop_n, sr, ts},
|
|
|
|
|
/*long_jump*/ {setlr ,stop_s,stop_n,setlr , err , err , err , sr, ts},
|
|
|
|
|
/*long_resume*/ {clrlr ,stop_s,stop_n,clrlrs, err , err , err , sr, ts},
|
|
|
|
|
/*step_resume*/ {sr ,sr ,sr ,sr , sr , sr , sr , sr, ts},
|
|
|
|
|
/*through_sig*/ {ts ,ts ,ts ,ts , ts , ts , ts , ts, ts}
|
1993-04-09 11:17:45 +08:00
|
|
|
|
};
|
|
|
|
|
#undef keep_c
|
|
|
|
|
#undef stop_s
|
|
|
|
|
#undef stop_n
|
|
|
|
|
#undef single
|
|
|
|
|
#undef setlr
|
|
|
|
|
#undef clrlr
|
|
|
|
|
#undef clrlrs
|
|
|
|
|
#undef err
|
1994-02-25 17:12:29 +08:00
|
|
|
|
#undef sr
|
|
|
|
|
#undef ts
|
1993-07-11 12:52:50 +08:00
|
|
|
|
enum bpstat_what_main_action current_action = BPSTAT_WHAT_KEEP_CHECKING;
|
1993-09-19 03:15:36 +08:00
|
|
|
|
struct bpstat_what retval;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
|
Changes to support alpha OSF/1 in native mode.
* alpha-nat.c, alpha-tdep.c, config/alpha/alpha-osf1.mt,
config/alpha/nm-alpha.h, config/alpha/tm-alpha.h, osfsolib.c:
New files.
* Makefile.in: Add new files and dependencies.
* configure.in: Add alpha target.
* config/alpha/alpha-osf1.mh (NATDEPFILES): Add osfsolib.o
* config/alpha/alpha-osf1.mh (MH_CFLAGS): Remove, we can handle
shared libraries now.
* config/alpha/xm-alpha.h: Cleanup, get MAKEVA_* defines right.
* defs.h (CORE_ADDR): Make its type overridable via CORE_ADDR_TYPE,
provide `unsigned int' default.
* breakpoint.c (breakpoint_auto_delete): Delete only if we really
stopped for the breakpoint.
* stabsread.c, stabsread.h (define_symbol): Change valu parameter
to a CORE_ADDR.
* stabsread.c (read_range_type): Handle the case where the lower
bound overflows and the upper doesn't and the range is legal.
* infrun.c (resume): Do not step a breakpoint instruction if
CANNOT_STEP_BREAKPOINT is defined.
* inferior.h (CALL_DUMMY_LOCATION): New variant AT_ENTRY_POINT.
Now that we have the bp_call_dummy breakpoint the call dummy code
is no longer needed. PUSH_DUMMY_FRAME, PUSH_ARGUMENTS and
FIX_CALL_DUMMY can be used to set up everything for the dummy.
The breakpoint for the dummy is set at the entry point and thats it.
* blockframe.c (inside_entry_file, inside_entry_func): Do not stop
backtraces if pc is in the call dummy at the entry point.
* infcmd.c (run_stack_dummy): Handle AT_ENTRY_POINT case. Use
the expected breakpoint pc when setting up the frame for
set_momentary_breakpoint.
* symfile.c (entry_point_address): New function for AT_ENTRY_POINT
support.
* valops.c (call_function_by_hand): Handle AT_ENTRY_POINT case.
1993-10-06 03:44:57 +08:00
|
|
|
|
retval.call_dummy = 0;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
for (; bs != NULL; bs = bs->next)
|
|
|
|
|
{
|
1993-09-09 05:30:33 +08:00
|
|
|
|
enum class bs_class = no_effect;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
if (bs->breakpoint_at == NULL)
|
|
|
|
|
/* I suspect this can happen if it was a momentary breakpoint
|
|
|
|
|
which has since been deleted. */
|
|
|
|
|
continue;
|
|
|
|
|
switch (bs->breakpoint_at->type)
|
|
|
|
|
{
|
|
|
|
|
case bp_breakpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_hardware_breakpoint:
|
1993-04-09 11:17:45 +08:00
|
|
|
|
case bp_until:
|
|
|
|
|
case bp_finish:
|
|
|
|
|
if (bs->stop)
|
|
|
|
|
{
|
|
|
|
|
if (bs->print)
|
|
|
|
|
bs_class = bp_noisy;
|
|
|
|
|
else
|
|
|
|
|
bs_class = bp_silent;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
bs_class = bp_nostop;
|
|
|
|
|
break;
|
|
|
|
|
case bp_watchpoint:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_hardware_watchpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_read_watchpoint:
|
|
|
|
|
case bp_access_watchpoint:
|
1993-04-09 11:17:45 +08:00
|
|
|
|
if (bs->stop)
|
|
|
|
|
{
|
|
|
|
|
if (bs->print)
|
|
|
|
|
bs_class = wp_noisy;
|
|
|
|
|
else
|
|
|
|
|
bs_class = wp_silent;
|
|
|
|
|
}
|
|
|
|
|
else
|
1993-07-11 12:52:50 +08:00
|
|
|
|
/* There was a watchpoint, but we're not stopping. This requires
|
|
|
|
|
no further action. */
|
|
|
|
|
bs_class = no_effect;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
break;
|
|
|
|
|
case bp_longjmp:
|
|
|
|
|
bs_class = long_jump;
|
|
|
|
|
break;
|
|
|
|
|
case bp_longjmp_resume:
|
|
|
|
|
bs_class = long_resume;
|
|
|
|
|
break;
|
1993-07-11 12:52:50 +08:00
|
|
|
|
case bp_step_resume:
|
|
|
|
|
if (bs->stop)
|
|
|
|
|
{
|
1994-01-20 05:14:40 +08:00
|
|
|
|
bs_class = step_resume;
|
1993-07-11 12:52:50 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* It is for the wrong frame. */
|
|
|
|
|
bs_class = bp_nostop;
|
1994-02-25 17:12:29 +08:00
|
|
|
|
break;
|
|
|
|
|
case bp_through_sigtramp:
|
|
|
|
|
bs_class = through_sig;
|
1993-07-11 12:52:50 +08:00
|
|
|
|
break;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_watchpoint_scope:
|
|
|
|
|
bs_class = bp_nostop;
|
|
|
|
|
break;
|
|
|
|
|
|
1993-09-19 03:15:36 +08:00
|
|
|
|
case bp_call_dummy:
|
|
|
|
|
/* Make sure the action is stop (silent or noisy), so infrun.c
|
|
|
|
|
pops the dummy frame. */
|
|
|
|
|
bs_class = bp_silent;
|
|
|
|
|
retval.call_dummy = 1;
|
1993-09-22 06:55:39 +08:00
|
|
|
|
break;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
}
|
|
|
|
|
current_action = table[(int)bs_class][(int)current_action];
|
|
|
|
|
}
|
1993-09-19 03:15:36 +08:00
|
|
|
|
retval.main_action = current_action;
|
|
|
|
|
return retval;
|
1993-04-09 11:17:45 +08:00
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Nonzero if we should step constantly (e.g. watchpoints on machines
|
|
|
|
|
without hardware support). This isn't related to a specific bpstat,
|
|
|
|
|
just to things like whether watchpoints are set. */
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int
|
|
|
|
|
bpstat_should_step ()
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (b->enable == enabled && b->type == bp_watchpoint)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print information on breakpoint number BNUM, or -1 if all.
|
|
|
|
|
If WATCHPOINTS is zero, process only breakpoints; if WATCHPOINTS
|
|
|
|
|
is nonzero, process only watchpoints. */
|
|
|
|
|
|
|
|
|
|
static void
|
1992-03-30 07:18:31 +08:00
|
|
|
|
breakpoint_1 (bnum, allflag)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int bnum;
|
1992-02-28 01:45:02 +08:00
|
|
|
|
int allflag;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
register struct command_line *l;
|
|
|
|
|
register struct symbol *sym;
|
|
|
|
|
CORE_ADDR last_addr = (CORE_ADDR)-1;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
int found_a_breakpoint = 0;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
static char *bptypes[] = {"breakpoint", "hw breakpoint",
|
|
|
|
|
"until", "finish", "watchpoint",
|
|
|
|
|
"hw watchpoint", "read watchpoint",
|
|
|
|
|
"acc watchpoint", "longjmp",
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
"longjmp resume", "step resume",
|
|
|
|
|
"watchpoint scope", "call dummy" };
|
1992-02-28 01:45:02 +08:00
|
|
|
|
static char *bpdisps[] = {"del", "dis", "keep"};
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
static char bpenables[] = "ny";
|
1993-04-13 01:56:35 +08:00
|
|
|
|
char wrap_indent[80];
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
ALL_BREAKPOINTS (b)
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (bnum == -1
|
|
|
|
|
|| bnum == b->number)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-02-28 01:45:02 +08:00
|
|
|
|
/* We only print out user settable breakpoints unless the allflag is set. */
|
|
|
|
|
if (!allflag
|
|
|
|
|
&& b->type != bp_breakpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->type != bp_hardware_breakpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->type != bp_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->type != bp_read_watchpoint
|
|
|
|
|
&& b->type != bp_access_watchpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->type != bp_hardware_watchpoint)
|
1992-02-28 01:45:02 +08:00
|
|
|
|
continue;
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (!found_a_breakpoint++)
|
1994-04-30 09:30:28 +08:00
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_breakpoints_headers ();
|
|
|
|
|
|
|
|
|
|
annotate_field (0);
|
|
|
|
|
printf_filtered ("Num ");
|
|
|
|
|
annotate_field (1);
|
|
|
|
|
printf_filtered ("Type ");
|
|
|
|
|
annotate_field (2);
|
|
|
|
|
printf_filtered ("Disp ");
|
|
|
|
|
annotate_field (3);
|
|
|
|
|
printf_filtered ("Enb ");
|
|
|
|
|
if (addressprint)
|
|
|
|
|
{
|
|
|
|
|
annotate_field (4);
|
|
|
|
|
printf_filtered ("Address ");
|
|
|
|
|
}
|
|
|
|
|
annotate_field (5);
|
|
|
|
|
printf_filtered ("What\n");
|
|
|
|
|
|
|
|
|
|
annotate_breakpoints_table ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
annotate_record ();
|
|
|
|
|
annotate_field (0);
|
|
|
|
|
printf_filtered ("%-3d ", b->number);
|
|
|
|
|
annotate_field (1);
|
|
|
|
|
printf_filtered ("%-14s ", bptypes[(int)b->type]);
|
|
|
|
|
annotate_field (2);
|
|
|
|
|
printf_filtered ("%-4s ", bpdisps[(int)b->disposition]);
|
|
|
|
|
annotate_field (3);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
printf_filtered ("%-3c ", bpenables[(int)b->enable]);
|
|
|
|
|
|
1993-04-13 01:56:35 +08:00
|
|
|
|
strcpy (wrap_indent, " ");
|
|
|
|
|
if (addressprint)
|
|
|
|
|
strcat (wrap_indent, " ");
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
switch (b->type)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
case bp_watchpoint:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_hardware_watchpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_read_watchpoint:
|
|
|
|
|
case bp_access_watchpoint:
|
1994-04-30 09:30:28 +08:00
|
|
|
|
/* Field 4, the address, is omitted (which makes the columns
|
|
|
|
|
not line up too nicely with the headers, but the effect
|
|
|
|
|
is relatively readable). */
|
1994-07-14 10:15:39 +08:00
|
|
|
|
annotate_field (5);
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_expression (b->exp, gdb_stdout);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
break;
|
1993-09-19 03:15:36 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
case bp_breakpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_hardware_breakpoint:
|
1992-02-28 01:45:02 +08:00
|
|
|
|
case bp_until:
|
|
|
|
|
case bp_finish:
|
|
|
|
|
case bp_longjmp:
|
|
|
|
|
case bp_longjmp_resume:
|
1993-09-19 03:15:36 +08:00
|
|
|
|
case bp_step_resume:
|
1994-02-25 17:12:29 +08:00
|
|
|
|
case bp_through_sigtramp:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_watchpoint_scope:
|
1993-09-22 06:55:39 +08:00
|
|
|
|
case bp_call_dummy:
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (addressprint)
|
1994-04-30 09:30:28 +08:00
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_field (4);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
/* FIXME-32x64: need a print_address_numeric with
|
|
|
|
|
field width */
|
|
|
|
|
printf_filtered
|
|
|
|
|
("%s ",
|
|
|
|
|
local_hex_string_custom
|
|
|
|
|
((unsigned long) b->address, "08l"));
|
|
|
|
|
}
|
|
|
|
|
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_field (5);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
last_addr = b->address;
|
1993-07-26 13:26:55 +08:00
|
|
|
|
if (b->source_file)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
sym = find_pc_function (b->address);
|
|
|
|
|
if (sym)
|
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fputs_filtered ("in ", gdb_stdout);
|
|
|
|
|
fputs_filtered (SYMBOL_SOURCE_NAME (sym), gdb_stdout);
|
1993-04-13 01:56:35 +08:00
|
|
|
|
wrap_here (wrap_indent);
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fputs_filtered (" at ", gdb_stdout);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fputs_filtered (b->source_file, gdb_stdout);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered (":%d", b->line_number);
|
|
|
|
|
}
|
|
|
|
|
else
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_address_symbolic (b->address, gdb_stdout, demangle, " ");
|
1993-09-09 05:30:33 +08:00
|
|
|
|
break;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
|
|
|
|
|
if (b->frame)
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_field (6);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered ("\tstop only in stack frame at ");
|
* valprint.c (print_longest): Clarify comment about use_local.
* printcmd.c, defs.h (print_address_numeric), callers in
symmisc.c, symfile.c, stack.c, source.c, remote.c, infcmd.c,
cp-valprint.c, core.c, ch-valprint.c, c-valprint.c, breakpoint.c,
exec.c: New argument use_local.
* source.c (identify_source_line): Use filtered output. Use
print_address_numeric.
1994-05-04 23:24:41 +08:00
|
|
|
|
print_address_numeric (b->frame, 1, gdb_stdout);
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered ("\n");
|
1994-02-25 17:12:29 +08:00
|
|
|
|
}
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (b->cond)
|
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_field (7);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("\tstop only if ");
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_expression (b->cond, gdb_stdout);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
}
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
1994-07-14 10:15:39 +08:00
|
|
|
|
if (show_breakpoint_hit_counts && b->hit_count)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME should make an annotation for this */
|
|
|
|
|
|
The point of these changes is to avoid reading the frame pointer
and stack pointer during stepping, to speed things up.
A. Changes to not select a frame until we need a selected frame:
* blockframe.c (flush_cached_frames): Call select_frame (NULL, -1).
* infrun.c (wait_for_inferior): Move call to select_frame back to
normal_stop. This reverts a change of 13 Apr 94 (it says Jeff
Law, but the change was my idea); the only reason for that change
was so we could save and restore the selected frame in
wait_for_inferior, and now that flush_cached frames clears the
selected frame, that should work OK now.
B. Changes to not create a current_frame until we need one:
* blockframe.c (get_current_frame): If current_frame is NULL, try
to create an innermost frame.
* sparc-tdep.c (sparc_pop_frame), infcmd.c (run-stack_dummy),
infrun.c (wait_for_inferior), thread.c (thread_switch),
convex-tdep.c (set_thread_command), a29k-tdep.c (pop_frame),
alpha-tdep.c (alpha_pop_frame), convex-xdep.c (core_file_command),
h8300-tdep.c (h8300_pop_frame), h8500-tdep.c (h8300_pop_frame),
hppa-tdep.c (hppa_pop_frame), i386-tdep.c (i386_pop_frame),
i960-tdep.c (pop_frame), m68k-tdep.c
(m68k_pop_frame), mips-tdep.c (mips_pop_frame), rs6000-tdep.c
(push_dummy_frame, pop_dummy_frame, pop_frame), sh-tdep.c
(pop_frame), config/arm/tm-arm.h (POP_FRAME),
config/convex/tm-convex.h (POP_FRAME), config/gould/tm-pn.h
(POP_FRAME), config/ns32k/tm-merlin.h (POP_FRAME),
config/ns32k/tm-umax.h (POP_FRAME), config/tahoe/tm-tahoe.h
(POP_FRAME), config/vax/tm-vax.h (POP_FRAME): Don't
call create_new_frame.
* corelow.c (core_open), altos-xdep.c (core_file_command),
arm-xdep.c (core_file_command), gould-xdep.c (core_file_command),
m3-nat.c (select_thread), sun386-nat.c (core_file_command),
umax-xdep.c (core_file_command): Don't call create_new_frame; do
call flush_cached_frames.
* blockframe.c (reinit_frame_cache): Don't call create_new_frame
or select_frame.
C. Changes to get rid of stop_frame_address and instead only
fetch the frame pointer when we need it.
* breakpoint.c (bpstat_stop_status): Remove argument
frame_address; use FRAME_FP (get_current_frame ()).
* infrun.c (wait_for_inferior): Don't pass frame pointer to
bpstat_stop_status.
* infrun.c (wait_for_inferior): Use FRAME_FP (get_current_frame
()) instead of stop_frame_address.
* infrun.c (save_inferior_status, restore_inferior_status),
inferior.h (struct inferior_status): Don't save and restore
stop_frame_address.
* inferior.h, infcmd.c, thread.c (thread_switch), m3-nat.c
(select_thread): Remove stop_frame_address and uses thereof.
D. Same thing for the stack pointer.
* infrun.c (wait_for_inferior): Remove stop_sp and replace
uses thereof with read_sp ().
E. Change to eliminate one nasty little spot where we were
wanting to know the frame pointer from before the current step
(idea from GDB 3.5, which saved my ass, because my other ideas of
how to fix it were very baroque).
* infrun.c: Remove prev_frame_address.
* infrun.c (wait_for_inferior, step_over_function): Use
step_frame_address instead of prev_frame_address.
F. Same basic idea for the stack pointer.
* inferior.h, infcmd.c: New variable step_sp.
* infcmd.c (step_1, until_next_command): Set it.
* infrun.c: Remove prev_sp and replace uses by step_sp.
* infrun.c (wait_for_inferior): If we get out of the step
range, then set step_sp to the current stack pointer before we
start going again.
1994-10-08 11:41:21 +08:00
|
|
|
|
printf_filtered ("\tbreakpoint already hit %d time%s\n",
|
|
|
|
|
b->hit_count, (b->hit_count == 1 ? "" : "s"));
|
1994-07-14 10:15:39 +08:00
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (b->ignore_count)
|
1994-04-30 09:30:28 +08:00
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_field (8);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
|
|
|
|
printf_filtered ("\tignore next %d hits\n", b->ignore_count);
|
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if ((l = b->commands))
|
1994-04-30 09:30:28 +08:00
|
|
|
|
{
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_field (9);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
|
|
|
|
while (l)
|
|
|
|
|
{
|
|
|
|
|
fputs_filtered ("\t", gdb_stdout);
|
|
|
|
|
fputs_filtered (l->line, gdb_stdout);
|
|
|
|
|
fputs_filtered ("\n", gdb_stdout);
|
|
|
|
|
l = l->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1993-09-09 05:30:33 +08:00
|
|
|
|
if (!found_a_breakpoint)
|
|
|
|
|
{
|
|
|
|
|
if (bnum == -1)
|
|
|
|
|
printf_filtered ("No breakpoints or watchpoints.\n");
|
|
|
|
|
else
|
|
|
|
|
printf_filtered ("No breakpoint or watchpoint number %d.\n", bnum);
|
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
else
|
|
|
|
|
/* Compare against (CORE_ADDR)-1 in case some compiler decides
|
|
|
|
|
that a comparison of an unsigned with -1 is always false. */
|
|
|
|
|
if (last_addr != (CORE_ADDR)-1)
|
|
|
|
|
set_next_address (last_addr);
|
1994-04-30 09:30:28 +08:00
|
|
|
|
|
1994-06-15 07:22:44 +08:00
|
|
|
|
annotate_breakpoints_table_end ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
breakpoints_info (bnum_exp, from_tty)
|
|
|
|
|
char *bnum_exp;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
int bnum = -1;
|
|
|
|
|
|
|
|
|
|
if (bnum_exp)
|
|
|
|
|
bnum = parse_and_eval_address (bnum_exp);
|
|
|
|
|
|
1992-03-30 07:18:31 +08:00
|
|
|
|
breakpoint_1 (bnum, 0);
|
1992-02-28 01:45:02 +08:00
|
|
|
|
}
|
|
|
|
|
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
#if MAINTENANCE_CMDS
|
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
static void
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
maintenance_info_breakpoints (bnum_exp, from_tty)
|
1992-02-28 01:45:02 +08:00
|
|
|
|
char *bnum_exp;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
int bnum = -1;
|
|
|
|
|
|
|
|
|
|
if (bnum_exp)
|
|
|
|
|
bnum = parse_and_eval_address (bnum_exp);
|
|
|
|
|
|
1992-03-30 07:18:31 +08:00
|
|
|
|
breakpoint_1 (bnum, 1);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
#endif
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Print a message describing any breakpoints set at PC. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
describe_other_breakpoints (pc)
|
|
|
|
|
register CORE_ADDR pc;
|
|
|
|
|
{
|
|
|
|
|
register int others = 0;
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->address == pc)
|
|
|
|
|
others++;
|
|
|
|
|
if (others > 0)
|
|
|
|
|
{
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered ("Note: breakpoint%s ", (others > 1) ? "s" : "");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->address == pc)
|
|
|
|
|
{
|
|
|
|
|
others--;
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered
|
|
|
|
|
("%d%s%s ",
|
|
|
|
|
b->number,
|
|
|
|
|
(b->enable == disabled) ? " (disabled)" : "",
|
|
|
|
|
(others > 1) ? "," : ((others == 1) ? " and" : ""));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered ("also set at pc ");
|
* valprint.c (print_longest): Clarify comment about use_local.
* printcmd.c, defs.h (print_address_numeric), callers in
symmisc.c, symfile.c, stack.c, source.c, remote.c, infcmd.c,
cp-valprint.c, core.c, ch-valprint.c, c-valprint.c, breakpoint.c,
exec.c: New argument use_local.
* source.c (identify_source_line): Use filtered output. Use
print_address_numeric.
1994-05-04 23:24:41 +08:00
|
|
|
|
print_address_numeric (pc, 1, gdb_stdout);
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered (".\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the default place to put a breakpoint
|
|
|
|
|
for the `break' command with no arguments. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
set_default_breakpoint (valid, addr, symtab, line)
|
|
|
|
|
int valid;
|
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
struct symtab *symtab;
|
|
|
|
|
int line;
|
|
|
|
|
{
|
|
|
|
|
default_breakpoint_valid = valid;
|
|
|
|
|
default_breakpoint_address = addr;
|
|
|
|
|
default_breakpoint_symtab = symtab;
|
|
|
|
|
default_breakpoint_line = line;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Rescan breakpoints at address ADDRESS,
|
|
|
|
|
marking the first one as "first" and any others as "duplicates".
|
|
|
|
|
This is so that the bpt instruction is only inserted once. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
check_duplicates (address)
|
|
|
|
|
CORE_ADDR address;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
register int count = 0;
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (address == 0) /* Watchpoints are uninteresting */
|
1991-04-19 10:32:08 +09:00
|
|
|
|
return;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->enable != disabled && b->address == address)
|
|
|
|
|
{
|
|
|
|
|
count++;
|
|
|
|
|
b->duplicate = count > 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Low level routine to set a breakpoint.
|
|
|
|
|
Takes as args the three things that every breakpoint must have.
|
|
|
|
|
Returns the breakpoint object so caller can set other things.
|
|
|
|
|
Does not set the breakpoint number!
|
1991-04-19 10:32:08 +09:00
|
|
|
|
Does not print anything.
|
|
|
|
|
|
|
|
|
|
==> This routine should not be called if there is a chance of later
|
|
|
|
|
error(); otherwise it leaves a bogus breakpoint on the chain. Validate
|
|
|
|
|
your arguments BEFORE calling this routine! */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
static struct breakpoint *
|
|
|
|
|
set_raw_breakpoint (sal)
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b, *b1;
|
|
|
|
|
|
|
|
|
|
b = (struct breakpoint *) xmalloc (sizeof (struct breakpoint));
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 11:22:08 +08:00
|
|
|
|
memset (b, 0, sizeof (*b));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->address = sal.pc;
|
1993-07-26 13:26:55 +08:00
|
|
|
|
if (sal.symtab == NULL)
|
|
|
|
|
b->source_file = NULL;
|
|
|
|
|
else
|
|
|
|
|
b->source_file = savestring (sal.symtab->filename,
|
|
|
|
|
strlen (sal.symtab->filename));
|
1993-11-02 06:25:23 +08:00
|
|
|
|
b->thread = -1;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->line_number = sal.line;
|
|
|
|
|
b->enable = enabled;
|
|
|
|
|
b->next = 0;
|
|
|
|
|
b->silent = 0;
|
|
|
|
|
b->ignore_count = 0;
|
|
|
|
|
b->commands = NULL;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->frame = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Add this breakpoint to the end of the chain
|
|
|
|
|
so that a list of breakpoints will come out in order
|
|
|
|
|
of increasing numbers. */
|
|
|
|
|
|
|
|
|
|
b1 = breakpoint_chain;
|
|
|
|
|
if (b1 == 0)
|
|
|
|
|
breakpoint_chain = b;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
while (b1->next)
|
|
|
|
|
b1 = b1->next;
|
|
|
|
|
b1->next = b;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_duplicates (sal.pc);
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
return b;
|
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
static void
|
1992-02-28 01:45:02 +08:00
|
|
|
|
create_longjmp_breakpoint(func_name)
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
char *func_name;
|
|
|
|
|
{
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
struct breakpoint *b;
|
1992-02-28 01:45:02 +08:00
|
|
|
|
static int internal_breakpoint_number = -1;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
|
|
|
|
|
if (func_name != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct minimal_symbol *m;
|
|
|
|
|
|
|
|
|
|
m = lookup_minimal_symbol(func_name, (struct objfile *)NULL);
|
|
|
|
|
if (m)
|
1993-03-27 06:49:53 +08:00
|
|
|
|
sal.pc = SYMBOL_VALUE_ADDRESS (m);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
else
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sal.pc = 0;
|
|
|
|
|
|
|
|
|
|
sal.symtab = NULL;
|
|
|
|
|
sal.line = 0;
|
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
b = set_raw_breakpoint(sal);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (!b) return;
|
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
b->type = func_name != NULL ? bp_longjmp : bp_longjmp_resume;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->disposition = donttouch;
|
|
|
|
|
b->enable = disabled;
|
|
|
|
|
b->silent = 1;
|
1992-02-28 01:45:02 +08:00
|
|
|
|
if (func_name)
|
|
|
|
|
b->addr_string = strsave(func_name);
|
|
|
|
|
b->number = internal_breakpoint_number--;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Call this routine when stepping and nexting to enable a breakpoint if we do
|
|
|
|
|
a longjmp(). When we hit that breakpoint, call
|
|
|
|
|
set_longjmp_resume_breakpoint() to figure out where we are going. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
enable_longjmp_breakpoint()
|
|
|
|
|
{
|
1992-02-28 01:45:02 +08:00
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->type == bp_longjmp)
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
{
|
|
|
|
|
b->enable = enabled;
|
|
|
|
|
check_duplicates (b->address);
|
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
disable_longjmp_breakpoint()
|
|
|
|
|
{
|
1992-02-28 01:45:02 +08:00
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
if ( b->type == bp_longjmp
|
1992-02-28 01:45:02 +08:00
|
|
|
|
|| b->type == bp_longjmp_resume)
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
{
|
|
|
|
|
b->enable = disabled;
|
|
|
|
|
check_duplicates (b->address);
|
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int
|
|
|
|
|
hw_breakpoint_used_count()
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
{
|
|
|
|
|
if (b->type == bp_hardware_breakpoint && b->enable == enabled)
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
hw_watchpoint_used_count(type, other_type_used)
|
|
|
|
|
enum bptype type;
|
|
|
|
|
int *other_type_used;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
|
|
*other_type_used = 0;
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
{
|
|
|
|
|
if (b->enable == enabled)
|
|
|
|
|
{
|
|
|
|
|
if (b->type == type) i++;
|
|
|
|
|
else if ((b->type == bp_hardware_watchpoint ||
|
|
|
|
|
b->type == bp_read_watchpoint ||
|
|
|
|
|
b->type == bp_access_watchpoint)
|
|
|
|
|
&& b->enable == enabled)
|
|
|
|
|
*other_type_used = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Call this after hitting the longjmp() breakpoint. Use this to set a new
|
|
|
|
|
breakpoint at the target of the jmp_buf.
|
1992-02-28 01:45:02 +08:00
|
|
|
|
|
|
|
|
|
FIXME - This ought to be done by setting a temporary breakpoint that gets
|
|
|
|
|
deleted automatically...
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
set_longjmp_resume_breakpoint(pc, frame)
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
FRAME frame;
|
|
|
|
|
{
|
1992-02-28 01:45:02 +08:00
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->type == bp_longjmp_resume)
|
|
|
|
|
{
|
|
|
|
|
b->address = pc;
|
|
|
|
|
b->enable = enabled;
|
|
|
|
|
if (frame != NULL)
|
|
|
|
|
b->frame = FRAME_FP(frame);
|
|
|
|
|
else
|
|
|
|
|
b->frame = 0;
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
check_duplicates (b->address);
|
1992-02-28 01:45:02 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Set a breakpoint that will evaporate an end of command
|
|
|
|
|
at address specified by SAL.
|
|
|
|
|
Restrict it to frame FRAME if FRAME is nonzero. */
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
struct breakpoint *
|
|
|
|
|
set_momentary_breakpoint (sal, frame, type)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
FRAME frame;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
enum bptype type;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
b = set_raw_breakpoint (sal);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->type = type;
|
|
|
|
|
b->enable = enabled;
|
|
|
|
|
b->disposition = donttouch;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->frame = (frame ? FRAME_FP (frame) : 0);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
return b;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
#if 0
|
1991-03-29 00:26:26 +08:00
|
|
|
|
void
|
|
|
|
|
clear_momentary_breakpoints ()
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
if (b->disposition == delete)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
delete_breakpoint (b);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Tell the user we have just set a breakpoint B. */
|
1994-07-14 10:15:39 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
mention (b)
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
{
|
1994-07-14 10:15:39 +08:00
|
|
|
|
int say_where = 0;
|
|
|
|
|
|
1994-08-02 08:44:24 +08:00
|
|
|
|
/* FIXME: This is misplaced; mention() is called by things (like hitting a
|
|
|
|
|
watchpoint) other than breakpoint creation. It should be possible to
|
|
|
|
|
clean this up and at the same time replace the random calls to
|
|
|
|
|
breakpoint_changed with this hook, as has already been done for
|
|
|
|
|
delete_breakpoint_hook and so on. */
|
1994-07-29 06:07:02 +08:00
|
|
|
|
if (create_breakpoint_hook)
|
|
|
|
|
create_breakpoint_hook (b);
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
switch (b->type)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
case bp_watchpoint:
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("Watchpoint %d: ", b->number);
|
1993-11-02 06:25:23 +08:00
|
|
|
|
print_expression (b->exp, gdb_stdout);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
break;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_hardware_watchpoint:
|
|
|
|
|
printf_filtered ("Hardware watchpoint %d: ", b->number);
|
|
|
|
|
print_expression (b->exp, gdb_stdout);
|
|
|
|
|
break;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_read_watchpoint:
|
|
|
|
|
printf_filtered ("Hardware read watchpoint %d: ", b->number);
|
|
|
|
|
print_expression (b->exp, gdb_stdout);
|
|
|
|
|
break;
|
|
|
|
|
case bp_access_watchpoint:
|
|
|
|
|
printf_filtered ("Hardware access(read/write) watchpoint %d: ",b->number);
|
|
|
|
|
print_expression (b->exp, gdb_stdout);
|
|
|
|
|
break;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
case bp_breakpoint:
|
1994-07-14 10:15:39 +08:00
|
|
|
|
printf_filtered ("Breakpoint %d", b->number);
|
|
|
|
|
say_where = 1;
|
* dbxread.c, i386-pinsn.c, i386-tdep.c, regex.c, solib.c, symmisc.c,
symtab.h, tm-i386v4.h, valprint.c, values.c: Lint.
* breakpoint.c, c-exp.y, coffread.c, command.c, environ.c, eval.c,
findvar.c, infcmd.c, infptrace.c, infrun.c, m2-exp.y, parse.c,
putenv.c, solib.c, sparc-xdep.c, symtab.c, tm-i386v.h, tm-sparc.h,
utils.c, valarith.c, valops.c, valprint.c, values.c:
Replace bcopy() use with memcpy(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
* breakpoint.c, buildsym.c, coffread.c, dbxread.c, i386-tdep.c,
ieee-float.c, infcmd.c, sparc-tdep.c, stack.c, symtab.c, symtab.h,
target.c, values.c:
Replace bzero() use with memset(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
* i386-tdep.c, main.c, valprint.c:
Replace bcmp() use with memcmp(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
1992-06-30 07:34:38 +08:00
|
|
|
|
break;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_hardware_breakpoint:
|
1994-07-14 10:15:39 +08:00
|
|
|
|
printf_filtered ("Hardware assisted breakpoint %d", b->number);
|
|
|
|
|
say_where = 1;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
break;
|
* dbxread.c, i386-pinsn.c, i386-tdep.c, regex.c, solib.c, symmisc.c,
symtab.h, tm-i386v4.h, valprint.c, values.c: Lint.
* breakpoint.c, c-exp.y, coffread.c, command.c, environ.c, eval.c,
findvar.c, infcmd.c, infptrace.c, infrun.c, m2-exp.y, parse.c,
putenv.c, solib.c, sparc-xdep.c, symtab.c, tm-i386v.h, tm-sparc.h,
utils.c, valarith.c, valops.c, valprint.c, values.c:
Replace bcopy() use with memcpy(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
* breakpoint.c, buildsym.c, coffread.c, dbxread.c, i386-tdep.c,
ieee-float.c, infcmd.c, sparc-tdep.c, stack.c, symtab.c, symtab.h,
target.c, values.c:
Replace bzero() use with memset(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
* i386-tdep.c, main.c, valprint.c:
Replace bcmp() use with memcmp(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
1992-06-30 07:34:38 +08:00
|
|
|
|
case bp_until:
|
|
|
|
|
case bp_finish:
|
|
|
|
|
case bp_longjmp:
|
|
|
|
|
case bp_longjmp_resume:
|
1993-09-09 05:30:33 +08:00
|
|
|
|
case bp_step_resume:
|
1994-02-25 17:12:29 +08:00
|
|
|
|
case bp_through_sigtramp:
|
1993-11-02 06:25:23 +08:00
|
|
|
|
case bp_call_dummy:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_watchpoint_scope:
|
* dbxread.c, i386-pinsn.c, i386-tdep.c, regex.c, solib.c, symmisc.c,
symtab.h, tm-i386v4.h, valprint.c, values.c: Lint.
* breakpoint.c, c-exp.y, coffread.c, command.c, environ.c, eval.c,
findvar.c, infcmd.c, infptrace.c, infrun.c, m2-exp.y, parse.c,
putenv.c, solib.c, sparc-xdep.c, symtab.c, tm-i386v.h, tm-sparc.h,
utils.c, valarith.c, valops.c, valprint.c, values.c:
Replace bcopy() use with memcpy(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
* breakpoint.c, buildsym.c, coffread.c, dbxread.c, i386-tdep.c,
ieee-float.c, infcmd.c, sparc-tdep.c, stack.c, symtab.c, symtab.h,
target.c, values.c:
Replace bzero() use with memset(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
* i386-tdep.c, main.c, valprint.c:
Replace bcmp() use with memcmp(), which is more standard and can
take advantage of gcc's builtin functions for increased performance.
1992-06-30 07:34:38 +08:00
|
|
|
|
break;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1994-07-14 10:15:39 +08:00
|
|
|
|
if (say_where)
|
|
|
|
|
{
|
|
|
|
|
if (addressprint || b->source_file == NULL)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered (" at ");
|
|
|
|
|
print_address_numeric (b->address, 1, gdb_stdout);
|
|
|
|
|
}
|
|
|
|
|
if (b->source_file)
|
|
|
|
|
printf_filtered (": file %s, line %d.",
|
|
|
|
|
b->source_file, b->line_number);
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
printf_filtered ("\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
/* Nobody calls this currently. */
|
|
|
|
|
/* Set a breakpoint from a symtab and line.
|
|
|
|
|
If TEMPFLAG is nonzero, it is a temporary breakpoint.
|
|
|
|
|
ADDR_STRING is a malloc'd string holding the name of where we are
|
|
|
|
|
setting the breakpoint. This is used later to re-set it after the
|
|
|
|
|
program is relinked and symbols are reloaded.
|
|
|
|
|
Print the same confirmation messages that the breakpoint command prints. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
set_breakpoint (s, line, tempflag, addr_string)
|
|
|
|
|
struct symtab *s;
|
|
|
|
|
int line;
|
|
|
|
|
int tempflag;
|
|
|
|
|
char *addr_string;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
|
|
|
|
|
sal.symtab = s;
|
|
|
|
|
sal.line = line;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
sal.pc = 0;
|
|
|
|
|
resolve_sal_pc (&sal); /* Might error out */
|
|
|
|
|
describe_other_breakpoints (sal.pc);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b = set_raw_breakpoint (sal);
|
|
|
|
|
set_breakpoint_count (breakpoint_count + 1);
|
|
|
|
|
b->number = breakpoint_count;
|
|
|
|
|
b->type = bp_breakpoint;
|
|
|
|
|
b->cond = 0;
|
|
|
|
|
b->addr_string = addr_string;
|
|
|
|
|
b->enable = enabled;
|
|
|
|
|
b->disposition = tempflag ? delete : donttouch;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
mention (b);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
#endif /* 0 */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Set a breakpoint according to ARG (function, linenum or *address)
|
1994-06-11 09:09:25 +08:00
|
|
|
|
flag: first bit : 0 non-temporary, 1 temporary.
|
|
|
|
|
second bit : 0 normal breakpoint, 1 hardware breakpoint. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
static void
|
1994-06-11 09:09:25 +08:00
|
|
|
|
break_command_1 (arg, flag, from_tty)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
char *arg;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int flag, from_tty;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int tempflag, hardwareflag;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
register struct expression *cond = 0;
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
/* Pointers in arg to the start, and one past the end, of the condition. */
|
|
|
|
|
char *cond_start = NULL;
|
1993-09-09 05:30:33 +08:00
|
|
|
|
char *cond_end = NULL;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Pointers in arg to the start, and one past the end,
|
|
|
|
|
of the address part. */
|
|
|
|
|
char *addr_start = NULL;
|
1993-09-09 05:30:33 +08:00
|
|
|
|
char *addr_end = NULL;
|
1993-07-26 13:26:55 +08:00
|
|
|
|
struct cleanup *old_chain;
|
1993-09-09 05:30:33 +08:00
|
|
|
|
struct cleanup *canonical_strings_chain = NULL;
|
1993-07-26 13:26:55 +08:00
|
|
|
|
char **canonical = (char **)NULL;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int i;
|
1993-11-02 06:25:23 +08:00
|
|
|
|
int thread;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
hardwareflag = flag & 2;
|
|
|
|
|
tempflag = flag & 1;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
sals.sals = NULL;
|
|
|
|
|
sals.nelts = 0;
|
|
|
|
|
|
|
|
|
|
sal.line = sal.pc = sal.end = 0;
|
|
|
|
|
sal.symtab = 0;
|
|
|
|
|
|
|
|
|
|
/* If no arg given, or if first arg is 'if ', use the default breakpoint. */
|
|
|
|
|
|
|
|
|
|
if (!arg || (arg[0] == 'i' && arg[1] == 'f'
|
|
|
|
|
&& (arg[2] == ' ' || arg[2] == '\t')))
|
|
|
|
|
{
|
|
|
|
|
if (default_breakpoint_valid)
|
|
|
|
|
{
|
|
|
|
|
sals.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
sal.pc = default_breakpoint_address;
|
|
|
|
|
sal.line = default_breakpoint_line;
|
|
|
|
|
sal.symtab = default_breakpoint_symtab;
|
|
|
|
|
sals.sals[0] = sal;
|
|
|
|
|
sals.nelts = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
error ("No default breakpoint address now.");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
addr_start = arg;
|
|
|
|
|
|
|
|
|
|
/* Force almost all breakpoints to be in terms of the
|
|
|
|
|
current_source_symtab (which is decode_line_1's default). This
|
|
|
|
|
should produce the results we want almost all of the time while
|
|
|
|
|
leaving default_breakpoint_* alone. */
|
|
|
|
|
if (default_breakpoint_valid
|
|
|
|
|
&& (!current_source_symtab
|
|
|
|
|
|| (arg && (*arg == '+' || *arg == '-'))))
|
|
|
|
|
sals = decode_line_1 (&arg, 1, default_breakpoint_symtab,
|
1993-07-26 13:26:55 +08:00
|
|
|
|
default_breakpoint_line, &canonical);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1993-07-26 13:26:55 +08:00
|
|
|
|
sals = decode_line_1 (&arg, 1, (struct symtab *)NULL, 0, &canonical);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
addr_end = arg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! sals.nelts)
|
|
|
|
|
return;
|
|
|
|
|
|
1993-07-26 13:26:55 +08:00
|
|
|
|
/* Make sure that all storage allocated in decode_line_1 gets freed in case
|
|
|
|
|
the following `for' loop errors out. */
|
|
|
|
|
old_chain = make_cleanup (free, sals.sals);
|
|
|
|
|
if (canonical != (char **)NULL)
|
|
|
|
|
{
|
|
|
|
|
make_cleanup (free, canonical);
|
|
|
|
|
canonical_strings_chain = make_cleanup (null_cleanup, 0);
|
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
|
|
|
|
if (canonical[i] != NULL)
|
|
|
|
|
make_cleanup (free, canonical[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1993-11-02 06:25:23 +08:00
|
|
|
|
thread = -1; /* No specific thread yet */
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Resolve all line numbers to PC's, and verify that conditions
|
|
|
|
|
can be parsed, before setting any breakpoints. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
char *tok, *end_tok;
|
|
|
|
|
int toklen;
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
resolve_sal_pc (&sals.sals[i]);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1993-11-02 06:25:23 +08:00
|
|
|
|
tok = arg;
|
|
|
|
|
|
|
|
|
|
while (tok && *tok)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
while (*tok == ' ' || *tok == '\t')
|
|
|
|
|
tok++;
|
|
|
|
|
|
|
|
|
|
end_tok = tok;
|
|
|
|
|
|
|
|
|
|
while (*end_tok != ' ' && *end_tok != '\t' && *end_tok != '\000')
|
|
|
|
|
end_tok++;
|
|
|
|
|
|
|
|
|
|
toklen = end_tok - tok;
|
|
|
|
|
|
|
|
|
|
if (toklen >= 1 && strncmp (tok, "if", toklen) == 0)
|
|
|
|
|
{
|
|
|
|
|
tok = cond_start = end_tok + 1;
|
|
|
|
|
cond = parse_exp_1 (&tok, block_for_pc (sals.sals[i].pc), 0);
|
|
|
|
|
cond_end = tok;
|
|
|
|
|
}
|
|
|
|
|
else if (toklen >= 1 && strncmp (tok, "thread", toklen) == 0)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
char *tmptok;
|
|
|
|
|
|
|
|
|
|
tok = end_tok + 1;
|
|
|
|
|
tmptok = tok;
|
|
|
|
|
thread = strtol (tok, &tok, 0);
|
|
|
|
|
if (tok == tmptok)
|
|
|
|
|
error ("Junk after thread keyword.");
|
|
|
|
|
if (!valid_thread_id (thread))
|
|
|
|
|
error ("Unknown thread %d\n", thread);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
error ("Junk at end of arguments.");
|
|
|
|
|
}
|
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (hardwareflag)
|
|
|
|
|
{
|
1994-07-24 06:01:44 +08:00
|
|
|
|
int i, target_resources_ok;
|
|
|
|
|
|
|
|
|
|
i = hw_breakpoint_used_count ();
|
|
|
|
|
target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
|
|
|
|
|
bp_hardware_breakpoint, i + sals.nelts, 0);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (target_resources_ok == 0)
|
|
|
|
|
error ("No hardware breakpoint support in the target.");
|
|
|
|
|
else if (target_resources_ok < 0)
|
|
|
|
|
error ("Hardware breakpoints used exceeds limit.");
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1993-07-26 13:26:55 +08:00
|
|
|
|
/* Remove the canonical strings from the cleanup, they are needed below. */
|
|
|
|
|
if (canonical != (char **)NULL)
|
|
|
|
|
discard_cleanups (canonical_strings_chain);
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Now set all the breakpoints. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
|
|
|
|
sal = sals.sals[i];
|
|
|
|
|
|
|
|
|
|
if (from_tty)
|
|
|
|
|
describe_other_breakpoints (sal.pc);
|
|
|
|
|
|
|
|
|
|
b = set_raw_breakpoint (sal);
|
|
|
|
|
set_breakpoint_count (breakpoint_count + 1);
|
|
|
|
|
b->number = breakpoint_count;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
b->type = hardwareflag ? bp_hardware_breakpoint : bp_breakpoint;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->cond = cond;
|
1993-11-02 06:25:23 +08:00
|
|
|
|
b->thread = thread;
|
1993-03-30 07:46:12 +08:00
|
|
|
|
|
1993-07-26 13:26:55 +08:00
|
|
|
|
/* If a canonical line spec is needed use that instead of the
|
|
|
|
|
command string. */
|
|
|
|
|
if (canonical != (char **)NULL && canonical[i] != NULL)
|
|
|
|
|
b->addr_string = canonical[i];
|
|
|
|
|
else if (addr_start)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->addr_string = savestring (addr_start, addr_end - addr_start);
|
|
|
|
|
if (cond_start)
|
|
|
|
|
b->cond_string = savestring (cond_start, cond_end - cond_start);
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->enable = enabled;
|
|
|
|
|
b->disposition = tempflag ? delete : donttouch;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
mention (b);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (sals.nelts > 1)
|
|
|
|
|
{
|
Fix many sins which will come up in 32 bit x 64 bit GDB, and
various miscellaneous things discovered in the process:
* printcmd.c, defs.h (print_address_numeric): New function.
* c-valprint.c (c_val_print), ch-valprint.c (chill_val_print)
breakpoint.c (describe_other_breakpoints, breakpoint_1, mention),
cp-valprint.c (cplus_print_value), infcmd.c (jump_command),
printcmd.c, stack.c, symfile.c, symmisc.c, valprint.c:
Use it.
* utils.c, defs.h (gdb_print_address): New function.
* expprint (dump_expression), gdbtypes.h: Use it.
* breakpoint.c (describe_other_breakpoints),
symmisc.c (dump_symtab, print_symbol):
Use filtered not unfiltered I/O.
(remove_breakpoints): Remove BREAKPOINT_DEBUG code. Might as well
just run gdb under a debugger for this (and it had problems with
printing addresses, how to print b->shadow, etc.).
* buildsym.c (make_blockvector), core.c (memory_error),
exec.c (print_section_info), maint.c (print_section_table),
mdebugread.c (parse_procedure), solib.c, source.c, symfile.c,
symmisc.c, symtab.c, valops.c, valprint.c, xcoffexec.c:
Add comments saying code is broken. Marked with "FIXME-32x64".
* dbxread.c (process_one_symbol), partial-stab.h (default),
remote-vx.c (vx_run_files_info):
Don't cast int being passed to local_hex_string.
* symmisc.c (print_symbol): Don't cast long being passed to %lx.
* symtab.h (general_symbol_info): Add comment about SYMBOL_VALUE
only being a long.
* symmisc.c (print_symbol): Print "offset" in message for LOC_ARG
and LOC_LOCAL.
* printcmd.c (print_address): Remove #if 0 code with ADDR_BITS_REMOVE.
* source.c: Include <sys/types.h> regardless of USG.
1994-01-27 08:36:05 +08:00
|
|
|
|
printf_filtered ("Multiple breakpoints were set.\n");
|
|
|
|
|
printf_filtered ("Use the \"delete\" command to delete unwanted breakpoints.\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1993-07-26 13:26:55 +08:00
|
|
|
|
do_cleanups (old_chain);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* Helper function for break_command_1 and disassemble_command. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
resolve_sal_pc (sal)
|
|
|
|
|
struct symtab_and_line *sal;
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
|
|
|
|
|
if (sal->pc == 0 && sal->symtab != 0)
|
|
|
|
|
{
|
|
|
|
|
pc = find_line_pc (sal->symtab, sal->line);
|
|
|
|
|
if (pc == 0)
|
|
|
|
|
error ("No line %d in file \"%s\".",
|
|
|
|
|
sal->line, sal->symtab->filename);
|
|
|
|
|
sal->pc = pc;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
#define BP_TEMPFLAG 1
|
|
|
|
|
#define BP_HARDWAREFLAG 2
|
1991-03-29 00:26:26 +08:00
|
|
|
|
void
|
|
|
|
|
break_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
break_command_1 (arg, 0, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
tbreak_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
break_command_1 (arg, BP_TEMPFLAG, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
hbreak_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
break_command_1 (arg, BP_HARDWAREFLAG, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
thbreak_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
break_command_1 (arg, (BP_TEMPFLAG | BP_HARDWAREFLAG), from_tty);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1994-06-11 09:09:25 +08:00
|
|
|
|
/* accessflag: 0: watch write, 1: watch read, 2: watch access(read or write)
|
|
|
|
|
*/
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
1994-06-11 09:09:25 +08:00
|
|
|
|
watch_command_1 (arg, accessflag, from_tty)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
char *arg;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int accessflag;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
struct symtab_and_line sal;
|
1991-04-19 10:32:08 +09:00
|
|
|
|
struct expression *exp;
|
|
|
|
|
struct block *exp_valid_block;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
struct value *val, *mark;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
FRAME frame, prev_frame;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
char *exp_start = NULL;
|
|
|
|
|
char *exp_end = NULL;
|
|
|
|
|
char *tok, *end_tok;
|
|
|
|
|
int toklen;
|
|
|
|
|
char *cond_start = NULL;
|
|
|
|
|
char *cond_end = NULL;
|
|
|
|
|
struct expression *cond = NULL;
|
|
|
|
|
int i, other_type_used, target_resources_ok;
|
|
|
|
|
enum bptype bp_type;
|
|
|
|
|
int mem_cnt = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
sal.pc = 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
sal.symtab = NULL;
|
|
|
|
|
sal.line = 0;
|
|
|
|
|
|
1991-04-19 10:32:08 +09:00
|
|
|
|
/* Parse arguments. */
|
|
|
|
|
innermost_block = NULL;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
exp_start = arg;
|
|
|
|
|
exp = parse_exp_1 (&arg, 0, 0);
|
|
|
|
|
exp_end = arg;
|
1991-04-19 10:32:08 +09:00
|
|
|
|
exp_valid_block = innermost_block;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
mark = value_mark ();
|
1991-04-19 10:32:08 +09:00
|
|
|
|
val = evaluate_expression (exp);
|
|
|
|
|
release_value (val);
|
1993-03-27 06:49:53 +08:00
|
|
|
|
if (VALUE_LAZY (val))
|
|
|
|
|
value_fetch_lazy (val);
|
1991-04-19 10:32:08 +09:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
tok = arg;
|
|
|
|
|
while (*tok == ' ' || *tok == '\t')
|
|
|
|
|
tok++;
|
|
|
|
|
end_tok = tok;
|
|
|
|
|
|
|
|
|
|
while (*end_tok != ' ' && *end_tok != '\t' && *end_tok != '\000')
|
|
|
|
|
end_tok++;
|
|
|
|
|
|
|
|
|
|
toklen = end_tok - tok;
|
|
|
|
|
if (toklen >= 1 && strncmp (tok, "if", toklen) == 0)
|
|
|
|
|
{
|
|
|
|
|
tok = cond_start = end_tok + 1;
|
|
|
|
|
cond = parse_exp_1 (&tok, 0, 0);
|
|
|
|
|
cond_end = tok;
|
|
|
|
|
}
|
|
|
|
|
if (*tok)
|
|
|
|
|
error("Junk at end of command.");
|
|
|
|
|
|
|
|
|
|
if (accessflag == 1) bp_type = bp_read_watchpoint;
|
|
|
|
|
else if (accessflag == 2) bp_type = bp_access_watchpoint;
|
|
|
|
|
else bp_type = bp_hardware_watchpoint;
|
|
|
|
|
|
|
|
|
|
mem_cnt = can_use_hardware_watchpoint (val);
|
|
|
|
|
if (mem_cnt == 0 && bp_type != bp_hardware_watchpoint)
|
|
|
|
|
error ("Expression cannot be implemented with read/access watchpoint.");
|
|
|
|
|
if (mem_cnt != 0) {
|
|
|
|
|
i = hw_watchpoint_used_count (bp_type, &other_type_used);
|
|
|
|
|
target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
|
|
|
|
|
bp_type, i + mem_cnt, other_type_used);
|
|
|
|
|
if (target_resources_ok == 0 && bp_type != bp_hardware_watchpoint)
|
|
|
|
|
error ("Target does not have this type of hardware watchpoint support.");
|
|
|
|
|
if (target_resources_ok < 0 && bp_type != bp_hardware_watchpoint)
|
|
|
|
|
error ("Target resources have been allocated for other types of watchpoints.");
|
|
|
|
|
}
|
|
|
|
|
|
1991-04-19 10:32:08 +09:00
|
|
|
|
/* Now set up the breakpoint. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b = set_raw_breakpoint (sal);
|
|
|
|
|
set_breakpoint_count (breakpoint_count + 1);
|
|
|
|
|
b->number = breakpoint_count;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->disposition = donttouch;
|
1991-04-19 10:32:08 +09:00
|
|
|
|
b->exp = exp;
|
|
|
|
|
b->exp_valid_block = exp_valid_block;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
b->exp_string = savestring (exp_start, exp_end - exp_start);
|
1991-04-19 10:32:08 +09:00
|
|
|
|
b->val = val;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
b->cond = cond;
|
|
|
|
|
if (cond_start)
|
|
|
|
|
b->cond_string = savestring (cond_start, cond_end - cond_start);
|
|
|
|
|
else
|
|
|
|
|
b->cond_string = 0;
|
|
|
|
|
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
frame = block_innermost_frame (exp_valid_block);
|
|
|
|
|
if (frame)
|
|
|
|
|
{
|
|
|
|
|
prev_frame = get_prev_frame (frame);
|
|
|
|
|
b->watchpoint_frame = FRAME_FP (frame);
|
|
|
|
|
}
|
|
|
|
|
else
|
1994-04-22 05:19:58 +08:00
|
|
|
|
b->watchpoint_frame = (CORE_ADDR)0;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (mem_cnt && target_resources_ok > 0)
|
|
|
|
|
b->type = bp_type;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
else
|
|
|
|
|
b->type = bp_watchpoint;
|
|
|
|
|
|
|
|
|
|
/* If the expression is "local", then set up a "watchpoint scope"
|
|
|
|
|
breakpoint at the point where we've left the scope of the watchpoint
|
|
|
|
|
expression. */
|
|
|
|
|
if (innermost_block)
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *scope_breakpoint;
|
|
|
|
|
struct symtab_and_line scope_sal;
|
|
|
|
|
|
|
|
|
|
if (prev_frame)
|
|
|
|
|
{
|
|
|
|
|
scope_sal.pc = get_frame_pc (prev_frame);
|
|
|
|
|
scope_sal.symtab = NULL;
|
|
|
|
|
scope_sal.line = 0;
|
|
|
|
|
|
|
|
|
|
scope_breakpoint = set_raw_breakpoint (scope_sal);
|
|
|
|
|
set_breakpoint_count (breakpoint_count + 1);
|
|
|
|
|
scope_breakpoint->number = breakpoint_count;
|
|
|
|
|
|
|
|
|
|
scope_breakpoint->type = bp_watchpoint_scope;
|
|
|
|
|
scope_breakpoint->enable = enabled;
|
|
|
|
|
|
|
|
|
|
/* Automatically delete the breakpoint when it hits. */
|
|
|
|
|
scope_breakpoint->disposition = delete;
|
|
|
|
|
|
|
|
|
|
/* Only break in the proper frame (help with recursion). */
|
|
|
|
|
scope_breakpoint->frame = prev_frame->frame;
|
|
|
|
|
|
|
|
|
|
/* Set the address at which we will stop. */
|
|
|
|
|
scope_breakpoint->address = get_frame_pc (prev_frame);
|
|
|
|
|
|
|
|
|
|
/* The scope breakpoint is related to the watchpoint. We
|
|
|
|
|
will need to act on them together. */
|
|
|
|
|
b->related_breakpoint = scope_breakpoint;
|
|
|
|
|
}
|
|
|
|
|
}
|
1994-06-11 09:09:25 +08:00
|
|
|
|
value_free_to_mark (mark);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
mention (b);
|
|
|
|
|
}
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
/* Return count of locations need to be watched and can be handled
|
|
|
|
|
in hardware. If the watchpoint can not be handled
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
in hardware return zero. */
|
|
|
|
|
|
|
|
|
|
static int
|
1994-06-11 09:09:25 +08:00
|
|
|
|
can_use_hardware_watchpoint (v)
|
|
|
|
|
struct value *v;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int found_memory_cnt = 0;
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
|
|
|
|
/* Make sure all the intermediate values are in memory. Also make sure
|
|
|
|
|
we found at least one memory expression. Guards against watch 0x12345,
|
|
|
|
|
which is meaningless, but could cause errors if one tries to insert a
|
|
|
|
|
hardware watchpoint for the constant expression. */
|
1994-06-11 09:09:25 +08:00
|
|
|
|
for ( ; v; v = v->next)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (v->lval == lval_memory)
|
|
|
|
|
{
|
|
|
|
|
if (TYPE_LENGTH (VALUE_TYPE (v)) <= REGISTER_SIZE)
|
|
|
|
|
found_memory_cnt++;
|
|
|
|
|
}
|
|
|
|
|
else if (v->lval != not_lval && v->modifiable == 0)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The expression itself looks suitable for using a hardware
|
|
|
|
|
watchpoint, but give the target machine a chance to reject it. */
|
1994-06-11 09:09:25 +08:00
|
|
|
|
return found_memory_cnt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void watch_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
watch_command_1 (arg, 0, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void rwatch_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
watch_command_1 (arg, 1, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void awatch_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
watch_command_1 (arg, 2, from_tty);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Helper routine for the until_command routine in infcmd.c. Here
|
|
|
|
|
* because it uses the mechanisms of breakpoints.
|
|
|
|
|
*/
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
void
|
|
|
|
|
until_break_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
FRAME prev_frame = get_prev_frame (selected_frame);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
struct breakpoint *breakpoint;
|
|
|
|
|
struct cleanup *old_chain;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
clear_proceed_status ();
|
|
|
|
|
|
|
|
|
|
/* Set a breakpoint where the user wants it and at return from
|
|
|
|
|
this function */
|
|
|
|
|
|
|
|
|
|
if (default_breakpoint_valid)
|
|
|
|
|
sals = decode_line_1 (&arg, 1, default_breakpoint_symtab,
|
1993-07-26 13:26:55 +08:00
|
|
|
|
default_breakpoint_line, (char ***)NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1993-07-26 13:26:55 +08:00
|
|
|
|
sals = decode_line_1 (&arg, 1, (struct symtab *)NULL, 0, (char ***)NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (sals.nelts != 1)
|
|
|
|
|
error ("Couldn't get information on specified line.");
|
|
|
|
|
|
|
|
|
|
sal = sals.sals[0];
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)sals.sals); /* malloc'd, so freed */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (*arg)
|
|
|
|
|
error ("Junk at end of arguments.");
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
resolve_sal_pc (&sal);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
breakpoint = set_momentary_breakpoint (sal, selected_frame, bp_until);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
old_chain = make_cleanup(delete_breakpoint, breakpoint);
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Keep within the current frame */
|
|
|
|
|
|
|
|
|
|
if (prev_frame)
|
|
|
|
|
{
|
|
|
|
|
struct frame_info *fi;
|
|
|
|
|
|
|
|
|
|
fi = get_frame_info (prev_frame);
|
|
|
|
|
sal = find_pc_line (fi->pc, 0);
|
|
|
|
|
sal.pc = fi->pc;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
breakpoint = set_momentary_breakpoint (sal, prev_frame, bp_until);
|
|
|
|
|
make_cleanup(delete_breakpoint, breakpoint);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1994-01-20 05:14:40 +08:00
|
|
|
|
proceed (-1, TARGET_SIGNAL_DEFAULT, 0);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
do_cleanups(old_chain);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if 0
|
|
|
|
|
/* These aren't used; I don't konw what they were for. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Set a breakpoint at the catch clause for NAME. */
|
|
|
|
|
static int
|
|
|
|
|
catch_breakpoint (name)
|
|
|
|
|
char *name;
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
disable_catch_breakpoint ()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
delete_catch_breakpoint ()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
enable_catch_breakpoint ()
|
|
|
|
|
{
|
|
|
|
|
}
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif /* 0 */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
struct sal_chain
|
|
|
|
|
{
|
|
|
|
|
struct sal_chain *next;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
};
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if 0
|
|
|
|
|
/* This isn't used; I don't know what it was for. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* For each catch clause identified in ARGS, run FUNCTION
|
|
|
|
|
with that clause as an argument. */
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
map_catch_names (args, function)
|
|
|
|
|
char *args;
|
|
|
|
|
int (*function)();
|
|
|
|
|
{
|
|
|
|
|
register char *p = args;
|
|
|
|
|
register char *p1;
|
|
|
|
|
struct symtabs_and_lines sals;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if 0
|
1991-03-29 00:26:26 +08:00
|
|
|
|
struct sal_chain *sal_chain = 0;
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
if (p == 0)
|
|
|
|
|
error_no_arg ("one or more catch names");
|
|
|
|
|
|
|
|
|
|
sals.nelts = 0;
|
|
|
|
|
sals.sals = NULL;
|
|
|
|
|
|
|
|
|
|
while (*p)
|
|
|
|
|
{
|
|
|
|
|
p1 = p;
|
|
|
|
|
/* Don't swallow conditional part. */
|
|
|
|
|
if (p1[0] == 'i' && p1[1] == 'f'
|
|
|
|
|
&& (p1[2] == ' ' || p1[2] == '\t'))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (isalpha (*p1))
|
|
|
|
|
{
|
|
|
|
|
p1++;
|
|
|
|
|
while (isalnum (*p1) || *p1 == '_' || *p1 == '$')
|
|
|
|
|
p1++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*p1 && *p1 != ' ' && *p1 != '\t')
|
|
|
|
|
error ("Arguments must be catch names.");
|
|
|
|
|
|
|
|
|
|
*p1 = 0;
|
|
|
|
|
#if 0
|
|
|
|
|
if (function (p))
|
|
|
|
|
{
|
|
|
|
|
struct sal_chain *next
|
|
|
|
|
= (struct sal_chain *)alloca (sizeof (struct sal_chain));
|
|
|
|
|
next->next = sal_chain;
|
|
|
|
|
next->sal = get_catch_sal (p);
|
|
|
|
|
sal_chain = next;
|
|
|
|
|
goto win;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
1993-11-02 06:25:23 +08:00
|
|
|
|
printf_unfiltered ("No catch clause for exception %s.\n", p);
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if 0
|
1991-03-29 00:26:26 +08:00
|
|
|
|
win:
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
p = p1;
|
|
|
|
|
while (*p == ' ' || *p == '\t') p++;
|
|
|
|
|
}
|
|
|
|
|
}
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif /* 0 */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* This shares a lot of code with `print_frame_label_vars' from stack.c. */
|
|
|
|
|
|
|
|
|
|
static struct symtabs_and_lines
|
|
|
|
|
get_catch_sals (this_level_only)
|
|
|
|
|
int this_level_only;
|
|
|
|
|
{
|
|
|
|
|
register struct blockvector *bl;
|
1991-04-23 05:08:53 +09:00
|
|
|
|
register struct block *block;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int index, have_default = 0;
|
1991-04-23 05:08:53 +09:00
|
|
|
|
struct frame_info *fi;
|
|
|
|
|
CORE_ADDR pc;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct sal_chain *sal_chain = 0;
|
|
|
|
|
char *blocks_searched;
|
|
|
|
|
|
1991-04-23 05:08:53 +09:00
|
|
|
|
/* Not sure whether an error message is always the correct response,
|
|
|
|
|
but it's better than a core dump. */
|
|
|
|
|
if (selected_frame == NULL)
|
|
|
|
|
error ("No selected frame.");
|
|
|
|
|
block = get_frame_block (selected_frame);
|
|
|
|
|
fi = get_frame_info (selected_frame);
|
|
|
|
|
pc = fi->pc;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
sals.nelts = 0;
|
|
|
|
|
sals.sals = NULL;
|
|
|
|
|
|
|
|
|
|
if (block == 0)
|
|
|
|
|
error ("No symbol table info available.\n");
|
|
|
|
|
|
|
|
|
|
bl = blockvector_for_pc (BLOCK_END (block) - 4, &index);
|
|
|
|
|
blocks_searched = (char *) alloca (BLOCKVECTOR_NBLOCKS (bl) * sizeof (char));
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 11:22:08 +08:00
|
|
|
|
memset (blocks_searched, 0, BLOCKVECTOR_NBLOCKS (bl) * sizeof (char));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
while (block != 0)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR end = BLOCK_END (block) - 4;
|
|
|
|
|
int last_index;
|
|
|
|
|
|
|
|
|
|
if (bl != blockvector_for_pc (end, &index))
|
|
|
|
|
error ("blockvector blotch");
|
|
|
|
|
if (BLOCKVECTOR_BLOCK (bl, index) != block)
|
|
|
|
|
error ("blockvector botch");
|
|
|
|
|
last_index = BLOCKVECTOR_NBLOCKS (bl);
|
|
|
|
|
index += 1;
|
|
|
|
|
|
|
|
|
|
/* Don't print out blocks that have gone by. */
|
|
|
|
|
while (index < last_index
|
|
|
|
|
&& BLOCK_END (BLOCKVECTOR_BLOCK (bl, index)) < pc)
|
|
|
|
|
index++;
|
|
|
|
|
|
|
|
|
|
while (index < last_index
|
|
|
|
|
&& BLOCK_END (BLOCKVECTOR_BLOCK (bl, index)) < end)
|
|
|
|
|
{
|
|
|
|
|
if (blocks_searched[index] == 0)
|
|
|
|
|
{
|
|
|
|
|
struct block *b = BLOCKVECTOR_BLOCK (bl, index);
|
|
|
|
|
int nsyms;
|
|
|
|
|
register int i;
|
|
|
|
|
register struct symbol *sym;
|
|
|
|
|
|
|
|
|
|
nsyms = BLOCK_NSYMS (b);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < nsyms; i++)
|
|
|
|
|
{
|
|
|
|
|
sym = BLOCK_SYM (b, i);
|
1993-03-27 06:49:53 +08:00
|
|
|
|
if (STREQ (SYMBOL_NAME (sym), "default"))
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
if (have_default)
|
|
|
|
|
continue;
|
|
|
|
|
have_default = 1;
|
|
|
|
|
}
|
|
|
|
|
if (SYMBOL_CLASS (sym) == LOC_LABEL)
|
|
|
|
|
{
|
|
|
|
|
struct sal_chain *next = (struct sal_chain *)
|
|
|
|
|
alloca (sizeof (struct sal_chain));
|
|
|
|
|
next->next = sal_chain;
|
|
|
|
|
next->sal = find_pc_line (SYMBOL_VALUE_ADDRESS (sym), 0);
|
|
|
|
|
sal_chain = next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
blocks_searched[index] = 1;
|
|
|
|
|
}
|
|
|
|
|
index++;
|
|
|
|
|
}
|
|
|
|
|
if (have_default)
|
|
|
|
|
break;
|
|
|
|
|
if (sal_chain && this_level_only)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* After handling the function's top-level block, stop.
|
|
|
|
|
Don't continue to its superblock, the block of
|
|
|
|
|
per-file symbols. */
|
|
|
|
|
if (BLOCK_FUNCTION (block))
|
|
|
|
|
break;
|
|
|
|
|
block = BLOCK_SUPERBLOCK (block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (sal_chain)
|
|
|
|
|
{
|
|
|
|
|
struct sal_chain *tmp_chain;
|
|
|
|
|
|
|
|
|
|
/* Count the number of entries. */
|
|
|
|
|
for (index = 0, tmp_chain = sal_chain; tmp_chain;
|
|
|
|
|
tmp_chain = tmp_chain->next)
|
|
|
|
|
index++;
|
|
|
|
|
|
|
|
|
|
sals.nelts = index;
|
|
|
|
|
sals.sals = (struct symtab_and_line *)
|
|
|
|
|
xmalloc (index * sizeof (struct symtab_and_line));
|
|
|
|
|
for (index = 0; sal_chain; sal_chain = sal_chain->next, index++)
|
|
|
|
|
sals.sals[index] = sal_chain->sal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sals;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Commands to deal with catching exceptions. */
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
static void
|
1991-03-29 00:26:26 +08:00
|
|
|
|
catch_command_1 (arg, tempflag, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int tempflag;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
/* First, translate ARG into something we can deal with in terms
|
|
|
|
|
of breakpoints. */
|
|
|
|
|
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
register struct expression *cond = 0;
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
char *save_arg;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
sal.line = sal.pc = sal.end = 0;
|
|
|
|
|
sal.symtab = 0;
|
|
|
|
|
|
|
|
|
|
/* If no arg given, or if first arg is 'if ', all active catch clauses
|
|
|
|
|
are breakpointed. */
|
|
|
|
|
|
|
|
|
|
if (!arg || (arg[0] == 'i' && arg[1] == 'f'
|
|
|
|
|
&& (arg[2] == ' ' || arg[2] == '\t')))
|
|
|
|
|
{
|
|
|
|
|
/* Grab all active catch clauses. */
|
|
|
|
|
sals = get_catch_sals (0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Grab selected catch clauses. */
|
1993-07-11 12:52:50 +08:00
|
|
|
|
error ("catch NAME not implemented");
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if 0
|
|
|
|
|
/* This isn't used; I don't know what it was for. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
sals = map_catch_names (arg, catch_breakpoint);
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! sals.nelts)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
save_arg = arg;
|
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
resolve_sal_pc (&sals.sals[i]);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
while (arg && *arg)
|
|
|
|
|
{
|
|
|
|
|
if (arg[0] == 'i' && arg[1] == 'f'
|
|
|
|
|
&& (arg[2] == ' ' || arg[2] == '\t'))
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
cond = parse_exp_1 ((arg += 2, &arg),
|
|
|
|
|
block_for_pc (sals.sals[i].pc), 0);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
error ("Junk at end of arguments.");
|
|
|
|
|
}
|
|
|
|
|
arg = save_arg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
|
|
|
|
sal = sals.sals[i];
|
|
|
|
|
|
|
|
|
|
if (from_tty)
|
|
|
|
|
describe_other_breakpoints (sal.pc);
|
|
|
|
|
|
|
|
|
|
b = set_raw_breakpoint (sal);
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
set_breakpoint_count (breakpoint_count + 1);
|
|
|
|
|
b->number = breakpoint_count;
|
|
|
|
|
b->type = bp_breakpoint;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b->cond = cond;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->enable = enabled;
|
|
|
|
|
b->disposition = tempflag ? delete : donttouch;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1993-07-26 13:26:55 +08:00
|
|
|
|
mention (b);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (sals.nelts > 1)
|
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
printf_unfiltered ("Multiple breakpoints were set.\n");
|
|
|
|
|
printf_unfiltered ("Use the \"delete\" command to delete unwanted breakpoints.\n");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)sals.sals);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#if 0
|
|
|
|
|
/* These aren't used; I don't know what they were for. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Disable breakpoints on all catch clauses described in ARGS. */
|
|
|
|
|
static void
|
|
|
|
|
disable_catch (args)
|
|
|
|
|
char *args;
|
|
|
|
|
{
|
|
|
|
|
/* Map the disable command to catch clauses described in ARGS. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Enable breakpoints on all catch clauses described in ARGS. */
|
|
|
|
|
static void
|
|
|
|
|
enable_catch (args)
|
|
|
|
|
char *args;
|
|
|
|
|
{
|
|
|
|
|
/* Map the disable command to catch clauses described in ARGS. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete breakpoints on all catch clauses in the active scope. */
|
|
|
|
|
static void
|
|
|
|
|
delete_catch (args)
|
|
|
|
|
char *args;
|
|
|
|
|
{
|
|
|
|
|
/* Map the delete command to catch clauses described in ARGS. */
|
|
|
|
|
}
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
#endif /* 0 */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
catch_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
catch_command_1 (arg, 0, from_tty);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
clear_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b, *b1;
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
register struct breakpoint *found;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (arg)
|
|
|
|
|
{
|
|
|
|
|
sals = decode_line_spec (arg, 1);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
sals.sals = (struct symtab_and_line *) xmalloc (sizeof (struct symtab_and_line));
|
|
|
|
|
sal.line = default_breakpoint_line;
|
|
|
|
|
sal.symtab = default_breakpoint_symtab;
|
|
|
|
|
sal.pc = 0;
|
|
|
|
|
if (sal.symtab == 0)
|
|
|
|
|
error ("No source file specified.");
|
|
|
|
|
|
|
|
|
|
sals.sals[0] = sal;
|
|
|
|
|
sals.nelts = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
|
|
|
|
/* If exact pc given, clear bpts at that pc.
|
|
|
|
|
But if sal.pc is zero, clear all bpts on specified line. */
|
|
|
|
|
sal = sals.sals[i];
|
|
|
|
|
found = (struct breakpoint *) 0;
|
|
|
|
|
while (breakpoint_chain
|
1993-07-26 13:26:55 +08:00
|
|
|
|
&& (sal.pc
|
|
|
|
|
? breakpoint_chain->address == sal.pc
|
|
|
|
|
: (breakpoint_chain->source_file != NULL
|
|
|
|
|
&& sal.symtab != NULL
|
|
|
|
|
&& STREQ (breakpoint_chain->source_file,
|
|
|
|
|
sal.symtab->filename)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
&& breakpoint_chain->line_number == sal.line)))
|
|
|
|
|
{
|
|
|
|
|
b1 = breakpoint_chain;
|
|
|
|
|
breakpoint_chain = b1->next;
|
|
|
|
|
b1->next = found;
|
|
|
|
|
found = b1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
while (b->next
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
&& b->next->type != bp_watchpoint
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
&& b->next->type != bp_hardware_watchpoint
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& b->next->type != bp_read_watchpoint
|
|
|
|
|
&& b->next->type != bp_access_watchpoint
|
1993-07-26 13:26:55 +08:00
|
|
|
|
&& (sal.pc
|
|
|
|
|
? b->next->address == sal.pc
|
|
|
|
|
: (b->next->source_file != NULL
|
|
|
|
|
&& sal.symtab != NULL
|
|
|
|
|
&& STREQ (b->next->source_file, sal.symtab->filename)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
&& b->next->line_number == sal.line)))
|
|
|
|
|
{
|
|
|
|
|
b1 = b->next;
|
|
|
|
|
b->next = b1->next;
|
|
|
|
|
b1->next = found;
|
|
|
|
|
found = b1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (found == 0)
|
|
|
|
|
{
|
|
|
|
|
if (arg)
|
|
|
|
|
error ("No breakpoint at %s.", arg);
|
|
|
|
|
else
|
|
|
|
|
error ("No breakpoint at this line.");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (found->next) from_tty = 1; /* Always report if deleted more than one */
|
1993-11-02 06:25:23 +08:00
|
|
|
|
if (from_tty) printf_unfiltered ("Deleted breakpoint%s ", found->next ? "s" : "");
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
while (found)
|
|
|
|
|
{
|
1993-11-02 06:25:23 +08:00
|
|
|
|
if (from_tty) printf_unfiltered ("%d ", found->number);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
b1 = found->next;
|
|
|
|
|
delete_breakpoint (found);
|
|
|
|
|
found = b1;
|
|
|
|
|
}
|
1993-11-02 06:25:23 +08:00
|
|
|
|
if (from_tty) putchar_unfiltered ('\n');
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)sals.sals);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete breakpoint in BS if they are `delete' breakpoints.
|
|
|
|
|
This is called after any breakpoint is hit, or after errors. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
breakpoint_auto_delete (bs)
|
|
|
|
|
bpstat bs;
|
|
|
|
|
{
|
|
|
|
|
for (; bs; bs = bs->next)
|
Changes to support alpha OSF/1 in native mode.
* alpha-nat.c, alpha-tdep.c, config/alpha/alpha-osf1.mt,
config/alpha/nm-alpha.h, config/alpha/tm-alpha.h, osfsolib.c:
New files.
* Makefile.in: Add new files and dependencies.
* configure.in: Add alpha target.
* config/alpha/alpha-osf1.mh (NATDEPFILES): Add osfsolib.o
* config/alpha/alpha-osf1.mh (MH_CFLAGS): Remove, we can handle
shared libraries now.
* config/alpha/xm-alpha.h: Cleanup, get MAKEVA_* defines right.
* defs.h (CORE_ADDR): Make its type overridable via CORE_ADDR_TYPE,
provide `unsigned int' default.
* breakpoint.c (breakpoint_auto_delete): Delete only if we really
stopped for the breakpoint.
* stabsread.c, stabsread.h (define_symbol): Change valu parameter
to a CORE_ADDR.
* stabsread.c (read_range_type): Handle the case where the lower
bound overflows and the upper doesn't and the range is legal.
* infrun.c (resume): Do not step a breakpoint instruction if
CANNOT_STEP_BREAKPOINT is defined.
* inferior.h (CALL_DUMMY_LOCATION): New variant AT_ENTRY_POINT.
Now that we have the bp_call_dummy breakpoint the call dummy code
is no longer needed. PUSH_DUMMY_FRAME, PUSH_ARGUMENTS and
FIX_CALL_DUMMY can be used to set up everything for the dummy.
The breakpoint for the dummy is set at the entry point and thats it.
* blockframe.c (inside_entry_file, inside_entry_func): Do not stop
backtraces if pc is in the call dummy at the entry point.
* infcmd.c (run_stack_dummy): Handle AT_ENTRY_POINT case. Use
the expected breakpoint pc when setting up the frame for
set_momentary_breakpoint.
* symfile.c (entry_point_address): New function for AT_ENTRY_POINT
support.
* valops.c (call_function_by_hand): Handle AT_ENTRY_POINT case.
1993-10-06 03:44:57 +08:00
|
|
|
|
if (bs->breakpoint_at && bs->breakpoint_at->disposition == delete
|
|
|
|
|
&& bs->stop)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
delete_breakpoint (bs->breakpoint_at);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Delete a breakpoint and clean up all traces of it in the data structures. */
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
void
|
1991-03-29 00:26:26 +08:00
|
|
|
|
delete_breakpoint (bpt)
|
|
|
|
|
struct breakpoint *bpt;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
register bpstat bs;
|
|
|
|
|
|
1994-07-29 06:07:02 +08:00
|
|
|
|
if (delete_breakpoint_hook)
|
|
|
|
|
delete_breakpoint_hook (bpt);
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (bpt->inserted)
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
remove_breakpoint (bpt);
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (breakpoint_chain == bpt)
|
|
|
|
|
breakpoint_chain = bpt->next;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->next == bpt)
|
|
|
|
|
{
|
|
|
|
|
b->next = bpt->next;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_duplicates (bpt->address);
|
1993-07-11 12:52:50 +08:00
|
|
|
|
/* If this breakpoint was inserted, and there is another breakpoint
|
|
|
|
|
at the same address, we need to insert the other breakpoint. */
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (bpt->inserted
|
1994-06-11 09:09:25 +08:00
|
|
|
|
&& bpt->type != bp_hardware_watchpoint
|
|
|
|
|
&& bpt->type != bp_read_watchpoint
|
|
|
|
|
&& bpt->type != bp_access_watchpoint)
|
1993-07-11 12:52:50 +08:00
|
|
|
|
{
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
1993-10-07 02:01:06 +08:00
|
|
|
|
if (b->address == bpt->address
|
|
|
|
|
&& !b->duplicate
|
|
|
|
|
&& b->enable != disabled)
|
1993-07-11 12:52:50 +08:00
|
|
|
|
{
|
|
|
|
|
int val;
|
|
|
|
|
val = target_insert_breakpoint (b->address, b->shadow_contents);
|
|
|
|
|
if (val != 0)
|
|
|
|
|
{
|
1993-12-31 04:34:06 +08:00
|
|
|
|
target_terminal_ours_for_output ();
|
1993-11-02 06:25:23 +08:00
|
|
|
|
fprintf_unfiltered (gdb_stderr, "Cannot insert breakpoint %d:\n", b->number);
|
1993-07-11 12:52:50 +08:00
|
|
|
|
memory_error (val, b->address); /* which bombs us out */
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
b->inserted = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
free_command_lines (&bpt->commands);
|
|
|
|
|
if (bpt->cond)
|
1993-07-26 13:26:55 +08:00
|
|
|
|
free (bpt->cond);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (bpt->cond_string != NULL)
|
1993-07-26 13:26:55 +08:00
|
|
|
|
free (bpt->cond_string);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (bpt->addr_string != NULL)
|
1993-07-26 13:26:55 +08:00
|
|
|
|
free (bpt->addr_string);
|
1993-03-30 05:49:39 +08:00
|
|
|
|
if (bpt->exp_string != NULL)
|
1993-07-26 13:26:55 +08:00
|
|
|
|
free (bpt->exp_string);
|
|
|
|
|
if (bpt->source_file != NULL)
|
|
|
|
|
free (bpt->source_file);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
/* Be sure no bpstat's are pointing at it after it's been freed. */
|
1993-12-31 04:34:06 +08:00
|
|
|
|
/* FIXME, how can we find all bpstat's?
|
|
|
|
|
We just check stop_bpstat for now. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
for (bs = stop_bpstat; bs; bs = bs->next)
|
|
|
|
|
if (bs->breakpoint_at == bpt)
|
|
|
|
|
bs->breakpoint_at = NULL;
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)bpt);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
delete_command (arg, from_tty)
|
|
|
|
|
char *arg;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
if (arg == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Ask user only if there are some breakpoints to delete. */
|
|
|
|
|
if (!from_tty
|
|
|
|
|
|| (breakpoint_chain && query ("Delete all breakpoints? ", 0, 0)))
|
|
|
|
|
{
|
|
|
|
|
/* No arg; clear all breakpoints. */
|
|
|
|
|
while (breakpoint_chain)
|
|
|
|
|
delete_breakpoint (breakpoint_chain);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
map_breakpoint_numbers (arg, delete_breakpoint);
|
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* Reset a breakpoint given it's struct breakpoint * BINT.
|
|
|
|
|
The value we return ends up being the return value from catch_errors.
|
|
|
|
|
Unused in this case. */
|
|
|
|
|
|
|
|
|
|
static int
|
1991-03-29 00:26:26 +08:00
|
|
|
|
breakpoint_re_set_one (bint)
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
char *bint;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b = (struct breakpoint *)bint; /* get past catch_errs */
|
1994-06-11 09:09:25 +08:00
|
|
|
|
struct value *mark;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
int i;
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
char *s;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
enum enable save_enable;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
switch (b->type)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1992-02-28 01:45:02 +08:00
|
|
|
|
case bp_breakpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_hardware_breakpoint:
|
1992-02-28 01:45:02 +08:00
|
|
|
|
if (b->addr_string == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Anything without a string can't be re-set. */
|
|
|
|
|
delete_breakpoint (b);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
/* In case we have a problem, disable this breakpoint. We'll restore
|
|
|
|
|
its status if we succeed. */
|
|
|
|
|
save_enable = b->enable;
|
|
|
|
|
b->enable = disabled;
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
s = b->addr_string;
|
1993-07-26 13:26:55 +08:00
|
|
|
|
sals = decode_line_1 (&s, 1, (struct symtab *)NULL, 0, (char ***)NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
for (i = 0; i < sals.nelts; i++)
|
|
|
|
|
{
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
resolve_sal_pc (&sals.sals[i]);
|
1993-09-09 05:30:33 +08:00
|
|
|
|
|
|
|
|
|
/* Reparse conditions, they might contain references to the
|
|
|
|
|
old symtab. */
|
|
|
|
|
if (b->cond_string != NULL)
|
|
|
|
|
{
|
|
|
|
|
s = b->cond_string;
|
|
|
|
|
if (b->cond)
|
|
|
|
|
free ((PTR)b->cond);
|
|
|
|
|
b->cond = parse_exp_1 (&s, block_for_pc (sals.sals[i].pc), 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We need to re-set the breakpoint if the address changes...*/
|
1993-07-26 13:26:55 +08:00
|
|
|
|
if (b->address != sals.sals[i].pc
|
1993-09-09 05:30:33 +08:00
|
|
|
|
/* ...or new and old breakpoints both have source files, and
|
|
|
|
|
the source file name or the line number changes... */
|
1993-07-26 13:26:55 +08:00
|
|
|
|
|| (b->source_file != NULL
|
|
|
|
|
&& sals.sals[i].symtab != NULL
|
|
|
|
|
&& (!STREQ (b->source_file, sals.sals[i].symtab->filename)
|
|
|
|
|
|| b->line_number != sals.sals[i].line)
|
1993-09-09 05:30:33 +08:00
|
|
|
|
)
|
|
|
|
|
/* ...or we switch between having a source file and not having
|
|
|
|
|
one. */
|
|
|
|
|
|| ((b->source_file == NULL) != (sals.sals[i].symtab == NULL))
|
|
|
|
|
)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-07-26 13:26:55 +08:00
|
|
|
|
if (b->source_file != NULL)
|
|
|
|
|
free (b->source_file);
|
|
|
|
|
if (sals.sals[i].symtab == NULL)
|
|
|
|
|
b->source_file = NULL;
|
|
|
|
|
else
|
|
|
|
|
b->source_file =
|
|
|
|
|
savestring (sals.sals[i].symtab->filename,
|
|
|
|
|
strlen (sals.sals[i].symtab->filename));
|
1992-02-28 12:10:02 +08:00
|
|
|
|
b->line_number = sals.sals[i].line;
|
|
|
|
|
b->address = sals.sals[i].pc;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-02-28 12:10:02 +08:00
|
|
|
|
check_duplicates (b->address);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-02-28 12:10:02 +08:00
|
|
|
|
mention (b);
|
1994-04-21 03:23:30 +08:00
|
|
|
|
|
|
|
|
|
/* Might be better to do this just once per breakpoint_re_set,
|
|
|
|
|
rather than once for every breakpoint. */
|
|
|
|
|
breakpoints_changed ();
|
1992-02-28 12:10:02 +08:00
|
|
|
|
}
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
b->enable = save_enable; /* Restore it, this worked. */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1992-03-30 07:18:31 +08:00
|
|
|
|
free ((PTR)sals.sals);
|
1992-02-28 01:45:02 +08:00
|
|
|
|
break;
|
1993-03-27 06:49:53 +08:00
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
case bp_watchpoint:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_hardware_watchpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_read_watchpoint:
|
|
|
|
|
case bp_access_watchpoint:
|
1993-03-30 05:49:39 +08:00
|
|
|
|
innermost_block = NULL;
|
1993-03-30 07:46:12 +08:00
|
|
|
|
/* The issue arises of what context to evaluate this in. The same
|
|
|
|
|
one as when it was set, but what does that mean when symbols have
|
|
|
|
|
been re-read? We could save the filename and functionname, but
|
|
|
|
|
if the context is more local than that, the best we could do would
|
|
|
|
|
be something like how many levels deep and which index at that
|
|
|
|
|
particular level, but that's going to be less stable than filenames
|
|
|
|
|
or functionnames. */
|
|
|
|
|
/* So for now, just use a global context. */
|
1993-03-30 05:49:39 +08:00
|
|
|
|
b->exp = parse_expression (b->exp_string);
|
|
|
|
|
b->exp_valid_block = innermost_block;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
mark = value_mark ();
|
1993-03-30 05:49:39 +08:00
|
|
|
|
b->val = evaluate_expression (b->exp);
|
|
|
|
|
release_value (b->val);
|
|
|
|
|
if (VALUE_LAZY (b->val))
|
|
|
|
|
value_fetch_lazy (b->val);
|
|
|
|
|
|
1993-03-27 06:49:53 +08:00
|
|
|
|
if (b->cond_string != NULL)
|
|
|
|
|
{
|
|
|
|
|
s = b->cond_string;
|
|
|
|
|
b->cond = parse_exp_1 (&s, (struct block *)0, 0);
|
|
|
|
|
}
|
1993-04-09 11:17:45 +08:00
|
|
|
|
if (b->enable == enabled)
|
|
|
|
|
mention (b);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
value_free_to_mark (mark);
|
1992-02-28 01:45:02 +08:00
|
|
|
|
break;
|
1993-03-27 06:49:53 +08:00
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
default:
|
|
|
|
|
printf_filtered ("Deleting unknown breakpoint type %d\n", b->type);
|
1993-03-27 06:49:53 +08:00
|
|
|
|
/* fall through */
|
1992-02-28 01:45:02 +08:00
|
|
|
|
case bp_until:
|
|
|
|
|
case bp_finish:
|
|
|
|
|
case bp_longjmp:
|
|
|
|
|
case bp_longjmp_resume:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_watchpoint_scope:
|
1993-10-07 19:16:35 +08:00
|
|
|
|
case bp_call_dummy:
|
1992-02-28 01:45:02 +08:00
|
|
|
|
delete_breakpoint (b);
|
|
|
|
|
break;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1992-02-28 01:45:02 +08:00
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
return 0;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Re-set all breakpoints after symbols have been re-loaded. */
|
|
|
|
|
void
|
|
|
|
|
breakpoint_re_set ()
|
|
|
|
|
{
|
1992-02-28 00:28:59 +08:00
|
|
|
|
struct breakpoint *b, *temp;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
static char message1[] = "Error in re-setting breakpoint %d:\n";
|
|
|
|
|
char message[sizeof (message1) + 30 /* slop */];
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1992-02-28 00:28:59 +08:00
|
|
|
|
ALL_BREAKPOINTS_SAFE (b, temp)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-03-27 06:49:53 +08:00
|
|
|
|
sprintf (message, message1, b->number); /* Format possible error msg */
|
1993-07-11 12:52:50 +08:00
|
|
|
|
catch_errors (breakpoint_re_set_one, (char *) b, message,
|
|
|
|
|
RETURN_MASK_ALL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
1992-02-28 01:45:02 +08:00
|
|
|
|
create_longjmp_breakpoint("longjmp");
|
|
|
|
|
create_longjmp_breakpoint("_longjmp");
|
|
|
|
|
create_longjmp_breakpoint("siglongjmp");
|
|
|
|
|
create_longjmp_breakpoint(NULL);
|
|
|
|
|
|
1992-03-30 06:33:35 +08:00
|
|
|
|
#if 0
|
|
|
|
|
/* Took this out (temporaliy at least), since it produces an extra
|
|
|
|
|
blank line at startup. This messes up the gdbtests. -PB */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
/* Blank line to finish off all those mention() messages we just printed. */
|
|
|
|
|
printf_filtered ("\n");
|
1992-03-30 06:33:35 +08:00
|
|
|
|
#endif
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set ignore-count of breakpoint number BPTNUM to COUNT.
|
|
|
|
|
If from_tty is nonzero, it prints a message to that effect,
|
|
|
|
|
which ends with a period (no newline). */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
set_ignore_count (bptnum, count, from_tty)
|
|
|
|
|
int bptnum, count, from_tty;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
if (count < 0)
|
|
|
|
|
count = 0;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->number == bptnum)
|
|
|
|
|
{
|
|
|
|
|
b->ignore_count = count;
|
|
|
|
|
if (!from_tty)
|
|
|
|
|
return;
|
|
|
|
|
else if (count == 0)
|
1992-06-18 05:53:28 +08:00
|
|
|
|
printf_filtered ("Will stop next time breakpoint %d is reached.",
|
|
|
|
|
bptnum);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else if (count == 1)
|
1992-06-18 05:53:28 +08:00
|
|
|
|
printf_filtered ("Will ignore next crossing of breakpoint %d.",
|
|
|
|
|
bptnum);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1992-06-18 05:53:28 +08:00
|
|
|
|
printf_filtered ("Will ignore next %d crossings of breakpoint %d.",
|
1991-03-29 00:26:26 +08:00
|
|
|
|
count, bptnum);
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
error ("No breakpoint number %d.", bptnum);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clear the ignore counts of all breakpoints. */
|
|
|
|
|
void
|
|
|
|
|
breakpoint_clear_ignore_counts ()
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
b->ignore_count = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Command to set ignore-count of breakpoint N to COUNT. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
ignore_command (args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
char *p = args;
|
|
|
|
|
register int num;
|
|
|
|
|
|
|
|
|
|
if (p == 0)
|
|
|
|
|
error_no_arg ("a breakpoint number");
|
|
|
|
|
|
|
|
|
|
num = get_number (&p);
|
|
|
|
|
|
|
|
|
|
if (*p == 0)
|
|
|
|
|
error ("Second argument (specified ignore-count) is missing.");
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
set_ignore_count (num,
|
|
|
|
|
longest_to_int (value_as_long (parse_and_eval (p))),
|
|
|
|
|
from_tty);
|
1992-06-18 05:53:28 +08:00
|
|
|
|
printf_filtered ("\n");
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Call FUNCTION on each of the breakpoints
|
|
|
|
|
whose numbers are given in ARGS. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
map_breakpoint_numbers (args, function)
|
|
|
|
|
char *args;
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
void (*function) PARAMS ((struct breakpoint *));
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
|
|
|
|
register char *p = args;
|
|
|
|
|
char *p1;
|
|
|
|
|
register int num;
|
|
|
|
|
register struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
if (p == 0)
|
|
|
|
|
error_no_arg ("one or more breakpoint numbers");
|
|
|
|
|
|
|
|
|
|
while (*p)
|
|
|
|
|
{
|
|
|
|
|
p1 = p;
|
|
|
|
|
|
|
|
|
|
num = get_number (&p1);
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
if (b->number == num)
|
|
|
|
|
{
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
struct breakpoint *related_breakpoint = b->related_breakpoint;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
function (b);
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
if (related_breakpoint)
|
|
|
|
|
function (related_breakpoint);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
goto win;
|
|
|
|
|
}
|
1993-11-02 06:25:23 +08:00
|
|
|
|
printf_unfiltered ("No breakpoint number %d.\n", num);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
win:
|
|
|
|
|
p = p1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_breakpoint (bpt)
|
|
|
|
|
struct breakpoint *bpt;
|
|
|
|
|
{
|
1993-09-09 05:30:33 +08:00
|
|
|
|
FRAME save_selected_frame = NULL;
|
1993-04-15 09:45:35 +08:00
|
|
|
|
int save_selected_frame_level = -1;
|
1994-06-11 09:09:25 +08:00
|
|
|
|
int target_resources_ok, other_type_used;
|
|
|
|
|
struct value *mark;
|
1993-04-15 09:45:35 +08:00
|
|
|
|
|
1994-07-29 06:07:02 +08:00
|
|
|
|
if (enable_breakpoint_hook)
|
|
|
|
|
enable_breakpoint_hook (bpt);
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (bpt->type == bp_hardware_breakpoint)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
i = hw_breakpoint_used_count();
|
|
|
|
|
target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
|
|
|
|
|
bp_hardware_breakpoint, i+1, 0);
|
|
|
|
|
if (target_resources_ok == 0)
|
|
|
|
|
error ("No hardware breakpoint support in the target.");
|
|
|
|
|
else if (target_resources_ok < 0)
|
|
|
|
|
error ("Hardware breakpoints used exceeds limit.");
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
bpt->enable = enabled;
|
|
|
|
|
check_duplicates (bpt->address);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
|
|
|
|
|
if (bpt->type == bp_watchpoint || bpt->type == bp_hardware_watchpoint ||
|
|
|
|
|
bpt->type == bp_read_watchpoint || bpt->type == bp_access_watchpoint)
|
1991-03-29 00:26:26 +08:00
|
|
|
|
{
|
1993-04-15 09:45:35 +08:00
|
|
|
|
if (bpt->exp_valid_block != NULL)
|
1991-04-19 10:32:08 +09:00
|
|
|
|
{
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
FRAME fr = find_frame_addr_in_frame_chain (bpt->watchpoint_frame);
|
1993-04-15 09:45:35 +08:00
|
|
|
|
if (fr == NULL)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered ("\
|
1991-04-19 10:32:08 +09:00
|
|
|
|
Cannot enable watchpoint %d because the block in which its expression\n\
|
|
|
|
|
is valid is not currently in scope.\n", bpt->number);
|
1993-04-15 09:45:35 +08:00
|
|
|
|
bpt->enable = disabled;
|
|
|
|
|
return;
|
|
|
|
|
}
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
|
1993-04-15 09:45:35 +08:00
|
|
|
|
save_selected_frame = selected_frame;
|
|
|
|
|
save_selected_frame_level = selected_frame_level;
|
|
|
|
|
select_frame (fr, -1);
|
1991-04-19 10:32:08 +09:00
|
|
|
|
}
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
value_free (bpt->val);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
mark = value_mark ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
bpt->val = evaluate_expression (bpt->exp);
|
|
|
|
|
release_value (bpt->val);
|
1993-03-27 06:49:53 +08:00
|
|
|
|
if (VALUE_LAZY (bpt->val))
|
|
|
|
|
value_fetch_lazy (bpt->val);
|
1993-04-15 09:45:35 +08:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
if (bpt->type == bp_hardware_watchpoint ||
|
|
|
|
|
bpt->type == bp_read_watchpoint ||
|
|
|
|
|
bpt->type == bp_access_watchpoint)
|
|
|
|
|
{
|
|
|
|
|
int i = hw_watchpoint_used_count (bpt->type, &other_type_used);
|
1994-07-24 06:01:44 +08:00
|
|
|
|
int mem_cnt = can_use_hardware_watchpoint (bpt->val);
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
|
1994-07-24 06:01:44 +08:00
|
|
|
|
bpt->type, i + mem_cnt, other_type_used);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
/* we can consider of type is bp_hardware_watchpoint, convert to
|
|
|
|
|
bp_watchpoint in the following condition */
|
|
|
|
|
if (target_resources_ok < 0)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered("\
|
|
|
|
|
Cannot enable watchpoint %d because target watch resources\n\
|
|
|
|
|
have been allocated for other watchpoints.\n", bpt->number);
|
|
|
|
|
bpt->enable = disabled;
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1993-04-15 09:45:35 +08:00
|
|
|
|
if (save_selected_frame_level >= 0)
|
|
|
|
|
select_frame (save_selected_frame, save_selected_frame_level);
|
1994-06-11 09:09:25 +08:00
|
|
|
|
value_free_to_mark (mark);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
enable_command (args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *bpt;
|
|
|
|
|
if (args == 0)
|
|
|
|
|
ALL_BREAKPOINTS (bpt)
|
1992-06-18 05:53:28 +08:00
|
|
|
|
switch (bpt->type)
|
|
|
|
|
{
|
|
|
|
|
case bp_breakpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_hardware_breakpoint:
|
1992-06-18 05:53:28 +08:00
|
|
|
|
case bp_watchpoint:
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
case bp_hardware_watchpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_read_watchpoint:
|
|
|
|
|
case bp_access_watchpoint:
|
1992-06-18 05:53:28 +08:00
|
|
|
|
enable_breakpoint (bpt);
|
|
|
|
|
default:
|
|
|
|
|
continue;
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
map_breakpoint_numbers (args, enable_breakpoint);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
disable_breakpoint (bpt)
|
|
|
|
|
struct breakpoint *bpt;
|
|
|
|
|
{
|
* breakpoint.h (enum bptype): Add bp_hardware_watchpoint and
bp_watchpoint_scope breakpoints.
(struct breakpoint): Add val_chain and related_breakpoint fields
for use by watchpoints.
* breakpoint.c (within_scope): Delete. No longer used.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Provide default definition.
(target_{remove,insert}_watchpoint): Likewise.
(can_use_hardware_watchpoint): New function.
(remove_breakpoint): New function to remove a single breakpoint
or hardware watchpoint.
(insert_breakpoints): Handle insertion of hardware watchpoints.
Store a copy of the value chain derived from the watchpoint
expression.
(remove_breakpoints): Simplify by using remove_breakpoint.
(delete_breakpoint): Likewise.
(watchpoint_check): Delete the watchpoint and watchpoint scope
breakpoints when the watchpoint goes out of scope. Save & restore
the current frame after checking watchpoints.
(breakpoint_init_inferior): Likewise (restarting the program
makes all local watchpoints go out of scope).
(bpstat_stop_status): Handle hardware watchpoints much like normal
watchpoints. Delete the watchpoint and watchpoint scope breakpoint
when the watchpoint goes out of scope. Remove and reinsert all
breakpoints before returning if we stopped when a hardware watchpoint
fired.
(watch_command): Use a hardware watchpoint when possible. If
watching a local expression, build a scope breakpoint too.
(map_breakpoint_numbers): Also call given function for any
related breakpoints.
(disable_breakpoint): Never disable a scope breakpoint.
(enable_breakpoint): Handle hardware breakpoints much like normal
breakpoints, but recompute the watchpoint_scope breakpoint's
frame and address (if we have an associated scope breakpoint).
(read_memory_nobpt): Handle hardware watchpoints like normal
watchpoints. When necessary handle watchpoint_scope breakpoints.
(print_it_normal, bpstat_what, breakpoint_1, mention): Likewise.
(clear_command, breakpoint_re_set_one, enable_command): Likewise.
(disable_command): Likewise.
* blockframe.c (find_frame_addr_in_frame_chain): New function.
Extern prototype added to frame.h
* infrun.c (wait_for_inferior): Set current_frame and select
a frame before checking if we stopped due to a hardare watchpoint
firing. Handle stepping over hardware watchpoints.
(normal_stop): Remove unnecessary call to select_frame.
* value.h (value_release_to_mark): Declare.
* values.c (value_release_to_mark): New function.
* procfs.c (procfs_wait): Add cases for hardware watchpoints.
(procfs_set_watchpoint, procfs_stopped_by_watchpoint): New functions.
* hppab-nat.c (hppa_set_watchpoint): New function.
* config/pa/nm-hppab.h (STOPPED_BY_WATCHPOINT): Define.
(HAVE_STEPPABLE_WATCHPOINT): Define.
(TARGET_CAN_USE_HARDWARE_WATCHPOINT): Define.
(target_{insert,delete}_watchpoint): Define.
1994-04-14 05:57:00 +08:00
|
|
|
|
/* Never disable a watchpoint scope breakpoint; we want to
|
|
|
|
|
hit them when we leave scope so we can delete both the
|
|
|
|
|
watchpoint and its scope breakpoint at that time. */
|
|
|
|
|
if (bpt->type == bp_watchpoint_scope)
|
|
|
|
|
return;
|
|
|
|
|
|
1994-07-29 06:07:02 +08:00
|
|
|
|
if (disable_breakpoint_hook)
|
|
|
|
|
disable_breakpoint_hook (bpt);
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
bpt->enable = disabled;
|
|
|
|
|
|
|
|
|
|
check_duplicates (bpt->address);
|
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
disable_command (args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
register struct breakpoint *bpt;
|
|
|
|
|
if (args == 0)
|
|
|
|
|
ALL_BREAKPOINTS (bpt)
|
1992-06-18 05:53:28 +08:00
|
|
|
|
switch (bpt->type)
|
|
|
|
|
{
|
|
|
|
|
case bp_breakpoint:
|
1994-06-11 09:09:25 +08:00
|
|
|
|
case bp_hardware_breakpoint:
|
|
|
|
|
case bp_watchpoint:
|
|
|
|
|
case bp_hardware_watchpoint:
|
|
|
|
|
case bp_read_watchpoint:
|
|
|
|
|
case bp_access_watchpoint:
|
1992-06-18 05:53:28 +08:00
|
|
|
|
disable_breakpoint (bpt);
|
|
|
|
|
default:
|
|
|
|
|
continue;
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
|
|
|
|
map_breakpoint_numbers (args, disable_breakpoint);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_once_breakpoint (bpt)
|
|
|
|
|
struct breakpoint *bpt;
|
|
|
|
|
{
|
1994-06-11 09:09:25 +08:00
|
|
|
|
FRAME save_selected_frame = NULL;
|
|
|
|
|
int save_selected_frame_level = -1;
|
|
|
|
|
int target_resources_ok, other_type_used;
|
|
|
|
|
struct value *mark;
|
|
|
|
|
|
|
|
|
|
if (bpt->type == bp_hardware_breakpoint)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
i = hw_breakpoint_used_count();
|
|
|
|
|
target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
|
|
|
|
|
bp_hardware_breakpoint, i+1, 0);
|
|
|
|
|
if (target_resources_ok == 0)
|
|
|
|
|
error ("No hardware breakpoint support in the target.");
|
|
|
|
|
else if (target_resources_ok < 0)
|
|
|
|
|
error ("Hardware breakpoints used exceeds limit.");
|
|
|
|
|
}
|
|
|
|
|
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
bpt->enable = enabled;
|
|
|
|
|
bpt->disposition = disable;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
check_duplicates (bpt->address);
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1994-06-11 09:09:25 +08:00
|
|
|
|
|
|
|
|
|
if (bpt->type == bp_watchpoint || bpt->type == bp_hardware_watchpoint ||
|
|
|
|
|
bpt->type == bp_read_watchpoint || bpt->type == bp_access_watchpoint)
|
|
|
|
|
{
|
|
|
|
|
if (bpt->exp_valid_block != NULL)
|
|
|
|
|
{
|
|
|
|
|
FRAME fr = find_frame_addr_in_frame_chain (bpt->watchpoint_frame);
|
|
|
|
|
if (fr == NULL)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered ("\
|
|
|
|
|
Cannot enable watchpoint %d because the block in which its expression\n\
|
|
|
|
|
is valid is not currently in scope.\n", bpt->number);
|
|
|
|
|
bpt->enable = disabled;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
save_selected_frame = selected_frame;
|
|
|
|
|
save_selected_frame_level = selected_frame_level;
|
|
|
|
|
select_frame (fr, -1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
value_free (bpt->val);
|
|
|
|
|
mark = value_mark ();
|
|
|
|
|
bpt->val = evaluate_expression (bpt->exp);
|
|
|
|
|
release_value (bpt->val);
|
|
|
|
|
if (VALUE_LAZY (bpt->val))
|
|
|
|
|
value_fetch_lazy (bpt->val);
|
|
|
|
|
|
|
|
|
|
if (bpt->type == bp_hardware_watchpoint ||
|
|
|
|
|
bpt->type == bp_read_watchpoint ||
|
|
|
|
|
bpt->type == bp_access_watchpoint)
|
|
|
|
|
{
|
|
|
|
|
int i = hw_watchpoint_used_count (bpt->type, &other_type_used);
|
|
|
|
|
int mem_cnt = can_use_hardware_watchpoint(bpt->val);
|
|
|
|
|
target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT(
|
|
|
|
|
bpt->type, i+mem_cnt, other_type_used);
|
|
|
|
|
/* we can consider of type is bp_hardware_watchpoint, convert to
|
|
|
|
|
bp_watchpoint in the following condition */
|
|
|
|
|
if (target_resources_ok < 0)
|
|
|
|
|
{
|
|
|
|
|
printf_filtered("\
|
|
|
|
|
Cannot enable watchpoint %d because target watch resources\n\
|
|
|
|
|
have been allocated for other watchpoints.\n", bpt->number);
|
|
|
|
|
bpt->enable = disabled;
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (save_selected_frame_level >= 0)
|
|
|
|
|
select_frame (save_selected_frame, save_selected_frame_level);
|
|
|
|
|
value_free_to_mark (mark);
|
|
|
|
|
}
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
enable_once_command (args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
map_breakpoint_numbers (args, enable_once_breakpoint);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
enable_delete_breakpoint (bpt)
|
|
|
|
|
struct breakpoint *bpt;
|
|
|
|
|
{
|
* infrun.c, infcmd.c, breakpoint.c, main.c, symfile.c,
breakpoint.h, tm-sun4os4.h, tm-sparc.h, sparc-tdep.c, tm-mips.h,
mips-tdep.h, tm-sun3.h, tm-68k.h, m68k-tdep.h: Add support for
stepping (and nexting) through longjmp(). Also, cleanup
breakpoint handling quite a bit by creating explicit breakpoint
types instead of using magic breakpoint numbers.
Makefile.in: Update version to 4.4.3
1992-02-22 17:06:58 +08:00
|
|
|
|
bpt->enable = enabled;
|
|
|
|
|
bpt->disposition = delete;
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
check_duplicates (bpt->address);
|
1994-04-21 03:23:30 +08:00
|
|
|
|
breakpoints_changed ();
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
Make writing to files work properly. (Fixes to BFD are also needed.)
* core.c (core_open): Open file ourselves, read or r/w, depending on
write_files. Use bfd_fdopenr.
* gdbcore.h (write_files): New variable.
* exec.c (write_files): Define variable, add set&show for it.
(exec_file_command): Use write_files to open for read or r/write.
Make shared library reading happen automatically. These changes
are mostly from Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
* inferior.h (stop_soon_quietly): Add to exported variables.
* infrun.c (child_create_inferior): call solib hook, if defined.
(child_attach): call solib hook, if defined.
* solib.c: Include inferior.h. Add from_tty to so_list as kludge.
(find_solib): Use lookup_misc_func rather than hand-rolled.
(symbol_add_stub): New stub for catch_errors.
(solib_add): Avoid output if !from_tty. Catch errors rather
than just calling symbol_file_add and bombing.
(solib_create_inferior_hook): Interface with the target process
to let it read and alloc shared libs, then figure out what it did.
* core.c (validate_files): Fix typo, soften warning.
(Fix from Hiroto Kagotani <kagotani@cs.titech.ac.jp>.)
* utils.c (fputs_demangled): Avoid duplicate printing if
demangling is off. (Fix from J.T. Conklin <jtc@cayenne.com>.)
* infrun.c (proceed): Cast -1 to (CORE_ADDR) before comparing.
(Fix from pierre@la.tce.com (Pierre Willard).)
* main.c (catch_errors): Change argument to a char * from an int,
since a char * can point to a struct full of glop, but an int
is not guaranteed to be able to hold a pointer.
* breakpoint.c (breakpoint_cond_eval, bpstat_stop_status,
breakpoint_re_set_one, breakpoint_re_set): Adapt.
* core.c (core_open, solib_add_stub): Adapt.
* remote-vx.c (symbol_stub, add_symbol_stub, callers): Adapt.
1991-09-04 16:43:50 +09:00
|
|
|
|
/* ARGSUSED */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
static void
|
|
|
|
|
enable_delete_command (args, from_tty)
|
|
|
|
|
char *args;
|
|
|
|
|
int from_tty;
|
|
|
|
|
{
|
|
|
|
|
map_breakpoint_numbers (args, enable_delete_breakpoint);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Use default_breakpoint_'s, or nothing if they aren't valid.
|
|
|
|
|
*/
|
|
|
|
|
struct symtabs_and_lines
|
|
|
|
|
decode_line_spec_1 (string, funfirstline)
|
|
|
|
|
char *string;
|
|
|
|
|
int funfirstline;
|
|
|
|
|
{
|
|
|
|
|
struct symtabs_and_lines sals;
|
|
|
|
|
if (string == 0)
|
|
|
|
|
error ("Empty line specification.");
|
|
|
|
|
if (default_breakpoint_valid)
|
|
|
|
|
sals = decode_line_1 (&string, funfirstline,
|
1993-07-26 13:26:55 +08:00
|
|
|
|
default_breakpoint_symtab, default_breakpoint_line,
|
|
|
|
|
(char ***)NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
else
|
1993-07-26 13:26:55 +08:00
|
|
|
|
sals = decode_line_1 (&string, funfirstline,
|
|
|
|
|
(struct symtab *)NULL, 0, (char ***)NULL);
|
1991-03-29 00:26:26 +08:00
|
|
|
|
if (*string)
|
|
|
|
|
error ("Junk at end of line specification: %s", string);
|
|
|
|
|
return sals;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_initialize_breakpoint ()
|
|
|
|
|
{
|
|
|
|
|
breakpoint_chain = 0;
|
|
|
|
|
/* Don't bother to call set_breakpoint_count. $bpnum isn't useful
|
|
|
|
|
before a breakpoint is set. */
|
|
|
|
|
breakpoint_count = 0;
|
|
|
|
|
|
|
|
|
|
add_com ("ignore", class_breakpoint, ignore_command,
|
1994-07-24 06:01:44 +08:00
|
|
|
|
"Set ignore-count of breakpoint number N to COUNT.\n\
|
|
|
|
|
Usage is `ignore N COUNT'.");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
add_com ("commands", class_breakpoint, commands_command,
|
|
|
|
|
"Set commands to be executed when a breakpoint is hit.\n\
|
|
|
|
|
Give breakpoint number as argument after \"commands\".\n\
|
|
|
|
|
With no argument, the targeted breakpoint is the last one set.\n\
|
|
|
|
|
The commands themselves follow starting on the next line.\n\
|
|
|
|
|
Type a line containing \"end\" to indicate the end of them.\n\
|
|
|
|
|
Give \"silent\" as the first line to make the breakpoint silent;\n\
|
|
|
|
|
then no output is printed when it is hit, except what the commands print.");
|
|
|
|
|
|
|
|
|
|
add_com ("condition", class_breakpoint, condition_command,
|
|
|
|
|
"Specify breakpoint number N to break only if COND is true.\n\
|
1994-07-24 06:01:44 +08:00
|
|
|
|
Usage is `condition N COND', where N is an integer and COND is an\n\
|
|
|
|
|
expression to be evaluated whenever breakpoint N is reached. ");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
add_com ("tbreak", class_breakpoint, tbreak_command,
|
|
|
|
|
"Set a temporary breakpoint. Args like \"break\" command.\n\
|
1994-03-12 00:13:08 +08:00
|
|
|
|
Like \"break\" except the breakpoint is only temporary,\n\
|
|
|
|
|
so it will be deleted when hit. Equivalent to \"break\" followed\n\
|
|
|
|
|
by using \"enable delete\" on the breakpoint number.");
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
add_com ("hbreak", class_breakpoint, hbreak_command,
|
|
|
|
|
"Set a hardware assisted breakpoint. Args like \"break\" command.\n\
|
|
|
|
|
Like \"break\" except the breakpoint requires hardware support,\n\
|
|
|
|
|
some target hardware may not have this support.");
|
|
|
|
|
|
|
|
|
|
add_com ("thbreak", class_breakpoint, thbreak_command,
|
|
|
|
|
"Set a temporary hardware assisted breakpoint. Args like \"break\" command.\n\
|
|
|
|
|
Like \"hbreak\" except the breakpoint is only temporary,\n\
|
|
|
|
|
so it will be deleted when hit.");
|
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
add_prefix_cmd ("enable", class_breakpoint, enable_command,
|
|
|
|
|
"Enable some breakpoints.\n\
|
|
|
|
|
Give breakpoint numbers (separated by spaces) as arguments.\n\
|
|
|
|
|
With no subcommand, breakpoints are enabled until you command otherwise.\n\
|
|
|
|
|
This is used to cancel the effect of the \"disable\" command.\n\
|
|
|
|
|
With a subcommand you can enable temporarily.",
|
|
|
|
|
&enablelist, "enable ", 1, &cmdlist);
|
|
|
|
|
|
|
|
|
|
add_abbrev_prefix_cmd ("breakpoints", class_breakpoint, enable_command,
|
|
|
|
|
"Enable some breakpoints.\n\
|
|
|
|
|
Give breakpoint numbers (separated by spaces) as arguments.\n\
|
|
|
|
|
This is used to cancel the effect of the \"disable\" command.\n\
|
|
|
|
|
May be abbreviated to simply \"enable\".\n",
|
|
|
|
|
&enablebreaklist, "enable breakpoints ", 1, &enablelist);
|
|
|
|
|
|
|
|
|
|
add_cmd ("once", no_class, enable_once_command,
|
|
|
|
|
"Enable breakpoints for one hit. Give breakpoint numbers.\n\
|
1994-03-31 01:17:01 +08:00
|
|
|
|
If a breakpoint is hit while enabled in this fashion, it becomes disabled.",
|
1991-03-29 00:26:26 +08:00
|
|
|
|
&enablebreaklist);
|
|
|
|
|
|
|
|
|
|
add_cmd ("delete", no_class, enable_delete_command,
|
|
|
|
|
"Enable breakpoints and delete when hit. Give breakpoint numbers.\n\
|
|
|
|
|
If a breakpoint is hit while enabled in this fashion, it is deleted.",
|
|
|
|
|
&enablebreaklist);
|
|
|
|
|
|
|
|
|
|
add_cmd ("delete", no_class, enable_delete_command,
|
|
|
|
|
"Enable breakpoints and delete when hit. Give breakpoint numbers.\n\
|
|
|
|
|
If a breakpoint is hit while enabled in this fashion, it is deleted.",
|
|
|
|
|
&enablelist);
|
|
|
|
|
|
|
|
|
|
add_cmd ("once", no_class, enable_once_command,
|
|
|
|
|
"Enable breakpoints for one hit. Give breakpoint numbers.\n\
|
1994-03-31 01:17:01 +08:00
|
|
|
|
If a breakpoint is hit while enabled in this fashion, it becomes disabled.",
|
1991-03-29 00:26:26 +08:00
|
|
|
|
&enablelist);
|
|
|
|
|
|
|
|
|
|
add_prefix_cmd ("disable", class_breakpoint, disable_command,
|
|
|
|
|
"Disable some breakpoints.\n\
|
|
|
|
|
Arguments are breakpoint numbers with spaces in between.\n\
|
|
|
|
|
To disable all breakpoints, give no argument.\n\
|
|
|
|
|
A disabled breakpoint is not forgotten, but has no effect until reenabled.",
|
|
|
|
|
&disablelist, "disable ", 1, &cmdlist);
|
|
|
|
|
add_com_alias ("dis", "disable", class_breakpoint, 1);
|
|
|
|
|
add_com_alias ("disa", "disable", class_breakpoint, 1);
|
|
|
|
|
|
|
|
|
|
add_cmd ("breakpoints", class_alias, disable_command,
|
|
|
|
|
"Disable some breakpoints.\n\
|
|
|
|
|
Arguments are breakpoint numbers with spaces in between.\n\
|
|
|
|
|
To disable all breakpoints, give no argument.\n\
|
|
|
|
|
A disabled breakpoint is not forgotten, but has no effect until reenabled.\n\
|
|
|
|
|
This command may be abbreviated \"disable\".",
|
|
|
|
|
&disablelist);
|
|
|
|
|
|
|
|
|
|
add_prefix_cmd ("delete", class_breakpoint, delete_command,
|
|
|
|
|
"Delete some breakpoints or auto-display expressions.\n\
|
|
|
|
|
Arguments are breakpoint numbers with spaces in between.\n\
|
|
|
|
|
To delete all breakpoints, give no argument.\n\
|
|
|
|
|
\n\
|
|
|
|
|
Also a prefix command for deletion of other GDB objects.\n\
|
|
|
|
|
The \"unset\" command is also an alias for \"delete\".",
|
|
|
|
|
&deletelist, "delete ", 1, &cmdlist);
|
|
|
|
|
add_com_alias ("d", "delete", class_breakpoint, 1);
|
|
|
|
|
|
|
|
|
|
add_cmd ("breakpoints", class_alias, delete_command,
|
|
|
|
|
"Delete some breakpoints or auto-display expressions.\n\
|
|
|
|
|
Arguments are breakpoint numbers with spaces in between.\n\
|
|
|
|
|
To delete all breakpoints, give no argument.\n\
|
|
|
|
|
This command may be abbreviated \"delete\".",
|
|
|
|
|
&deletelist);
|
|
|
|
|
|
|
|
|
|
add_com ("clear", class_breakpoint, clear_command,
|
|
|
|
|
"Clear breakpoint at specified line or function.\n\
|
|
|
|
|
Argument may be line number, function name, or \"*\" and an address.\n\
|
|
|
|
|
If line number is specified, all breakpoints in that line are cleared.\n\
|
|
|
|
|
If function is specified, breakpoints at beginning of function are cleared.\n\
|
|
|
|
|
If an address is specified, breakpoints at that address are cleared.\n\n\
|
|
|
|
|
With no argument, clears all breakpoints in the line that the selected frame\n\
|
|
|
|
|
is executing in.\n\
|
|
|
|
|
\n\
|
|
|
|
|
See also the \"delete\" command which clears breakpoints by number.");
|
|
|
|
|
|
|
|
|
|
add_com ("break", class_breakpoint, break_command,
|
|
|
|
|
"Set breakpoint at specified line or function.\n\
|
|
|
|
|
Argument may be line number, function name, or \"*\" and an address.\n\
|
|
|
|
|
If line number is specified, break at start of code for that line.\n\
|
|
|
|
|
If function is specified, break at start of code for that function.\n\
|
|
|
|
|
If an address is specified, break at that exact address.\n\
|
|
|
|
|
With no arg, uses current execution address of selected stack frame.\n\
|
|
|
|
|
This is useful for breaking on return to a stack frame.\n\
|
|
|
|
|
\n\
|
|
|
|
|
Multiple breakpoints at one place are permitted, and useful if conditional.\n\
|
|
|
|
|
\n\
|
|
|
|
|
Do \"help breakpoints\" for info on other commands dealing with breakpoints.");
|
|
|
|
|
add_com_alias ("b", "break", class_run, 1);
|
|
|
|
|
add_com_alias ("br", "break", class_run, 1);
|
|
|
|
|
add_com_alias ("bre", "break", class_run, 1);
|
|
|
|
|
add_com_alias ("brea", "break", class_run, 1);
|
|
|
|
|
|
|
|
|
|
add_info ("breakpoints", breakpoints_info,
|
1992-02-28 01:45:02 +08:00
|
|
|
|
"Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
|
|
|
|
|
The \"Type\" column indicates one of:\n\
|
1992-06-18 05:53:28 +08:00
|
|
|
|
\tbreakpoint - normal breakpoint\n\
|
|
|
|
|
\twatchpoint - watchpoint\n\
|
1992-02-28 01:45:02 +08:00
|
|
|
|
The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
|
|
|
|
|
the disposition of the breakpoint after it gets hit. \"dis\" means that the\n\
|
|
|
|
|
breakpoint will be disabled. The \"Address\" and \"What\" columns indicate the\n\
|
|
|
|
|
address and file/line number respectively.\n\n\
|
|
|
|
|
Convenience variable \"$_\" and default examine address for \"x\"\n\
|
|
|
|
|
are set to the address of the last breakpoint listed.\n\n\
|
|
|
|
|
Convenience variable \"$bpnum\" contains the number of the last\n\
|
|
|
|
|
breakpoint set.");
|
|
|
|
|
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
#if MAINTENANCE_CMDS
|
|
|
|
|
|
|
|
|
|
add_cmd ("breakpoints", class_maintenance, maintenance_info_breakpoints,
|
1991-03-29 00:26:26 +08:00
|
|
|
|
"Status of all breakpoints, or breakpoint number NUMBER.\n\
|
1992-02-28 01:45:02 +08:00
|
|
|
|
The \"Type\" column indicates one of:\n\
|
1992-06-18 05:53:28 +08:00
|
|
|
|
\tbreakpoint - normal breakpoint\n\
|
|
|
|
|
\twatchpoint - watchpoint\n\
|
|
|
|
|
\tlongjmp - internal breakpoint used to step through longjmp()\n\
|
|
|
|
|
\tlongjmp resume - internal breakpoint at the target of longjmp()\n\
|
|
|
|
|
\tuntil - internal breakpoint used by the \"until\" command\n\
|
|
|
|
|
\tfinish - internal breakpoint used by the \"finish\" command\n\
|
1992-02-28 01:45:02 +08:00
|
|
|
|
The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
|
|
|
|
|
the disposition of the breakpoint after it gets hit. \"dis\" means that the\n\
|
|
|
|
|
breakpoint will be disabled. The \"Address\" and \"What\" columns indicate the\n\
|
|
|
|
|
address and file/line number respectively.\n\n\
|
1991-03-29 00:26:26 +08:00
|
|
|
|
Convenience variable \"$_\" and default examine address for \"x\"\n\
|
|
|
|
|
are set to the address of the last breakpoint listed.\n\n\
|
|
|
|
|
Convenience variable \"$bpnum\" contains the number of the last\n\
|
RS/6000 portability changes (for hosting cross-debuggers).
* breakpoint.c (fixup_breakpoints): Re-kludge to IBM6000_TARGET.
* buildsym.c, rs6000-xdep.c, rs6000-tdep.c, tm-rs6000.h,
xcoffexec.c, xcoffread.c: Rename aixcoff to xcoff everywhere.
* printcmd.c (print_frame_args): Remove an RS/6000 dependency.
* stabsread.c (define_symbol): Remove RS/6000 dependencies.
* tm-rs6000.h (ATTACH_DETACH): Remove: host-dependent.
(PTRACE_ATTACH, PTRACE_DETACH): Remove: host-dep.
(NO_SINGLE_STEP): Add, target-dependent.
(loadinfotextindex): Lowercase, remove "aix_".
* xm-rs6000.h: Add <sys/ptrace.h> for infptrace.c.
(NO_SINGLE_STEP): Remove, target-dependent.
* xcoffexec.c (vmap_symtab): Cleanup #if 0'd code.
* xcoffread.c: Only build file if RS/6000 native GDB.
(build_function_symbol): Remove #if 0'd code.
* rs6000-tdep.c: Cleanup. Add static fn protos.
Use CORE_ADDR for addresses throughout. Make void fns void.
(pop_dummy_frame): Add FIXME about bogosity of design here.
(rs6000_struct_return_address): Ditto.
(frameless_function_invocation, frame_get_cache_fsr,
frame_initial_stack_address, xcoff_relocate_symtab,
xcoff_init_loadinfo, free_loadinfo, xcoff_add_toc_to_loadinfo,
add_text_to_loadinfo, find_toc_address): Move from xdep file.
Use CORE_ADDRs. Change identifiers to lowercase.
* rs6000-xdep.c: Make whole file conditional on native RS/6000,
supplying dummy routines if non-native. Add prototype for
static exec_one_dummy_insn. Move a mess of functions to
rs6000-tdep.c (as above). Remove #if 0'd code.
* config/rs6000.mh (XDEPFILES): Move xcoffexec.o to target side.
(XM_CLIBS): Add -lm to circumvent AIX 3.2 libc ldexp bug.
* config/rs6000.mt (TDEPFILES): Adopt xcoffexec.o.
1992-08-29 08:32:58 +08:00
|
|
|
|
breakpoint set.",
|
|
|
|
|
&maintenanceinfolist);
|
|
|
|
|
|
|
|
|
|
#endif /* MAINTENANCE_CMDS */
|
1991-03-29 00:26:26 +08:00
|
|
|
|
|
|
|
|
|
add_com ("catch", class_breakpoint, catch_command,
|
|
|
|
|
"Set breakpoints to catch exceptions that are raised.\n\
|
|
|
|
|
Argument may be a single exception to catch, multiple exceptions\n\
|
|
|
|
|
to catch, or the default exception \"default\". If no arguments\n\
|
|
|
|
|
are given, breakpoints are set at all exception handlers catch clauses\n\
|
|
|
|
|
within the current scope.\n\
|
|
|
|
|
\n\
|
|
|
|
|
A condition specified for the catch applies to all breakpoints set\n\
|
|
|
|
|
with this command\n\
|
|
|
|
|
\n\
|
|
|
|
|
Do \"help breakpoints\" for info on other commands dealing with breakpoints.");
|
|
|
|
|
|
|
|
|
|
add_com ("watch", class_breakpoint, watch_command,
|
|
|
|
|
"Set a watchpoint for an expression.\n\
|
|
|
|
|
A watchpoint stops execution of your program whenever the value of\n\
|
|
|
|
|
an expression changes.");
|
|
|
|
|
|
1994-06-11 09:09:25 +08:00
|
|
|
|
add_com ("rwatch", class_breakpoint, rwatch_command,
|
|
|
|
|
"Set a read watchpoint for an expression.\n\
|
|
|
|
|
A watchpoint stops execution of your program whenever the value of\n\
|
|
|
|
|
an expression is read.");
|
|
|
|
|
|
|
|
|
|
add_com ("awatch", class_breakpoint, awatch_command,
|
|
|
|
|
"Set a watchpoint for an expression.\n\
|
|
|
|
|
A watchpoint stops execution of your program whenever the value of\n\
|
|
|
|
|
an expression is either read or written.");
|
|
|
|
|
|
1992-03-30 07:18:31 +08:00
|
|
|
|
add_info ("watchpoints", breakpoints_info,
|
|
|
|
|
"Synonym for ``info breakpoints''.");
|
1994-07-14 10:15:39 +08:00
|
|
|
|
|
1991-03-29 00:26:26 +08:00
|
|
|
|
}
|
1992-03-30 06:33:35 +08:00
|
|
|
|
|
1993-03-27 06:49:53 +08:00
|
|
|
|
/* OK, when we call objfile_relocate, we need to relocate breakpoints
|
|
|
|
|
too. breakpoint_re_set is not a good choice--for example, if
|
|
|
|
|
addr_string contains just a line number without a file name the
|
|
|
|
|
breakpoint might get set in a different file. In general, there is
|
|
|
|
|
no need to go all the way back to the user's string (though this might
|
|
|
|
|
work if some effort were made to canonicalize it), since symtabs and
|
|
|
|
|
everything except addresses are still valid.
|
1992-03-30 06:33:35 +08:00
|
|
|
|
|
1993-03-27 06:49:53 +08:00
|
|
|
|
Probably the best way to solve this is to have each breakpoint save
|
|
|
|
|
the objfile and the section number that was used to set it (if set
|
|
|
|
|
by "*addr", probably it is best to use find_pc_line to get a symtab
|
|
|
|
|
and use the objfile and block_line_section for that symtab). Then
|
|
|
|
|
objfile_relocate can call fixup_breakpoints with the objfile and
|
|
|
|
|
the new_offsets, and it can relocate only the appropriate breakpoints. */
|
1992-03-30 06:33:35 +08:00
|
|
|
|
|
1993-03-27 06:49:53 +08:00
|
|
|
|
#ifdef IBM6000_TARGET
|
|
|
|
|
/* But for now, just kludge it based on the concept that before an
|
|
|
|
|
objfile is relocated the breakpoint is below 0x10000000, and afterwards
|
|
|
|
|
it is higher, so that way we only relocate each breakpoint once. */
|
1992-03-30 06:33:35 +08:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
fixup_breakpoints (low, high, delta)
|
|
|
|
|
CORE_ADDR low;
|
|
|
|
|
CORE_ADDR high;
|
|
|
|
|
CORE_ADDR delta;
|
|
|
|
|
{
|
|
|
|
|
struct breakpoint *b;
|
|
|
|
|
|
|
|
|
|
ALL_BREAKPOINTS (b)
|
|
|
|
|
{
|
|
|
|
|
if (b->address >= low && b->address <= high)
|
|
|
|
|
b->address += delta;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|