projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Phase 1 of the ptid_t changes.
[deliverable/binutils-gdb.git]
/
gdb
/
breakpoint.c
diff --git
a/gdb/breakpoint.c
b/gdb/breakpoint.c
index c80c4531b2ef9d614e09e1918569e2f83ac18b06..805079f2ee78b8d6551d27accc9d79e2b46c5a49 100644
(file)
--- a/
gdb/breakpoint.c
+++ b/
gdb/breakpoint.c
@@
-1,6
+1,6
@@
/* Everything about breakpoints, for GDB.
/* Everything about breakpoints, for GDB.
- Copyright 1986,
87, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
- Free Software Foundation, Inc.
+ Copyright 1986,
1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+
1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-39,6
+39,7
@@
#include "annotate.h"
#include "symfile.h"
#include "objfiles.h"
#include "annotate.h"
#include "symfile.h"
#include "objfiles.h"
+#include "linespec.h"
#ifdef UI_OUT
#include "ui-out.h"
#endif
#ifdef UI_OUT
#include "ui-out.h"
#endif
@@
-84,8
+85,6
@@
static int can_use_hardware_watchpoint (struct value *);
static void break_at_finish_command (char *, int);
static void break_at_finish_at_depth_command (char *, int);
static void break_at_finish_command (char *, int);
static void break_at_finish_at_depth_command (char *, int);
-void tbreak_command (char *, int);
-
static void tbreak_at_finish_command (char *, int);
static void break_command_1 (char *, int, int);
static void tbreak_at_finish_command (char *, int);
static void break_command_1 (char *, int, int);
@@
-196,12
+195,12
@@
static char *ep_parse_optional_filename (char **arg);
static void catch_exec_command_1 (char *arg, int tempflag, int from_tty);
#endif
static void catch_exec_command_1 (char *arg, int tempflag, int from_tty);
#endif
-static void create_exception_catchpoint
-
(int tempflag, char *cond_string
,
-
enum exception_event_kind ex_event,
struct symtab_and_line *sal);
+static void create_exception_catchpoint
(int tempflag, char *cond_string,
+
enum exception_event_kind ex_event
,
+
struct symtab_and_line *sal);
-static void catch_exception_command_1
-
(enum exception_event_kind ex_event,
char *arg, int tempflag, int from_tty);
+static void catch_exception_command_1
(enum exception_event_kind ex_event,
+
char *arg, int tempflag, int from_tty);
static void tcatch_command (char *arg, int from_tty);
static void tcatch_command (char *arg, int from_tty);
@@
-209,18
+208,12
@@
static void ep_skip_leading_whitespace (char **s);
/* Prototypes for exported functions. */
/* Prototypes for exported functions. */
-static void awatch_command (char *, int);
-
-static void do_enable_breakpoint (struct breakpoint *, enum bpdisp);
-
/* If FALSE, gdb will not use hardware support for watchpoints, even
if such is available. */
static int can_use_hw_watchpoints;
void _initialize_breakpoint (void);
/* If FALSE, gdb will not use hardware support for watchpoints, even
if such is available. */
static int can_use_hw_watchpoints;
void _initialize_breakpoint (void);
-void set_breakpoint_count (int);
-
extern int addressprint; /* Print machine addresses? */
static int internal_breakpoint_number = -1;
extern int addressprint; /* Print machine addresses? */
static int internal_breakpoint_number = -1;
@@
-328,8
+321,7
@@
int exception_support_initialized = 0;
/* Set breakpoint count to NUM. */
void
/* Set breakpoint count to NUM. */
void
-set_breakpoint_count (num)
- int num;
+set_breakpoint_count (int num)
{
breakpoint_count = num;
set_internalvar (lookup_internalvar ("bpnum"),
{
breakpoint_count = num;
set_internalvar (lookup_internalvar ("bpnum"),
@@
-339,7
+331,7
@@
set_breakpoint_count (num)
/* Used in run_command to zero the hit count when a new run starts. */
void
/* Used in run_command to zero the hit count when a new run starts. */
void
-clear_breakpoint_hit_counts ()
+clear_breakpoint_hit_counts (
void
)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-369,9
+361,7
@@
int default_breakpoint_line;
TRAILER is a character which can be found after the number; most
commonly this is `-'. If you don't want a trailer, use \0. */
static int
TRAILER is a character which can be found after the number; most
commonly this is `-'. If you don't want a trailer, use \0. */
static int
-get_number_trailer (pp, trailer)
- char **pp;
- int trailer;
+get_number_trailer (char **pp, int trailer)
{
int retval = 0; /* default */
char *p = *pp;
{
int retval = 0; /* default */
char *p = *pp;
@@
-435,8
+425,7
@@
get_number_trailer (pp, trailer)
/* Like get_number_trailer, but don't allow a trailer. */
int
/* Like get_number_trailer, but don't allow a trailer. */
int
-get_number (pp)
- char **pp;
+get_number (char **pp)
{
return get_number_trailer (pp, '\0');
}
{
return get_number_trailer (pp, '\0');
}
@@
-458,8
+447,7
@@
get_number (pp)
*/
int
*/
int
-get_number_or_range (pp)
- char **pp;
+get_number_or_range (char **pp)
{
static int last_retval, end_value;
static char *end_ptr;
{
static int last_retval, end_value;
static char *end_ptr;
@@
-523,9
+511,7
@@
get_number_or_range (pp)
/* condition N EXP -- set break condition of breakpoint N to EXP. */
static void
/* condition N EXP -- set break condition of breakpoint N to EXP. */
static void
-condition_command (arg, from_tty)
- char *arg;
- int from_tty;
+condition_command (char *arg, int from_tty)
{
register struct breakpoint *b;
char *p;
{
register struct breakpoint *b;
char *p;
@@
-544,11
+530,11
@@
condition_command (arg, from_tty)
{
if (b->cond)
{
{
if (b->cond)
{
-
free ((PTR)
b->cond);
+
xfree (
b->cond);
b->cond = 0;
}
if (b->cond_string != NULL)
b->cond = 0;
}
if (b->cond_string != NULL)
-
free ((PTR)
b->cond_string);
+
xfree (
b->cond_string);
if (*p == 0)
{
if (*p == 0)
{
@@
-576,9
+562,7
@@
condition_command (arg, from_tty)
/* ARGSUSED */
static void
/* ARGSUSED */
static void
-commands_command (arg, from_tty)
- char *arg;
- int from_tty;
+commands_command (char *arg, int from_tty)
{
register struct breakpoint *b;
char *p;
{
register struct breakpoint *b;
char *p;
@@
-623,10
+607,7
@@
commands_command (arg, from_tty)
shadow contents, not the breakpoints themselves. From breakpoint.c. */
int
shadow contents, not the breakpoints themselves. From breakpoint.c. */
int
-read_memory_nobpt (memaddr, myaddr, len)
- CORE_ADDR memaddr;
- char *myaddr;
- unsigned len;
+read_memory_nobpt (CORE_ADDR memaddr, char *myaddr, unsigned len)
{
int status;
struct breakpoint *b;
{
int status;
struct breakpoint *b;
@@
-707,10
+688,9
@@
read_memory_nobpt (memaddr, myaddr, len)
if (bp_addr + bp_size < memaddr + len)
{
/* Copy the section of memory after the breakpoint. */
if (bp_addr + bp_size < memaddr + len)
{
/* Copy the section of memory after the breakpoint. */
- status = read_memory_nobpt
- (bp_addr + bp_size,
- myaddr + bp_addr + bp_size - memaddr,
- memaddr + len - (bp_addr + bp_size));
+ status = read_memory_nobpt (bp_addr + bp_size,
+ myaddr + bp_addr + bp_size - memaddr,
+ memaddr + len - (bp_addr + bp_size));
if (status != 0)
return status;
}
if (status != 0)
return status;
}
@@
-728,7
+708,7
@@
read_memory_nobpt (memaddr, myaddr, len)
or an `errno' value if could not write the inferior. */
int
or an `errno' value if could not write the inferior. */
int
-insert_breakpoints ()
+insert_breakpoints (
void
)
{
register struct breakpoint *b, *temp;
int return_val = 0; /* return success code. */
{
register struct breakpoint *b, *temp;
int return_val = 0; /* return success code. */
@@
-1008,13
+988,13
@@
insert_breakpoints ()
switch (b->type)
{
case bp_catch_fork:
switch (b->type)
{
case bp_catch_fork:
- val = target_insert_fork_catchpoint (
inferior_pid
);
+ val = target_insert_fork_catchpoint (
PIDGET (inferior_ptid)
);
break;
case bp_catch_vfork:
break;
case bp_catch_vfork:
- val = target_insert_vfork_catchpoint (
inferior_pid
);
+ val = target_insert_vfork_catchpoint (
PIDGET (inferior_ptid)
);
break;
case bp_catch_exec:
break;
case bp_catch_exec:
- val = target_insert_exec_catchpoint (
inferior_pid
);
+ val = target_insert_exec_catchpoint (
PIDGET (inferior_ptid)
);
break;
default:
warning ("Internal error, %s line %d.", __FILE__, __LINE__);
break;
default:
warning ("Internal error, %s line %d.", __FILE__, __LINE__);
@@
-1038,7
+1018,7
@@
insert_breakpoints ()
int
int
-remove_breakpoints ()
+remove_breakpoints (
void
)
{
register struct breakpoint *b;
int val;
{
register struct breakpoint *b;
int val;
@@
-1077,15
+1057,14
@@
remove_hw_watchpoints (void)
}
int
}
int
-reattach_breakpoints (pid)
- int pid;
+reattach_breakpoints (int pid)
{
register struct breakpoint *b;
int val;
{
register struct breakpoint *b;
int val;
-
int saved_inferior_pid = inferior_p
id;
+
ptid_t saved_inferior_ptid = inferior_pt
id;
- /* FIXME: use a cleanup, to insure that inferior_pid gets replaced! */
- inferior_p
id = pid;
/* Because remove_breakpoint will use this global. */
+ /* FIXME: use a cleanup, to insure that inferior_p
t
id gets replaced! */
+ inferior_p
tid = pid_to_ptid (pid);
/* Because remove_breakpoint will use this global. */
ALL_BREAKPOINTS (b)
{
if (b->inserted)
ALL_BREAKPOINTS (b)
{
if (b->inserted)
@@
-1097,17
+1076,17
@@
reattach_breakpoints (pid)
val = target_insert_breakpoint (b->address, b->shadow_contents);
if (val != 0)
{
val = target_insert_breakpoint (b->address, b->shadow_contents);
if (val != 0)
{
- inferior_p
id = saved_inferior_p
id;
+ inferior_p
tid = saved_inferior_pt
id;
return val;
}
}
}
return val;
}
}
}
- inferior_p
id = saved_inferior_p
id;
+ inferior_p
tid = saved_inferior_pt
id;
return 0;
}
void
return 0;
}
void
-update_breakpoints_after_exec ()
+update_breakpoints_after_exec (
void
)
{
struct breakpoint *b;
struct breakpoint *temp;
{
struct breakpoint *b;
struct breakpoint *temp;
@@
-1222,18
+1201,17
@@
update_breakpoints_after_exec ()
}
int
}
int
-detach_breakpoints (pid)
- int pid;
+detach_breakpoints (int pid)
{
register struct breakpoint *b;
int val;
{
register struct breakpoint *b;
int val;
-
int saved_inferior_pid = inferior_p
id;
+
ptid_t saved_inferior_ptid = inferior_pt
id;
- if (pid ==
inferior_pid
)
- error ("Cannot detach breakpoints of inferior_pid");
+ if (pid ==
PIDGET (inferior_ptid)
)
+ error ("Cannot detach breakpoints of inferior_p
t
id");
- /* FIXME: use a cleanup, to insure that inferior_pid gets replaced! */
- inferior_p
id = pid;
/* Because remove_breakpoint will use this global. */
+ /* FIXME: use a cleanup, to insure that inferior_p
t
id gets replaced! */
+ inferior_p
tid = pid_to_ptid (pid);
/* Because remove_breakpoint will use this global. */
ALL_BREAKPOINTS (b)
{
if (b->inserted)
ALL_BREAKPOINTS (b)
{
if (b->inserted)
@@
-1241,19
+1219,17
@@
detach_breakpoints (pid)
val = remove_breakpoint (b, mark_inserted);
if (val != 0)
{
val = remove_breakpoint (b, mark_inserted);
if (val != 0)
{
- inferior_p
id = saved_inferior_p
id;
+ inferior_p
tid = saved_inferior_pt
id;
return val;
}
}
}
return val;
}
}
}
- inferior_p
id = saved_inferior_p
id;
+ inferior_p
tid = saved_inferior_pt
id;
return 0;
}
static int
return 0;
}
static int
-remove_breakpoint (b, is)
- struct breakpoint *b;
- insertion_state_t is;
+remove_breakpoint (struct breakpoint *b, insertion_state_t is)
{
int val;
{
int val;
@@
-1282,7
+1258,7
@@
remove_breakpoint (b, is)
/* Check to see if breakpoint is in an overlay section;
if so, we should remove the breakpoint at the LMA address.
If that is not equal to the raw address, then we should
/* Check to see if breakpoint is in an overlay section;
if so, we should remove the breakpoint at the LMA address.
If that is not equal to the raw address, then we should
- presumabl
e
remove the breakpoint there as well. */
+ presumabl
y
remove the breakpoint there as well. */
if (overlay_debugging && b->section &&
section_is_overlay (b->section))
{
if (overlay_debugging && b->section &&
section_is_overlay (b->section))
{
@@
-1371,13
+1347,13
@@
remove_breakpoint (b, is)
switch (b->type)
{
case bp_catch_fork:
switch (b->type)
{
case bp_catch_fork:
- val = target_remove_fork_catchpoint (
inferior_pid
);
+ val = target_remove_fork_catchpoint (
PIDGET (inferior_ptid)
);
break;
case bp_catch_vfork:
break;
case bp_catch_vfork:
- val = target_remove_vfork_catchpoint (
inferior_pid
);
+ val = target_remove_vfork_catchpoint (
PIDGET (inferior_ptid)
);
break;
case bp_catch_exec:
break;
case bp_catch_exec:
- val = target_remove_exec_catchpoint (
inferior_pid
);
+ val = target_remove_exec_catchpoint (
PIDGET (inferior_ptid)
);
break;
default:
warning ("Internal error, %s line %d.", __FILE__, __LINE__);
break;
default:
warning ("Internal error, %s line %d.", __FILE__, __LINE__);
@@
-1417,7
+1393,7
@@
remove_breakpoint (b, is)
/* Clear the "inserted" flag in all breakpoints. */
void
/* Clear the "inserted" flag in all breakpoints. */
void
-mark_breakpoints_out ()
+mark_breakpoints_out (
void
)
{
register struct breakpoint *b;
{
register struct breakpoint *b;
@@
-1438,8
+1414,7
@@
mark_breakpoints_out ()
void
void
-breakpoint_init_inferior (context)
- enum inf_context context;
+breakpoint_init_inferior (enum inf_context context)
{
register struct breakpoint *b, *temp;
static int warning_needed = 0;
{
register struct breakpoint *b, *temp;
static int warning_needed = 0;
@@
-1506,8
+1481,7
@@
breakpoint_init_inferior (context)
the target, to advance the PC past the breakpoint. */
enum breakpoint_here
the target, to advance the PC past the breakpoint. */
enum breakpoint_here
-breakpoint_here_p (pc)
- CORE_ADDR pc;
+breakpoint_here_p (CORE_ADDR pc)
{
register struct breakpoint *b;
int any_breakpoint_here = 0;
{
register struct breakpoint *b;
int any_breakpoint_here = 0;
@@
-1536,8
+1510,7
@@
breakpoint_here_p (pc)
at PC. */
int
at PC. */
int
-breakpoint_inserted_here_p (pc)
- CORE_ADDR pc;
+breakpoint_inserted_here_p (CORE_ADDR pc)
{
register struct breakpoint *b;
{
register struct breakpoint *b;
@@
-1563,8
+1536,7
@@
breakpoint_inserted_here_p (pc)
bp_call_dummy breakpoint. */
int
bp_call_dummy breakpoint. */
int
-frame_in_dummy (frame)
- struct frame_info *frame;
+frame_in_dummy (struct frame_info *frame)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-1589,18
+1561,16
@@
frame_in_dummy (frame)
return 0;
}
return 0;
}
-/* breakpoint_
match_thread (PC, PID) returns true if the breakpoint at PC
- is valid for process/thread PID. */
+/* breakpoint_
thread_match (PC, PID) returns true if the breakpoint at
+
PC
is valid for process/thread PID. */
int
int
-breakpoint_thread_match (pc, pid)
- CORE_ADDR pc;
- int pid;
+breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid)
{
struct breakpoint *b;
int thread;
{
struct breakpoint *b;
int thread;
- thread = pid_to_thread_id (pid);
+ thread = pid_to_thread_id (p
t
id);
ALL_BREAKPOINTS (b)
if (b->enable != disabled
ALL_BREAKPOINTS (b)
if (b->enable != disabled
@@
-1625,8
+1595,7
@@
breakpoint_thread_match (pc, pid)
in breakpoint.h. */
int
in breakpoint.h. */
int
-ep_is_catchpoint (ep)
- struct breakpoint *ep;
+ep_is_catchpoint (struct breakpoint *ep)
{
return
(ep->type == bp_catch_load)
{
return
(ep->type == bp_catch_load)
@@
-1635,39
+1604,32
@@
ep_is_catchpoint (ep)
|| (ep->type == bp_catch_vfork)
|| (ep->type == bp_catch_exec)
|| (ep->type == bp_catch_catch)
|| (ep->type == bp_catch_vfork)
|| (ep->type == bp_catch_exec)
|| (ep->type == bp_catch_catch)
- || (ep->type == bp_catch_throw)
-
+ || (ep->type == bp_catch_throw);
/* ??rehrauer: Add more kinds here, as are implemented... */
/* ??rehrauer: Add more kinds here, as are implemented... */
- ;
}
int
}
int
-ep_is_shlib_catchpoint (ep)
- struct breakpoint *ep;
+ep_is_shlib_catchpoint (struct breakpoint *ep)
{
return
(ep->type == bp_catch_load)
{
return
(ep->type == bp_catch_load)
- || (ep->type == bp_catch_unload)
- ;
+ || (ep->type == bp_catch_unload);
}
int
}
int
-ep_is_exception_catchpoint (ep)
- struct breakpoint *ep;
+ep_is_exception_catchpoint (struct breakpoint *ep)
{
return
(ep->type == bp_catch_catch)
{
return
(ep->type == bp_catch_catch)
- || (ep->type == bp_catch_throw)
- ;
+ || (ep->type == bp_catch_throw);
}
/* Clear a bpstat so that it says we are not at any breakpoint.
Also free any storage that is part of a bpstat. */
void
}
/* Clear a bpstat so that it says we are not at any breakpoint.
Also free any storage that is part of a bpstat. */
void
-bpstat_clear (bsp)
- bpstat *bsp;
+bpstat_clear (bpstat *bsp)
{
bpstat p;
bpstat q;
{
bpstat p;
bpstat q;
@@
-1680,7
+1642,7
@@
bpstat_clear (bsp)
q = p->next;
if (p->old_val != NULL)
value_free (p->old_val);
q = p->next;
if (p->old_val != NULL)
value_free (p->old_val);
-
free ((PTR)
p);
+
xfree (
p);
p = q;
}
*bsp = NULL;
p = q;
}
*bsp = NULL;
@@
-1690,8
+1652,7
@@
bpstat_clear (bsp)
is part of the bpstat is copied as well. */
bpstat
is part of the bpstat is copied as well. */
bpstat
-bpstat_copy (bs)
- bpstat bs;
+bpstat_copy (bpstat bs)
{
bpstat p = NULL;
bpstat tmp;
{
bpstat p = NULL;
bpstat tmp;
@@
-1718,9
+1679,7
@@
bpstat_copy (bs)
/* Find the bpstat associated with this breakpoint */
bpstat
/* Find the bpstat associated with this breakpoint */
bpstat
-bpstat_find_breakpoint (bsp, breakpoint)
- bpstat bsp;
- struct breakpoint *breakpoint;
+bpstat_find_breakpoint (bpstat bsp, struct breakpoint *breakpoint)
{
if (bsp == NULL)
return NULL;
{
if (bsp == NULL)
return NULL;
@@
-1742,8
+1701,7
@@
bpstat_find_breakpoint (bsp, breakpoint)
See wait_for_inferior's use of this function. */
struct breakpoint *
See wait_for_inferior's use of this function. */
struct breakpoint *
-bpstat_find_step_resume_breakpoint (bsp)
- bpstat bsp;
+bpstat_find_step_resume_breakpoint (bpstat bsp)
{
if (bsp == NULL)
error ("Internal error (bpstat_find_step_resume_breakpoint)");
{
if (bsp == NULL)
error ("Internal error (bpstat_find_step_resume_breakpoint)");
@@
-1766,8
+1724,7
@@
bpstat_find_step_resume_breakpoint (bsp)
Return 0 if passed a bpstat which does not indicate any breakpoints. */
int
Return 0 if passed a bpstat which does not indicate any breakpoints. */
int
-bpstat_num (bsp)
- bpstat *bsp;
+bpstat_num (bpstat *bsp)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-1787,8
+1744,7
@@
bpstat_num (bsp)
/* Modify BS so that the actions will not be performed. */
void
/* Modify BS so that the actions will not be performed. */
void
-bpstat_clear_actions (bs)
- bpstat bs;
+bpstat_clear_actions (bpstat bs)
{
for (; bs != NULL; bs = bs->next)
{
{
for (; bs != NULL; bs = bs->next)
{
@@
-1804,8
+1760,7
@@
bpstat_clear_actions (bs)
/* Stub for cleaning up our state if we error-out of a breakpoint command */
/* ARGSUSED */
static void
/* Stub for cleaning up our state if we error-out of a breakpoint command */
/* ARGSUSED */
static void
-cleanup_executing_breakpoints (ignore)
- PTR ignore;
+cleanup_executing_breakpoints (PTR ignore)
{
executing_breakpoint_commands = 0;
}
{
executing_breakpoint_commands = 0;
}
@@
-1816,8
+1771,7
@@
cleanup_executing_breakpoints (ignore)
the global "breakpoint_proceeded" after each command. */
void
the global "breakpoint_proceeded" after each command. */
void
-bpstat_do_actions (bsp)
- bpstat *bsp;
+bpstat_do_actions (bpstat *bsp)
{
bpstat bs;
struct cleanup *old_chain;
{
bpstat bs;
struct cleanup *old_chain;
@@
-1892,8
+1846,7
@@
top:
analysis. */
static enum print_stop_action
analysis. */
static enum print_stop_action
-print_it_typical (bs)
- bpstat bs;
+print_it_typical (bpstat bs)
{
#ifdef UI_OUT
struct cleanup *old_chain;
{
#ifdef UI_OUT
struct cleanup *old_chain;
@@
-2127,8
+2080,8
@@
print_it_typical (bs)
{
mention (bs->breakpoint_at);
if (interpreter_p && strcmp (interpreter_p, "mi") == 0)
{
mention (bs->breakpoint_at);
if (interpreter_p && strcmp (interpreter_p, "mi") == 0)
- ui_out_
list_begin (uiout, "value
");
- ui_out_
field_string (uiout, "reason", "access-watchpoint-trigger
");
+ ui_out_
field_string (uiout, "reason", "access-watchpoint-trigger
");
+ ui_out_
list_begin (uiout, "value
");
ui_out_text (uiout, "\nValue = ");
}
value_print (bs->breakpoint_at->val, stb->stream, 0,Val_pretty_default);
ui_out_text (uiout, "\nValue = ");
}
value_print (bs->breakpoint_at->val, stb->stream, 0,Val_pretty_default);
@@
-2216,7
+2169,8
@@
print_bp_stop_message (bpstat bs)
return print_it_typical (bs);
break;
default:
return print_it_typical (bs);
break;
default:
- internal_error ("print_bp_stop_message: unrecognized enum value");
+ internal_error (__FILE__, __LINE__,
+ "print_bp_stop_message: unrecognized enum value");
break;
}
}
break;
}
}
@@
-2242,8
+2196,7
@@
print_bp_stop_message (bpstat bs)
further info to be printed.*/
enum print_stop_action
further info to be printed.*/
enum print_stop_action
-bpstat_print (bs)
- bpstat bs;
+bpstat_print (bpstat bs)
{
int val;
{
int val;
@@
-2271,8
+2224,7
@@
bpstat_print (bs)
make it pass through catch_errors. */
static int
make it pass through catch_errors. */
static int
-breakpoint_cond_eval (exp)
- PTR exp;
+breakpoint_cond_eval (PTR exp)
{
value_ptr mark = value_mark ();
int i = !value_true (evaluate_expression ((struct expression *) exp));
{
value_ptr mark = value_mark ();
int i = !value_true (evaluate_expression ((struct expression *) exp));
@@
-2283,9
+2235,7
@@
breakpoint_cond_eval (exp)
/* Allocate a new bpstat and chain it to the current one. */
static bpstat
/* 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_alloc (struct breakpoint *b, bpstat cbs /* Current "bs" value */ )
{
bpstat bs;
{
bpstat bs;
@@
-2314,8
+2264,7
@@
bpstat_alloc (b, cbs)
/* Check watchpoint condition. */
static int
/* Check watchpoint condition. */
static int
-watchpoint_check (p)
- PTR p;
+watchpoint_check (PTR p)
{
bpstat bs = (bpstat) p;
struct breakpoint *b;
{
bpstat bs = (bpstat) p;
struct breakpoint *b;
@@
-2423,9
+2372,7
@@
which its expression is valid.\n", bs->breakpoint_at->number);
commands, FIXME??? fields. */
bpstat
commands, FIXME??? fields. */
bpstat
-bpstat_stop_status (pc, not_a_breakpoint)
- CORE_ADDR *pc;
- int not_a_breakpoint;
+bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
{
register struct breakpoint *b, *temp;
CORE_ADDR bp_addr;
{
register struct breakpoint *b, *temp;
CORE_ADDR bp_addr;
@@
-2440,7
+2387,7
@@
bpstat_stop_status (pc, not_a_breakpoint)
char message[sizeof (message1) + 30 /* slop */ ];
/* Get the address where the breakpoint would have been. */
char message[sizeof (message1) + 30 /* slop */ ];
/* Get the address where the breakpoint would have been. */
- bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P ?
+ bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P
()
?
0 : DECR_PC_AFTER_BREAK);
ALL_BREAKPOINTS_SAFE (b, temp)
0 : DECR_PC_AFTER_BREAK);
ALL_BREAKPOINTS_SAFE (b, temp)
@@
-2475,10
+2422,11
@@
bpstat_stop_status (pc, not_a_breakpoint)
ignore it. */
if ((b->type == bp_catch_load)
#if defined(SOLIB_HAVE_LOAD_EVENT)
ignore it. */
if ((b->type == bp_catch_load)
#if defined(SOLIB_HAVE_LOAD_EVENT)
- && (!SOLIB_HAVE_LOAD_EVENT (
inferior_pid
)
+ && (!SOLIB_HAVE_LOAD_EVENT (
PIDGET (inferior_ptid)
)
|| ((b->dll_pathname != NULL)
&& (strcmp (b->dll_pathname,
|| ((b->dll_pathname != NULL)
&& (strcmp (b->dll_pathname,
- SOLIB_LOADED_LIBRARY_PATHNAME (inferior_pid))
+ SOLIB_LOADED_LIBRARY_PATHNAME (
+ PIDGET (inferior_ptid)))
!= 0)))
#endif
)
!= 0)))
#endif
)
@@
-2486,25
+2434,28
@@
bpstat_stop_status (pc, not_a_breakpoint)
if ((b->type == bp_catch_unload)
#if defined(SOLIB_HAVE_UNLOAD_EVENT)
if ((b->type == bp_catch_unload)
#if defined(SOLIB_HAVE_UNLOAD_EVENT)
- && (!SOLIB_HAVE_UNLOAD_EVENT (
inferior_pid
)
+ && (!SOLIB_HAVE_UNLOAD_EVENT (
PIDGET (inferior_ptid)
)
|| ((b->dll_pathname != NULL)
&& (strcmp (b->dll_pathname,
|| ((b->dll_pathname != NULL)
&& (strcmp (b->dll_pathname,
- SOLIB_UNLOADED_LIBRARY_PATHNAME (inferior_pid))
+ SOLIB_UNLOADED_LIBRARY_PATHNAME (
+ PIDGET (inferior_ptid)))
!= 0)))
#endif
)
continue;
if ((b->type == bp_catch_fork)
!= 0)))
#endif
)
continue;
if ((b->type == bp_catch_fork)
- && !target_has_forked (inferior_pid, &b->forked_inferior_pid))
+ && !target_has_forked (PIDGET (inferior_ptid),
+ &b->forked_inferior_pid))
continue;
if ((b->type == bp_catch_vfork)
continue;
if ((b->type == bp_catch_vfork)
- && !target_has_vforked (inferior_pid, &b->forked_inferior_pid))
+ && !target_has_vforked (PIDGET (inferior_ptid),
+ &b->forked_inferior_pid))
continue;
if ((b->type == bp_catch_exec)
continue;
if ((b->type == bp_catch_exec)
- && !target_has_execd (
inferior_pid
, &b->exec_pathname))
+ && !target_has_execd (
PIDGET (inferior_ptid)
, &b->exec_pathname))
continue;
if (ep_is_exception_catchpoint (b) &&
continue;
if (ep_is_exception_catchpoint (b) &&
@@
-2743,8
+2694,7
@@
bpstat_stop_status (pc, not_a_breakpoint)
\f
/* Tell what to do about this bpstat. */
struct bpstat_what
\f
/* Tell what to do about this bpstat. */
struct bpstat_what
-bpstat_what (bs)
- bpstat bs;
+bpstat_what (bpstat bs)
{
/* Classify each bpstat as one of the following. */
enum class
{
/* Classify each bpstat as one of the following. */
enum class
@@
-2823,7
+2773,7
@@
bpstat_what (bs)
back and decide something of a lower priority is better. The
ordering is:
back and decide something of a lower priority is better. The
ordering is:
- kc < clr sgl shl slr sn sr ss ts
+ kc < clr sgl shl s
hlr s
lr sn sr ss ts
sgl < clrs shl shlr slr sn sr ss ts
slr < err shl shlr sn sr ss ts
clr < clrs err shl shlr sn sr ss ts
sgl < clrs shl shlr slr sn sr ss ts
slr < err shl shlr sn sr ss ts
clr < clrs err shl shlr sn sr ss ts
@@
-2868,7
+2818,7
@@
bpstat_what (bs)
/*bp_noisy */
{sn, sn, sn, sn, sn, sn, sn, sr, ts, shl, shlr},
/*long_jump */
/*bp_noisy */
{sn, sn, sn, sn, sn, sn, sn, sr, ts, shl, shlr},
/*long_jump */
- {slr, ss, sn, slr,
er
r, err, err, sr, ts, shl, shlr},
+ {slr, ss, sn, slr,
sl
r, err, err, sr, ts, shl, shlr},
/*long_resume */
{clr, ss, sn, clrs, err, err, err, sr, ts, shl, shlr},
/*step_resume */
/*long_resume */
{clr, ss, sn, clrs, err, err, err, sr, ts, shl, shlr},
/*step_resume */
@@
-3021,18
+2971,18
@@
bpstat_what (bs)
just to things like whether watchpoints are set. */
int
just to things like whether watchpoints are set. */
int
-bpstat_should_step ()
+bpstat_should_step (
void
)
{
struct breakpoint *b;
ALL_BREAKPOINTS (b)
if (b->enable == enabled && b->type == bp_watchpoint)
{
struct breakpoint *b;
ALL_BREAKPOINTS (b)
if (b->enable == enabled && b->type == bp_watchpoint)
- return 1;
+
return 1;
return 0;
}
/* Nonzero if there are enabled hardware watchpoints. */
int
return 0;
}
/* Nonzero if there are enabled hardware watchpoints. */
int
-bpstat_have_active_hw_watchpoints ()
+bpstat_have_active_hw_watchpoints (
void
)
{
struct breakpoint *b;
ALL_BREAKPOINTS (b)
{
struct breakpoint *b;
ALL_BREAKPOINTS (b)
@@
-3041,7
+2991,7
@@
bpstat_have_active_hw_watchpoints ()
((b->type == bp_hardware_watchpoint) ||
(b->type == bp_read_watchpoint) ||
(b->type == bp_access_watchpoint)))
((b->type == bp_hardware_watchpoint) ||
(b->type == bp_read_watchpoint) ||
(b->type == bp_access_watchpoint)))
- return 1;
+
return 1;
return 0;
}
\f
return 0;
}
\f
@@
-3050,9
+3000,7
@@
bpstat_have_active_hw_watchpoints ()
function returns another bpstat which contains only the catchpoints
on that first list, if any. */
void
function returns another bpstat which contains only the catchpoints
on that first list, if any. */
void
-bpstat_get_triggered_catchpoints (ep_list, cp_list)
- bpstat ep_list;
- bpstat *cp_list;
+bpstat_get_triggered_catchpoints (bpstat ep_list, bpstat *cp_list)
{
struct bpstats root_bs[1];
bpstat bs = root_bs;
{
struct bpstats root_bs[1];
bpstat bs = root_bs;
@@
-3088,11
+3036,13
@@
bpstat_get_triggered_catchpoints (ep_list, cp_list)
catchpoint triggers. Clients who may wish to know the name
later must get it from the catchpoint itself.) */
if (ep->triggered_dll_pathname != NULL)
catchpoint triggers. Clients who may wish to know the name
later must get it from the catchpoint itself.) */
if (ep->triggered_dll_pathname != NULL)
- free (ep->triggered_dll_pathname);
+
x
free (ep->triggered_dll_pathname);
if (ep->type == bp_catch_load)
if (ep->type == bp_catch_load)
- dll_pathname = SOLIB_LOADED_LIBRARY_PATHNAME (inferior_pid);
+ dll_pathname = SOLIB_LOADED_LIBRARY_PATHNAME (
+ PIDGET (inferior_ptid));
else
else
- dll_pathname = SOLIB_UNLOADED_LIBRARY_PATHNAME (inferior_pid);
+ dll_pathname = SOLIB_UNLOADED_LIBRARY_PATHNAME (
+ PIDGET (inferior_ptid));
#else
dll_pathname = NULL;
#endif
#else
dll_pathname = NULL;
#endif
@@
-3175,7
+3125,8
@@
print_one_breakpoint (struct breakpoint *b,
annotate_field (1);
if (((int) b->type > (sizeof (bptypes) / sizeof (bptypes[0])))
|| ((int) b->type != bptypes[(int) b->type].type))
annotate_field (1);
if (((int) b->type > (sizeof (bptypes) / sizeof (bptypes[0])))
|| ((int) b->type != bptypes[(int) b->type].type))
- internal_error ("bptypes table does not describe type #%d.",
+ internal_error (__FILE__, __LINE__,
+ "bptypes table does not describe type #%d.",
(int) b->type);
#ifdef UI_OUT
ui_out_field_string (uiout, "type", bptypes[(int) b->type].description);
(int) b->type);
#ifdef UI_OUT
ui_out_field_string (uiout, "type", bptypes[(int) b->type].description);
@@
-3203,11
+3154,17
@@
print_one_breakpoint (struct breakpoint *b,
/* 5 and 6 */
strcpy (wrap_indent, " ");
if (addressprint)
/* 5 and 6 */
strcpy (wrap_indent, " ");
if (addressprint)
- strcat (wrap_indent, " ");
+ {
+ if (TARGET_ADDR_BIT <= 32)
+ strcat (wrap_indent, " ");
+ else
+ strcat (wrap_indent, " ");
+ }
switch (b->type)
{
case bp_none:
switch (b->type)
{
case bp_none:
- internal_error ("print_one_breakpoint: bp_none encountered\n");
+ internal_error (__FILE__, __LINE__,
+ "print_one_breakpoint: bp_none encountered\n");
break;
case bp_watchpoint:
break;
case bp_watchpoint:
@@
-3376,13
+3333,18
@@
print_one_breakpoint (struct breakpoint *b,
#else
if (addressprint)
{
#else
if (addressprint)
{
+ char *tmp;
+
annotate_field (4);
annotate_field (4);
- /* FIXME-32x64: need a print_address_numeric with
- field width */
- printf_filtered
- ("%s ",
- local_hex_string_custom
- ((unsigned long) b->address, "08l"));
+
+ if (TARGET_ADDR_BIT <= 32)
+ tmp = longest_local_hex_string_custom (b->address
+ & (CORE_ADDR) 0xffffffff,
+ "08l");
+ else
+ tmp = longest_local_hex_string_custom (b->address, "016l");
+
+ printf_filtered ("%s ", tmp);
}
annotate_field (5);
*last_addr = b->address;
}
annotate_field (5);
*last_addr = b->address;
@@
-3567,9
+3529,7
@@
gdb_breakpoint_query (/* output object, */ int bnum)
is nonzero, process only watchpoints. */
static void
is nonzero, process only watchpoints. */
static void
-breakpoint_1 (bnum, allflag)
- int bnum;
- int allflag;
+breakpoint_1 (int bnum, int allflag)
{
register struct breakpoint *b;
CORE_ADDR last_addr = (CORE_ADDR) -1;
{
register struct breakpoint *b;
CORE_ADDR last_addr = (CORE_ADDR) -1;
@@
-3619,7
+3579,10
@@
breakpoint_1 (bnum, allflag)
if (addressprint)
{
annotate_field (4);
if (addressprint)
{
annotate_field (4);
- ui_out_table_header (uiout, 10, ui_left, "Address"); /* 5 */
+ if (TARGET_ADDR_BIT <= 32)
+ ui_out_table_header (uiout, 10, ui_left, "Address"); /* 5 */
+ else
+ ui_out_table_header (uiout, 18, ui_left, "Address"); /* 5 */
}
annotate_field (5);
ui_out_table_header (uiout, 40, ui_noalign, "What"); /* 6 */
}
annotate_field (5);
ui_out_table_header (uiout, 40, ui_noalign, "What"); /* 6 */
@@
-3636,7
+3599,10
@@
breakpoint_1 (bnum, allflag)
if (addressprint)
{
annotate_field (4);
if (addressprint)
{
annotate_field (4);
- printf_filtered ("Address ");
+ if (TARGET_ADDR_BIT <= 32)
+ printf_filtered ("Address ");
+ else
+ printf_filtered ("Address ");
}
annotate_field (5);
printf_filtered ("What\n");
}
annotate_field (5);
printf_filtered ("What\n");
@@
-3680,28
+3646,24
@@
breakpoint_1 (bnum, allflag)
/* ARGSUSED */
static void
/* ARGSUSED */
static void
-breakpoints_info (bnum_exp, from_tty)
- char *bnum_exp;
- int from_tty;
+breakpoints_info (char *bnum_exp, int from_tty)
{
int bnum = -1;
if (bnum_exp)
{
int bnum = -1;
if (bnum_exp)
- bnum = parse_and_eval_
address
(bnum_exp);
+ bnum = parse_and_eval_
long
(bnum_exp);
breakpoint_1 (bnum, 0);
}
/* ARGSUSED */
static void
breakpoint_1 (bnum, 0);
}
/* ARGSUSED */
static void
-maintenance_info_breakpoints (bnum_exp, from_tty)
- char *bnum_exp;
- int from_tty;
+maintenance_info_breakpoints (char *bnum_exp, int from_tty)
{
int bnum = -1;
if (bnum_exp)
{
int bnum = -1;
if (bnum_exp)
- bnum = parse_and_eval_
address
(bnum_exp);
+ bnum = parse_and_eval_
long
(bnum_exp);
breakpoint_1 (bnum, 1);
}
breakpoint_1 (bnum, 1);
}
@@
-3709,9
+3671,7
@@
maintenance_info_breakpoints (bnum_exp, from_tty)
/* Print a message describing any breakpoints set at PC. */
static void
/* Print a message describing any breakpoints set at PC. */
static void
-describe_other_breakpoints (pc, section)
- CORE_ADDR pc;
- asection *section;
+describe_other_breakpoints (CORE_ADDR pc, asection *section)
{
register int others = 0;
register struct breakpoint *b;
{
register int others = 0;
register struct breakpoint *b;
@@
-3730,15
+3690,15
@@
describe_other_breakpoints (pc, section)
b->section == section)
{
others--;
b->section == section)
{
others--;
- printf_filtered
-
("%d%s%s "
,
- b->number,
-
((b->enable ==
disabled ||
- b->enable == shlib_disabled ||
- b->enable == call_disabled) ? " (disabled)"
- : b->enable == permanent ? " (permanent)"
- : ""),
-
(others > 1) ? ","
: ((others == 1) ? " and" : ""));
+ printf_filtered
("%d%s%s ",
+
b->number
,
+ ((b->enable == disabled ||
+
b->enable == shlib_
disabled ||
+ b->enable == call_disabled) ? " (disabled)"
+ : b->enable == permanent ? " (permanent)"
+ : ""),
+ (others > 1) ? ","
+
: ((others == 1) ? " and" : ""));
}
printf_filtered ("also set at pc ");
print_address_numeric (pc, 1, gdb_stdout);
}
printf_filtered ("also set at pc ");
print_address_numeric (pc, 1, gdb_stdout);
@@
-3750,11
+3710,8
@@
describe_other_breakpoints (pc, section)
for the `break' command with no arguments. */
void
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;
+set_default_breakpoint (int valid, CORE_ADDR addr, struct symtab *symtab,
+ int line)
{
default_breakpoint_valid = valid;
default_breakpoint_address = addr;
{
default_breakpoint_valid = valid;
default_breakpoint_address = addr;
@@
-3769,9
+3726,7
@@
set_default_breakpoint (valid, addr, symtab, line)
the official one, and the rest as duplicates. */
static void
the official one, and the rest as duplicates. */
static void
-check_duplicates (address, section)
- CORE_ADDR address;
- asection *section;
+check_duplicates (CORE_ADDR address, asection *section)
{
register struct breakpoint *b;
register int count = 0;
{
register struct breakpoint *b;
register int count = 0;
@@
-3807,14
+3762,16
@@
check_duplicates (address, section)
/* Permanent breakpoint should always be inserted. */
if (! perm_bp->inserted)
/* Permanent breakpoint should always be inserted. */
if (! perm_bp->inserted)
- internal_error ("allegedly permanent breakpoint is not "
+ internal_error (__FILE__, __LINE__,
+ "allegedly permanent breakpoint is not "
"actually inserted");
ALL_BREAKPOINTS (b)
if (b != perm_bp)
{
if (b->inserted)
"actually inserted");
ALL_BREAKPOINTS (b)
if (b != perm_bp)
{
if (b->inserted)
- internal_error ("another breakpoint was inserted on top of "
+ internal_error (__FILE__, __LINE__,
+ "another breakpoint was inserted on top of "
"a permanent breakpoint");
if (b->enable != disabled
"a permanent breakpoint");
if (b->enable != disabled
@@
-3838,8
+3795,7
@@
check_duplicates (address, section)
your arguments BEFORE calling this routine! */
struct breakpoint *
your arguments BEFORE calling this routine! */
struct breakpoint *
-set_raw_breakpoint (sal)
- struct symtab_and_line sal;
+set_raw_breakpoint (struct symtab_and_line sal)
{
register struct breakpoint *b, *b1;
{
register struct breakpoint *b, *b1;
@@
-3902,8
+3858,7
@@
make_breakpoint_permanent (struct breakpoint *b)
#ifdef GET_LONGJMP_TARGET
static void
#ifdef GET_LONGJMP_TARGET
static void
-create_longjmp_breakpoint (func_name)
- char *func_name;
+create_longjmp_breakpoint (char *func_name)
{
struct symtab_and_line sal;
struct breakpoint *b;
{
struct symtab_and_line sal;
struct breakpoint *b;
@@
-3930,7
+3885,7
@@
create_longjmp_breakpoint (func_name)
b->enable = disabled;
b->silent = 1;
if (func_name)
b->enable = disabled;
b->silent = 1;
if (func_name)
- b->addr_string =
strsave
(func_name);
+ b->addr_string =
xstrdup
(func_name);
b->number = internal_breakpoint_number--;
}
b->number = internal_breakpoint_number--;
}
@@
-3941,7
+3896,7
@@
create_longjmp_breakpoint (func_name)
set_longjmp_resume_breakpoint() to figure out where we are going. */
void
set_longjmp_resume_breakpoint() to figure out where we are going. */
void
-enable_longjmp_breakpoint ()
+enable_longjmp_breakpoint (
void
)
{
register struct breakpoint *b;
{
register struct breakpoint *b;
@@
-3954,7
+3909,7
@@
enable_longjmp_breakpoint ()
}
void
}
void
-disable_longjmp_breakpoint ()
+disable_longjmp_breakpoint (
void
)
{
register struct breakpoint *b;
{
register struct breakpoint *b;
@@
-3968,8
+3923,7
@@
disable_longjmp_breakpoint ()
}
struct breakpoint *
}
struct breakpoint *
-create_thread_event_breakpoint (address)
- CORE_ADDR address;
+create_thread_event_breakpoint (CORE_ADDR address)
{
struct breakpoint *b;
struct symtab_and_line sal;
{
struct breakpoint *b;
struct symtab_and_line sal;
@@
-3988,7
+3942,7
@@
create_thread_event_breakpoint (address)
b->enable = enabled;
/* addr_string has to be used or breakpoint_re_set will delete me. */
sprintf (addr_string, "*0x%s", paddr (b->address));
b->enable = enabled;
/* addr_string has to be used or breakpoint_re_set will delete me. */
sprintf (addr_string, "*0x%s", paddr (b->address));
- b->addr_string =
strsave
(addr_string);
+ b->addr_string =
xstrdup
(addr_string);
return b;
}
return b;
}
@@
-4005,18
+3959,17
@@
remove_thread_event_breakpoints (void)
#ifdef SOLIB_ADD
void
#ifdef SOLIB_ADD
void
-remove_solib_event_breakpoints ()
+remove_solib_event_breakpoints (
void
)
{
register struct breakpoint *b, *temp;
ALL_BREAKPOINTS_SAFE (b, temp)
if (b->type == bp_shlib_event)
{
register struct breakpoint *b, *temp;
ALL_BREAKPOINTS_SAFE (b, temp)
if (b->type == bp_shlib_event)
- delete_breakpoint (b);
+
delete_breakpoint (b);
}
struct breakpoint *
}
struct breakpoint *
-create_solib_event_breakpoint (address)
- CORE_ADDR address;
+create_solib_event_breakpoint (CORE_ADDR address)
{
struct breakpoint *b;
struct symtab_and_line sal;
{
struct breakpoint *b;
struct symtab_and_line sal;
@@
-4036,8
+3989,7
@@
create_solib_event_breakpoint (address)
apply to enabled breakpoints, disabled ones can just stay disabled. */
void
apply to enabled breakpoints, disabled ones can just stay disabled. */
void
-disable_breakpoints_in_shlibs (silent)
- int silent;
+disable_breakpoints_in_shlibs (int silent)
{
struct breakpoint *b;
int disabled_shlib_breaks = 0;
{
struct breakpoint *b;
int disabled_shlib_breaks = 0;
@@
-4070,7
+4022,7
@@
disable_breakpoints_in_shlibs (silent)
/* Try to reenable any breakpoints in shared libraries. */
void
/* Try to reenable any breakpoints in shared libraries. */
void
-re_enable_breakpoints_in_shlibs ()
+re_enable_breakpoints_in_shlibs (
void
)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-4089,12
+4041,8
@@
re_enable_breakpoints_in_shlibs ()
#endif
static void
#endif
static void
-solib_load_unload_1 (hookname, tempflag, dll_pathname, cond_string, bp_kind)
- char *hookname;
- int tempflag;
- char *dll_pathname;
- char *cond_string;
- enum bptype bp_kind;
+solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname,
+ char *cond_string, enum bptype bp_kind)
{
struct breakpoint *b;
struct symtabs_and_lines sals;
{
struct breakpoint *b;
struct symtabs_and_lines sals;
@@
-4125,13
+4073,13
@@
solib_load_unload_1 (hookname, tempflag, dll_pathname, cond_string, bp_kind)
/* Make sure that all storage allocated in decode_line_1 gets freed
in case the following errors out. */
/* Make sure that all storage allocated in decode_line_1 gets freed
in case the following errors out. */
- old_chain = make_cleanup (free, sals.sals);
+ old_chain = make_cleanup (
x
free, sals.sals);
if (canonical != (char **) NULL)
{
if (canonical != (char **) NULL)
{
- make_cleanup (free, canonical);
+ make_cleanup (
x
free, canonical);
canonical_strings_chain = make_cleanup (null_cleanup, 0);
if (canonical[0] != NULL)
canonical_strings_chain = make_cleanup (null_cleanup, 0);
if (canonical[0] != NULL)
- make_cleanup (free, canonical[0]);
+ make_cleanup (
x
free, canonical[0]);
}
resolve_sal_pc (&sals.sals[0]);
}
resolve_sal_pc (&sals.sals[0]);
@@
-4170,34
+4118,24
@@
solib_load_unload_1 (hookname, tempflag, dll_pathname, cond_string, bp_kind)
}
void
}
void
-create_solib_load_event_breakpoint (hookname, tempflag,
- dll_pathname, cond_string)
- char *hookname;
- int tempflag;
- char *dll_pathname;
- char *cond_string;
+create_solib_load_event_breakpoint (char *hookname, int tempflag,
+ char *dll_pathname, char *cond_string)
{
solib_load_unload_1 (hookname, tempflag, dll_pathname,
cond_string, bp_catch_load);
}
void
{
solib_load_unload_1 (hookname, tempflag, dll_pathname,
cond_string, bp_catch_load);
}
void
-create_solib_unload_event_breakpoint (hookname, tempflag,
- dll_pathname, cond_string)
- char *hookname;
- int tempflag;
- char *dll_pathname;
- char *cond_string;
+create_solib_unload_event_breakpoint (char *hookname, int tempflag,
+ char *dll_pathname, char *cond_string)
{
solib_load_unload_1 (hookname,tempflag, dll_pathname,
cond_string, bp_catch_unload);
}
static void
{
solib_load_unload_1 (hookname,tempflag, dll_pathname,
cond_string, bp_catch_unload);
}
static void
-create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_kind)
- int tempflag;
- char *cond_string;
- enum bptype bp_kind;
+create_fork_vfork_event_catchpoint (int tempflag, char *cond_string,
+ enum bptype bp_kind)
{
struct symtab_and_line sal;
struct breakpoint *b;
{
struct symtab_and_line sal;
struct breakpoint *b;
@@
-4226,25
+4164,19
@@
create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_kind)
}
void
}
void
-create_fork_event_catchpoint (tempflag, cond_string)
- int tempflag;
- char *cond_string;
+create_fork_event_catchpoint (int tempflag, char *cond_string)
{
create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_catch_fork);
}
void
{
create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_catch_fork);
}
void
-create_vfork_event_catchpoint (tempflag, cond_string)
- int tempflag;
- char *cond_string;
+create_vfork_event_catchpoint (int tempflag, char *cond_string)
{
create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_catch_vfork);
}
void
{
create_fork_vfork_event_catchpoint (tempflag, cond_string, bp_catch_vfork);
}
void
-create_exec_event_catchpoint (tempflag, cond_string)
- int tempflag;
- char *cond_string;
+create_exec_event_catchpoint (int tempflag, char *cond_string)
{
struct symtab_and_line sal;
struct breakpoint *b;
{
struct symtab_and_line sal;
struct breakpoint *b;
@@
-4272,7
+4204,7
@@
create_exec_event_catchpoint (tempflag, cond_string)
}
static int
}
static int
-hw_breakpoint_used_count ()
+hw_breakpoint_used_count (
void
)
{
register struct breakpoint *b;
int i = 0;
{
register struct breakpoint *b;
int i = 0;
@@
-4287,9
+4219,7
@@
hw_breakpoint_used_count ()
}
static int
}
static int
-hw_watchpoint_used_count (type, other_type_used)
- enum bptype type;
- int *other_type_used;
+hw_watchpoint_used_count (enum bptype type, int *other_type_used)
{
register struct breakpoint *b;
int i = 0;
{
register struct breakpoint *b;
int i = 0;
@@
-4318,9
+4248,7
@@
hw_watchpoint_used_count (type, other_type_used)
that gets deleted automatically... */
void
that gets deleted automatically... */
void
-set_longjmp_resume_breakpoint (pc, frame)
- CORE_ADDR pc;
- struct frame_info *frame;
+set_longjmp_resume_breakpoint (CORE_ADDR pc, struct frame_info *frame)
{
register struct breakpoint *b;
{
register struct breakpoint *b;
@@
-4339,7
+4267,7
@@
set_longjmp_resume_breakpoint (pc, frame)
}
void
}
void
-disable_watchpoints_before_interactive_call_start ()
+disable_watchpoints_before_interactive_call_start (
void
)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-4359,7
+4287,7
@@
disable_watchpoints_before_interactive_call_start ()
}
void
}
void
-enable_watchpoints_after_interactive_call_stop ()
+enable_watchpoints_after_interactive_call_stop (
void
)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-4384,10
+4312,8
@@
enable_watchpoints_after_interactive_call_stop ()
Restrict it to frame FRAME if FRAME is nonzero. */
struct breakpoint *
Restrict it to frame FRAME if FRAME is nonzero. */
struct breakpoint *
-set_momentary_breakpoint (sal, frame, type)
- struct symtab_and_line sal;
- struct frame_info *frame;
- enum bptype type;
+set_momentary_breakpoint (struct symtab_and_line sal, struct frame_info *frame,
+ enum bptype type)
{
register struct breakpoint *b;
b = set_raw_breakpoint (sal);
{
register struct breakpoint *b;
b = set_raw_breakpoint (sal);
@@
-4399,8
+4325,8
@@
set_momentary_breakpoint (sal, frame, type)
/* If we're debugging a multi-threaded program, then we
want momentary breakpoints to be active in only a
single thread of control. */
/* If we're debugging a multi-threaded program, then we
want momentary breakpoints to be active in only a
single thread of control. */
- if (in_thread_list (inferior_pid))
- b->thread = pid_to_thread_id (inferior_pid);
+ if (in_thread_list (inferior_p
t
id))
+ b->thread = pid_to_thread_id (inferior_p
t
id);
return b;
}
return b;
}
@@
-4409,8
+4335,7
@@
set_momentary_breakpoint (sal, frame, type)
/* Tell the user we have just set a breakpoint B. */
static void
/* Tell the user we have just set a breakpoint B. */
static void
-mention (b)
- struct breakpoint *b;
+mention (struct breakpoint *b)
{
int say_where = 0;
#ifdef UI_OUT
{
int say_where = 0;
#ifdef UI_OUT
@@
-4736,9
+4661,7
@@
breakpoint_sals_to_pc (struct symtabs_and_lines *sals,
second bit : 0 normal breakpoint, 1 hardware breakpoint. */
static void
second bit : 0 normal breakpoint, 1 hardware breakpoint. */
static void
-break_command_1 (arg, flag, from_tty)
- char *arg;
- int flag, from_tty;
+break_command_1 (char *arg, int flag, int from_tty)
{
int tempflag, hardwareflag;
struct symtabs_and_lines sals;
{
int tempflag, hardwareflag;
struct symtabs_and_lines sals;
@@
-4769,18
+4692,18
@@
break_command_1 (arg, flag, from_tty)
old_chain = make_cleanup (null_cleanup, 0);
/* Make sure that all storage allocated to SALS gets freed. */
old_chain = make_cleanup (null_cleanup, 0);
/* Make sure that all storage allocated to SALS gets freed. */
- make_cleanup (free, sals.sals);
+ make_cleanup (
x
free, sals.sals);
/* Cleanup the addr_string array but not its contents. */
/* Cleanup the addr_string array but not its contents. */
- make_cleanup (free, addr_string);
+ make_cleanup (
x
free, addr_string);
/* Allocate space for all the cond expressions. */
cond = xcalloc (sals.nelts, sizeof (struct expression *));
/* Allocate space for all the cond expressions. */
cond = xcalloc (sals.nelts, sizeof (struct expression *));
- make_cleanup (free, cond);
+ make_cleanup (
x
free, cond);
/* Allocate space for all the cond strings. */
cond_string = xcalloc (sals.nelts, sizeof (char **));
/* Allocate space for all the cond strings. */
cond_string = xcalloc (sals.nelts, sizeof (char **));
- make_cleanup (free, cond_string);
+ make_cleanup (
x
free, cond_string);
/* ----------------------------- SNIP -----------------------------
Anything added to the cleanup chain beyond this point is assumed
/* ----------------------------- SNIP -----------------------------
Anything added to the cleanup chain beyond this point is assumed
@@
-4794,7
+4717,7
@@
break_command_1 (arg, flag, from_tty)
for (i = 0; i < sals.nelts; i++)
{
if (addr_string[i] != NULL)
for (i = 0; i < sals.nelts; i++)
{
if (addr_string[i] != NULL)
- make_cleanup (free, addr_string[i]);
+ make_cleanup (
x
free, addr_string[i]);
}
/* Resolve all line numbers to PC's and verify that the addresses
}
/* Resolve all line numbers to PC's and verify that the addresses
@@
-4828,10
+4751,10
@@
break_command_1 (arg, flag, from_tty)
{
tok = cond_start = end_tok + 1;
cond[i] = parse_exp_1 (&tok, block_for_pc (sals.sals[i].pc), 0);
{
tok = cond_start = end_tok + 1;
cond[i] = parse_exp_1 (&tok, block_for_pc (sals.sals[i].pc), 0);
- make_cleanup (free, cond[i]);
+ make_cleanup (
x
free, cond[i]);
cond_end = tok;
cond_string[i] = savestring (cond_start, cond_end - cond_start);
cond_end = tok;
cond_string[i] = savestring (cond_start, cond_end - cond_start);
- make_cleanup (free, cond_string[i]);
+ make_cleanup (
x
free, cond_string[i]);
}
else if (toklen >= 1 && strncmp (tok, "thread", toklen) == 0)
{
}
else if (toklen >= 1 && strncmp (tok, "thread", toklen) == 0)
{
@@
-4910,18
+4833,18
@@
do_captured_breakpoint (void *data)
old_chain = make_cleanup (null_cleanup, 0);
/* Always have a addr_string array, even if it is empty. */
old_chain = make_cleanup (null_cleanup, 0);
/* Always have a addr_string array, even if it is empty. */
- make_cleanup (free, addr_string);
+ make_cleanup (
x
free, addr_string);
/* Make sure that all storage allocated to SALS gets freed. */
/* Make sure that all storage allocated to SALS gets freed. */
- make_cleanup (free, sals.sals);
+ make_cleanup (
x
free, sals.sals);
/* Allocate space for all the cond expressions. */
cond = xcalloc (sals.nelts, sizeof (struct expression *));
/* Allocate space for all the cond expressions. */
cond = xcalloc (sals.nelts, sizeof (struct expression *));
- make_cleanup (free, cond);
+ make_cleanup (
x
free, cond);
/* Allocate space for all the cond strings. */
cond_string = xcalloc (sals.nelts, sizeof (char **));
/* Allocate space for all the cond strings. */
cond_string = xcalloc (sals.nelts, sizeof (char **));
- make_cleanup (free, cond_string);
+ make_cleanup (
x
free, cond_string);
/* ----------------------------- SNIP -----------------------------
Anything added to the cleanup chain beyond this point is assumed
/* ----------------------------- SNIP -----------------------------
Anything added to the cleanup chain beyond this point is assumed
@@
-4935,7
+4858,7
@@
do_captured_breakpoint (void *data)
for (i = 0; i < sals.nelts; i++)
{
if (addr_string[i] != NULL)
for (i = 0; i < sals.nelts; i++)
{
if (addr_string[i] != NULL)
- make_cleanup (free, addr_string[i]);
+ make_cleanup (
x
free, addr_string[i]);
}
/* Wait until now before checking for garbage at the end of the
}
/* Wait until now before checking for garbage at the end of the
@@
-4957,7
+4880,7
@@
do_captured_breakpoint (void *data)
cond[i] = parse_exp_1 (&tok, block_for_pc (sals.sals[i].pc), 0);
if (*tok != '\0')
error ("Garbage %s follows condition", tok);
cond[i] = parse_exp_1 (&tok, block_for_pc (sals.sals[i].pc), 0);
if (*tok != '\0')
error ("Garbage %s follows condition", tok);
- make_cleanup (free, cond[i]);
+ make_cleanup (
x
free, cond[i]);
cond_string[i] = xstrdup (args->condition);
}
}
cond_string[i] = xstrdup (args->condition);
}
}
@@
-4993,14
+4916,13
@@
gdb_breakpoint (char *address, char *condition,
static void
static void
-break_at_finish_at_depth_command_1 (arg, flag, from_tty)
- char *arg;
- int flag;
- int from_tty;
+break_at_finish_at_depth_command_1 (char *arg, int flag, int from_tty)
{
struct frame_info *frame;
CORE_ADDR low, high, selected_pc = 0;
{
struct frame_info *frame;
CORE_ADDR low, high, selected_pc = 0;
- char *extra_args, *level_arg, *addr_string;
+ char *extra_args = NULL;
+ char *level_arg;
+ char *addr_string;
int extra_args_len = 0, if_arg = 0;
if (!arg ||
int extra_args_len = 0, if_arg = 0;
if (!arg ||
@@
-5060,7
+4982,7
@@
break_at_finish_at_depth_command_1 (arg, flag, from_tty)
else
sprintf (addr_string, "*0x%s", paddr_nz (high));
break_command_1 (addr_string, flag, from_tty);
else
sprintf (addr_string, "*0x%s", paddr_nz (high));
break_command_1 (addr_string, flag, from_tty);
- free (addr_string);
+
x
free (addr_string);
}
else
error ("No function contains the specified address");
}
else
error ("No function contains the specified address");
@@
-5071,17
+4993,14
@@
break_at_finish_at_depth_command_1 (arg, flag, from_tty)
static void
static void
-break_at_finish_command_1 (arg, flag, from_tty)
- char *arg;
- int flag;
- int from_tty;
+break_at_finish_command_1 (char *arg, int flag, int from_tty)
{
char *addr_string, *break_string, *beg_addr_string;
CORE_ADDR low, high;
struct symtabs_and_lines sals;
struct symtab_and_line sal;
struct cleanup *old_chain;
{
char *addr_string, *break_string, *beg_addr_string;
CORE_ADDR low, high;
struct symtabs_and_lines sals;
struct symtab_and_line sal;
struct cleanup *old_chain;
- char *extra_args;
+ char *extra_args
= NULL
;
int extra_args_len = 0;
int i, if_arg = 0;
int extra_args_len = 0;
int i, if_arg = 0;
@@
-5132,8
+5051,8
@@
break_at_finish_command_1 (arg, flag, from_tty)
sals = decode_line_1 (&addr_string, 1, (struct symtab *) NULL, 0,
(char ***) NULL);
sals = decode_line_1 (&addr_string, 1, (struct symtab *) NULL, 0,
(char ***) NULL);
- free (beg_addr_string);
- old_chain = make_cleanup (free, sals.sals);
+
x
free (beg_addr_string);
+ old_chain = make_cleanup (
x
free, sals.sals);
for (i = 0; (i < sals.nelts); i++)
{
sal = sals.sals[i];
for (i = 0; (i < sals.nelts); i++)
{
sal = sals.sals[i];
@@
-5145,7
+5064,7
@@
break_at_finish_command_1 (arg, flag, from_tty)
else
sprintf (break_string, "*0x%s", paddr_nz (high));
break_command_1 (break_string, flag, from_tty);
else
sprintf (break_string, "*0x%s", paddr_nz (high));
break_command_1 (break_string, flag, from_tty);
- free (break_string);
+
x
free (break_string);
}
else
error ("No function contains the specified address");
}
else
error ("No function contains the specified address");
@@
-5162,8
+5081,7
@@
break_at_finish_command_1 (arg, flag, from_tty)
/* Helper function for break_command_1 and disassemble_command. */
void
/* Helper function for break_command_1 and disassemble_command. */
void
-resolve_sal_pc (sal)
- struct symtab_and_line *sal;
+resolve_sal_pc (struct symtab_and_line *sal)
{
CORE_ADDR pc;
{
CORE_ADDR pc;
@@
-5210,65
+5128,49
@@
resolve_sal_pc (sal)
}
void
}
void
-break_command (arg, from_tty)
- char *arg;
- int from_tty;
+break_command (char *arg, int from_tty)
{
break_command_1 (arg, 0, from_tty);
}
static void
{
break_command_1 (arg, 0, from_tty);
}
static void
-break_at_finish_command (arg, from_tty)
- char *arg;
- int from_tty;
+break_at_finish_command (char *arg, int from_tty)
{
break_at_finish_command_1 (arg, 0, from_tty);
}
static void
{
break_at_finish_command_1 (arg, 0, from_tty);
}
static void
-break_at_finish_at_depth_command (arg, from_tty)
- char *arg;
- int from_tty;
+break_at_finish_at_depth_command (char *arg, int from_tty)
{
break_at_finish_at_depth_command_1 (arg, 0, from_tty);
}
void
{
break_at_finish_at_depth_command_1 (arg, 0, from_tty);
}
void
-tbreak_command (arg, from_tty)
- char *arg;
- int from_tty;
+tbreak_command (char *arg, int from_tty)
{
break_command_1 (arg, BP_TEMPFLAG, from_tty);
}
static void
{
break_command_1 (arg, BP_TEMPFLAG, from_tty);
}
static void
-tbreak_at_finish_command (arg, from_tty)
- char *arg;
- int from_tty;
+tbreak_at_finish_command (char *arg, int from_tty)
{
break_at_finish_command_1 (arg, BP_TEMPFLAG, from_tty);
}
static void
{
break_at_finish_command_1 (arg, BP_TEMPFLAG, from_tty);
}
static void
-hbreak_command (arg, from_tty)
- char *arg;
- int from_tty;
+hbreak_command (char *arg, int from_tty)
{
break_command_1 (arg, BP_HARDWAREFLAG, from_tty);
}
static void
{
break_command_1 (arg, BP_HARDWAREFLAG, from_tty);
}
static void
-thbreak_command (arg, from_tty)
- char *arg;
- int from_tty;
+thbreak_command (char *arg, int from_tty)
{
break_command_1 (arg, (BP_TEMPFLAG | BP_HARDWAREFLAG), from_tty);
}
static void
{
break_command_1 (arg, (BP_TEMPFLAG | BP_HARDWAREFLAG), from_tty);
}
static void
-stop_command (arg, from_tty)
- char *arg;
- int from_tty;
+stop_command (char *arg, int from_tty)
{
printf_filtered ("Specify the type of breakpoint to set.\n\
Usage: stop in <function | address>\n\
{
printf_filtered ("Specify the type of breakpoint to set.\n\
Usage: stop in <function | address>\n\
@@
-5276,9
+5178,7
@@
Usage: stop in <function | address>\n\
}
static void
}
static void
-stopin_command (arg, from_tty)
- char *arg;
- int from_tty;
+stopin_command (char *arg, int from_tty)
{
int badInput = 0;
{
int badInput = 0;
@@
-5311,9
+5211,7
@@
stopin_command (arg, from_tty)
}
static void
}
static void
-stopat_command (arg, from_tty)
- char *arg;
- int from_tty;
+stopat_command (char *arg, int from_tty)
{
int badInput = 0;
{
int badInput = 0;
@@
-5349,10
+5247,7
@@
stopat_command (arg, from_tty)
hw_read: watch read,
hw_access: watch access (read or write) */
static void
hw_read: watch read,
hw_access: watch access (read or write) */
static void
-watch_command_1 (arg, accessflag, from_tty)
- char *arg;
- int accessflag;
- int from_tty;
+watch_command_1 (char *arg, int accessflag, int from_tty)
{
struct breakpoint *b;
struct symtab_and_line sal;
{
struct breakpoint *b;
struct symtab_and_line sal;
@@
-5435,7
+5330,7
@@
watch_command_1 (arg, accessflag, from_tty)
startup sequence by the dynamic linker.
However, I tried avoiding that by having HP-UX's implementation of
startup sequence by the dynamic linker.
However, I tried avoiding that by having HP-UX's implementation of
- TARGET_CAN_USE_HW_WATCHPOINT return FALSE if there was no inferior_pid
+ TARGET_CAN_USE_HW_WATCHPOINT return FALSE if there was no inferior_p
t
id
yet, which forced slow watches before a "run" or "attach", and it
still fails somewhere in the startup code.
yet, which forced slow watches before a "run" or "attach", and it
still fails somewhere in the startup code.
@@
-5528,12
+5423,11
@@
watch_command_1 (arg, accessflag, from_tty)
#if !defined(TARGET_REGION_OK_FOR_HW_WATCHPOINT)
#define TARGET_REGION_OK_FOR_HW_WATCHPOINT(ADDR,LEN) \
#if !defined(TARGET_REGION_OK_FOR_HW_WATCHPOINT)
#define TARGET_REGION_OK_FOR_HW_WATCHPOINT(ADDR,LEN) \
-
TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT(LEN
)
+
(TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT(LEN)
)
#endif
static int
#endif
static int
-can_use_hardware_watchpoint (v)
- struct value *v;
+can_use_hardware_watchpoint (struct value *v)
{
int found_memory_cnt = 0;
struct value *head = v;
{
int found_memory_cnt = 0;
struct value *head = v;
@@
-5606,51
+5500,39
@@
can_use_hardware_watchpoint (v)
#ifdef UI_OUT
void
#ifdef UI_OUT
void
-watch_command_wrapper (arg, from_tty)
- char *arg;
- int from_tty;
+watch_command_wrapper (char *arg, int from_tty)
{
watch_command (arg, from_tty);
}
#endif
static void
{
watch_command (arg, from_tty);
}
#endif
static void
-watch_command (arg, from_tty)
- char *arg;
- int from_tty;
+watch_command (char *arg, int from_tty)
{
watch_command_1 (arg, hw_write, from_tty);
}
#ifdef UI_OUT
void
{
watch_command_1 (arg, hw_write, from_tty);
}
#ifdef UI_OUT
void
-rwatch_command_wrapper (arg, from_tty)
- char *arg;
- int from_tty;
+rwatch_command_wrapper (char *arg, int from_tty)
{
rwatch_command (arg, from_tty);
}
#endif
static void
{
rwatch_command (arg, from_tty);
}
#endif
static void
-rwatch_command (arg, from_tty)
- char *arg;
- int from_tty;
+rwatch_command (char *arg, int from_tty)
{
watch_command_1 (arg, hw_read, from_tty);
}
#ifdef UI_OUT
void
{
watch_command_1 (arg, hw_read, from_tty);
}
#ifdef UI_OUT
void
-awatch_command_wrapper (arg, from_tty)
- char *arg;
- int from_tty;
+awatch_command_wrapper (char *arg, int from_tty)
{
awatch_command (arg, from_tty);
}
#endif
static void
{
awatch_command (arg, from_tty);
}
#endif
static void
-awatch_command (arg, from_tty)
- char *arg;
- int from_tty;
+awatch_command (char *arg, int from_tty)
{
watch_command_1 (arg, hw_access, from_tty);
}
{
watch_command_1 (arg, hw_access, from_tty);
}
@@
-5674,9
+5556,7
@@
until_break_command_continuation (struct continuation_arg *arg)
/* ARGSUSED */
void
/* ARGSUSED */
void
-until_break_command (arg, from_tty)
- char *arg;
- int from_tty;
+until_break_command (char *arg, int from_tty)
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
{
struct symtabs_and_lines sals;
struct symtab_and_line sal;
@@
-5702,7
+5582,7
@@
until_break_command (arg, from_tty)
error ("Couldn't get information on specified line.");
sal = sals.sals[0];
error ("Couldn't get information on specified line.");
sal = sals.sals[0];
-
free ((PTR) sals.sals);
/* malloc'd, so freed */
+
xfree (sals.sals);
/* malloc'd, so freed */
if (*arg)
error ("Junk at end of arguments.");
if (*arg)
error ("Junk at end of arguments.");
@@
-5761,23
+5641,22
@@
until_break_command (arg, from_tty)
/* These aren't used; I don't konw what they were for. */
/* Set a breakpoint at the catch clause for NAME. */
static int
/* These aren't used; I don't konw what they were for. */
/* Set a breakpoint at the catch clause for NAME. */
static int
-catch_breakpoint (name)
- char *name;
+catch_breakpoint (char *name)
{
}
static int
{
}
static int
-disable_catch_breakpoint ()
+disable_catch_breakpoint (
void
)
{
}
static int
{
}
static int
-delete_catch_breakpoint ()
+delete_catch_breakpoint (
void
)
{
}
static int
{
}
static int
-enable_catch_breakpoint ()
+enable_catch_breakpoint (
void
)
{
}
#endif /* 0 */
{
}
#endif /* 0 */
@@
-5797,9
+5676,7
@@
struct sal_chain
/* For each catch clause identified in ARGS, run FUNCTION
with that clause as an argument. */
static struct symtabs_and_lines
/* 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) ();
+map_catch_names (char *args, int (*function) ())
{
register char *p = args;
register char *p1;
{
register char *p = args;
register char *p1;
@@
-5858,8
+5735,7
@@
map_catch_names (args, function)
/* This shares a lot of code with `print_frame_label_vars' from stack.c. */
static struct symtabs_and_lines
/* 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;
+get_catch_sals (int this_level_only)
{
register struct blockvector *bl;
register struct block *block;
{
register struct blockvector *bl;
register struct block *block;
@@
-5971,8
+5847,7
@@
get_catch_sals (this_level_only)
}
static void
}
static void
-ep_skip_leading_whitespace (s)
- char **s;
+ep_skip_leading_whitespace (char **s)
{
if ((s == NULL) || (*s == NULL))
return;
{
if ((s == NULL) || (*s == NULL))
return;
@@
-5986,8
+5861,7
@@
ep_skip_leading_whitespace (s)
the token is returned. Else, NULL is returned. */
static char *
the token is returned. Else, NULL is returned. */
static char *
-ep_find_event_name_end (arg)
- char *arg;
+ep_find_event_name_end (char *arg)
{
char *s = arg;
char *event_name_end = NULL;
{
char *s = arg;
char *event_name_end = NULL;
@@
-6020,8
+5894,7
@@
ep_find_event_name_end (arg)
if clause in the arg string. */
static char *
if clause in the arg string. */
static char *
-ep_parse_optional_if_clause (arg)
- char **arg;
+ep_parse_optional_if_clause (char **arg)
{
char *cond_string;
{
char *cond_string;
@@
-6053,8
+5926,7
@@
ep_parse_optional_if_clause (arg)
Note that clients needing to preserve the returned filename for
future access should copy it to their own buffers. */
static char *
Note that clients needing to preserve the returned filename for
future access should copy it to their own buffers. */
static char *
-ep_parse_optional_filename (arg)
- char **arg;
+ep_parse_optional_filename (char **arg)
{
static char filename[1024];
char *arg_p = *arg;
{
static char filename[1024];
char *arg_p = *arg;
@@
-6093,11
+5965,8
@@
static void catch_fork_command_1 (catch_fork_kind fork_kind,
char *arg, int tempflag, int from_tty);
static void
char *arg, int tempflag, int from_tty);
static void
-catch_fork_command_1 (fork_kind, arg, tempflag, from_tty)
- catch_fork_kind fork_kind;
- char *arg;
- int tempflag;
- int from_tty;
+catch_fork_command_1 (catch_fork_kind fork_kind, char *arg, int tempflag,
+ int from_tty)
{
char *cond_string = NULL;
{
char *cond_string = NULL;
@@
-6132,10
+6001,7
@@
catch_fork_command_1 (fork_kind, arg, tempflag, from_tty)
#if defined(CHILD_INSERT_EXEC_CATCHPOINT)
static void
#if defined(CHILD_INSERT_EXEC_CATCHPOINT)
static void
-catch_exec_command_1 (arg, tempflag, from_tty)
- char *arg;
- int tempflag;
- int from_tty;
+catch_exec_command_1 (char *arg, int tempflag, int from_tty)
{
char *cond_string = NULL;
{
char *cond_string = NULL;
@@
-6159,10
+6025,7
@@
catch_exec_command_1 (arg, tempflag, from_tty)
#if defined(SOLIB_ADD)
static void
#if defined(SOLIB_ADD)
static void
-catch_load_command_1 (arg, tempflag, from_tty)
- char *arg;
- int tempflag;
- int from_tty;
+catch_load_command_1 (char *arg, int tempflag, int from_tty)
{
char *dll_pathname = NULL;
char *cond_string = NULL;
{
char *dll_pathname = NULL;
char *cond_string = NULL;
@@
-6199,15
+6062,12
@@
catch_load_command_1 (arg, tempflag, from_tty)
/* Create a load breakpoint that only triggers when a load of
the specified dll (or any dll, if no pathname was specified)
occurs. */
/* Create a load breakpoint that only triggers when a load of
the specified dll (or any dll, if no pathname was specified)
occurs. */
- SOLIB_CREATE_CATCH_LOAD_HOOK (
inferior_pid
, tempflag,
+ SOLIB_CREATE_CATCH_LOAD_HOOK (
PIDGET (inferior_ptid)
, tempflag,
dll_pathname, cond_string);
}
static void
dll_pathname, cond_string);
}
static void
-catch_unload_command_1 (arg, tempflag, from_tty)
- char *arg;
- int tempflag;
- int from_tty;
+catch_unload_command_1 (char *arg, int tempflag, int from_tty)
{
char *dll_pathname = NULL;
char *cond_string = NULL;
{
char *dll_pathname = NULL;
char *cond_string = NULL;
@@
-6244,7
+6104,7
@@
catch_unload_command_1 (arg, tempflag, from_tty)
/* Create an unload breakpoint that only triggers when an unload of
the specified dll (or any dll, if no pathname was specified)
occurs. */
/* Create an unload breakpoint that only triggers when an unload of
the specified dll (or any dll, if no pathname was specified)
occurs. */
- SOLIB_CREATE_CATCH_UNLOAD_HOOK (
inferior_pid
, tempflag,
+ SOLIB_CREATE_CATCH_UNLOAD_HOOK (
PIDGET (inferior_ptid)
, tempflag,
dll_pathname, cond_string);
}
#endif /* SOLIB_ADD */
dll_pathname, cond_string);
}
#endif /* SOLIB_ADD */
@@
-6255,11
+6115,9
@@
catch_unload_command_1 (arg, tempflag, from_tty)
exception event callback */
static void
exception event callback */
static void
-create_exception_catchpoint (tempflag, cond_string, ex_event, sal)
- int tempflag;
- char *cond_string;
- enum exception_event_kind ex_event;
- struct symtab_and_line *sal;
+create_exception_catchpoint (int tempflag, char *cond_string,
+ enum exception_event_kind ex_event,
+ struct symtab_and_line *sal)
{
struct breakpoint *b;
int thread = -1; /* All threads. */
{
struct breakpoint *b;
int thread = -1; /* All threads. */
@@
-6296,11
+6154,8
@@
create_exception_catchpoint (tempflag, cond_string, ex_event, sal)
/* Deal with "catch catch" and "catch throw" commands */
static void
/* Deal with "catch catch" and "catch throw" commands */
static void
-catch_exception_command_1 (ex_event, arg, tempflag, from_tty)
- enum exception_event_kind ex_event;
- char *arg;
- int tempflag;
- int from_tty;
+catch_exception_command_1 (enum exception_event_kind ex_event, char *arg,
+ int tempflag, int from_tty)
{
char *cond_string = NULL;
struct symtab_and_line *sal = NULL;
{
char *cond_string = NULL;
struct symtab_and_line *sal = NULL;
@@
-6351,8
+6206,7
@@
catch_exception_command_1 (ex_event, arg, tempflag, from_tty)
inside a catch_errors */
static int
inside a catch_errors */
static int
-cover_target_enable_exception_callback (arg)
- PTR arg;
+cover_target_enable_exception_callback (PTR arg)
{
args_for_catchpoint_enable *args = arg;
struct symtab_and_line *sal;
{
args_for_catchpoint_enable *args = arg;
struct symtab_and_line *sal;
@@
-6380,10
+6234,7
@@
cover_target_enable_exception_callback (arg)
static void
static void
-handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
- char *arg;
- int tempflag;
- int from_tty;
+handle_gnu_4_16_catch_command (char *arg, int tempflag, int from_tty)
{
/* First, translate ARG into something we can deal with in terms
of breakpoints. */
{
/* First, translate ARG into something we can deal with in terms
of breakpoints. */
@@
-6472,15
+6323,14
@@
handle_gnu_4_16_catch_command (arg, tempflag, from_tty)
warning ("Multiple breakpoints were set.");
warning ("Use the \"delete\" command to delete unwanted breakpoints.");
}
warning ("Multiple breakpoints were set.");
warning ("Use the \"delete\" command to delete unwanted breakpoints.");
}
-
free ((PTR)
sals.sals);
+
xfree (
sals.sals);
}
#if 0
/* This creates a temporary internal breakpoint
just to placate infrun */
static struct breakpoint *
}
#if 0
/* This creates a temporary internal breakpoint
just to placate infrun */
static struct breakpoint *
-create_temp_exception_breakpoint (pc)
- CORE_ADDR pc;
+create_temp_exception_breakpoint (CORE_ADDR pc)
{
struct symtab_and_line sal;
struct breakpoint *b;
{
struct symtab_and_line sal;
struct breakpoint *b;
@@
-6504,10
+6354,7
@@
create_temp_exception_breakpoint (pc)
#endif
static void
#endif
static void
-catch_command_1 (arg, tempflag, from_tty)
- char *arg;
- int tempflag;
- int from_tty;
+catch_command_1 (char *arg, int tempflag, int from_tty)
{
/* The first argument may be an event name, such as "start" or "load".
{
/* The first argument may be an event name, such as "start" or "load".
@@
-6630,8
+6477,7
@@
catch_command_1 (arg, tempflag, from_tty)
/* Used by the gui, could be made a worker for other things. */
struct breakpoint *
/* Used by the gui, could be made a worker for other things. */
struct breakpoint *
-set_breakpoint_sal (sal)
- struct symtab_and_line sal;
+set_breakpoint_sal (struct symtab_and_line sal)
{
struct breakpoint *b;
b = set_raw_breakpoint (sal);
{
struct breakpoint *b;
b = set_raw_breakpoint (sal);
@@
-6647,51
+6493,42
@@
set_breakpoint_sal (sal)
/* These aren't used; I don't know what they were for. */
/* Disable breakpoints on all catch clauses described in ARGS. */
static void
/* These aren't used; I don't know what they were for. */
/* Disable breakpoints on all catch clauses described in ARGS. */
static void
-disable_catch (args)
- char *args;
+disable_catch (char *args)
{
/* Map the disable command to catch clauses described in ARGS. */
}
/* Enable breakpoints on all catch clauses described in ARGS. */
static void
{
/* 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;
+enable_catch (char *args)
{
/* Map the disable command to catch clauses described in ARGS. */
}
/* Delete breakpoints on all catch clauses in the active scope. */
static void
{
/* 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;
+delete_catch (char *args)
{
/* Map the delete command to catch clauses described in ARGS. */
}
#endif /* 0 */
static void
{
/* Map the delete command to catch clauses described in ARGS. */
}
#endif /* 0 */
static void
-catch_command (arg, from_tty)
- char *arg;
- int from_tty;
+catch_command (char *arg, int from_tty)
{
catch_command_1 (arg, 0, from_tty);
}
\f
static void
{
catch_command_1 (arg, 0, from_tty);
}
\f
static void
-tcatch_command (arg, from_tty)
- char *arg;
- int from_tty;
+tcatch_command (char *arg, int from_tty)
{
catch_command_1 (arg, 1, from_tty);
}
static void
{
catch_command_1 (arg, 1, from_tty);
}
static void
-clear_command (arg, from_tty)
- char *arg;
- int from_tty;
+clear_command (char *arg, int from_tty)
{
register struct breakpoint *b, *b1;
int default_match;
{
register struct breakpoint *b, *b1;
int default_match;
@@
-6821,7
+6658,7
@@
clear_command (arg, from_tty)
if (from_tty)
putchar_unfiltered ('\n');
}
if (from_tty)
putchar_unfiltered ('\n');
}
-
free ((PTR)
sals.sals);
+
xfree (
sals.sals);
}
\f
/* Delete breakpoint in BS if they are `delete' breakpoints and
}
\f
/* Delete breakpoint in BS if they are `delete' breakpoints and
@@
-6829,8
+6666,7
@@
clear_command (arg, from_tty)
This is called after any breakpoint is hit, or after errors. */
void
This is called after any breakpoint is hit, or after errors. */
void
-breakpoint_auto_delete (bs)
- bpstat bs;
+breakpoint_auto_delete (bpstat bs)
{
struct breakpoint *b, *temp;
{
struct breakpoint *b, *temp;
@@
-6850,8
+6686,7
@@
breakpoint_auto_delete (bs)
structures. */
void
structures. */
void
-delete_breakpoint (bpt)
- struct breakpoint *bpt;
+delete_breakpoint (struct breakpoint *bpt)
{
register struct breakpoint *b;
register bpstat bs;
{
register struct breakpoint *b;
register bpstat bs;
@@
-6961,7
+6796,8
@@
delete_breakpoint (bpt)
If there is a permanent breakpoint somewhere, it should
always be the only one inserted. */
if (b->enable == permanent)
If there is a permanent breakpoint somewhere, it should
always be the only one inserted. */
if (b->enable == permanent)
- internal_error ("another breakpoint was inserted on top of "
+ internal_error (__FILE__, __LINE__,
+ "another breakpoint was inserted on top of "
"a permanent breakpoint");
if (b->type == bp_hardware_breakpoint)
"a permanent breakpoint");
if (b->type == bp_hardware_breakpoint)
@@
-6982,25
+6818,25
@@
delete_breakpoint (bpt)
free_command_lines (&bpt->commands);
if (bpt->cond)
free_command_lines (&bpt->commands);
if (bpt->cond)
- free (bpt->cond);
+
x
free (bpt->cond);
if (bpt->cond_string != NULL)
if (bpt->cond_string != NULL)
- free (bpt->cond_string);
+
x
free (bpt->cond_string);
if (bpt->addr_string != NULL)
if (bpt->addr_string != NULL)
- free (bpt->addr_string);
+
x
free (bpt->addr_string);
if (bpt->exp != NULL)
if (bpt->exp != NULL)
- free (bpt->exp);
+
x
free (bpt->exp);
if (bpt->exp_string != NULL)
if (bpt->exp_string != NULL)
- free (bpt->exp_string);
+
x
free (bpt->exp_string);
if (bpt->val != NULL)
value_free (bpt->val);
if (bpt->source_file != NULL)
if (bpt->val != NULL)
value_free (bpt->val);
if (bpt->source_file != NULL)
- free (bpt->source_file);
+
x
free (bpt->source_file);
if (bpt->dll_pathname != NULL)
if (bpt->dll_pathname != NULL)
- free (bpt->dll_pathname);
+
x
free (bpt->dll_pathname);
if (bpt->triggered_dll_pathname != NULL)
if (bpt->triggered_dll_pathname != NULL)
- free (bpt->triggered_dll_pathname);
+
x
free (bpt->triggered_dll_pathname);
if (bpt->exec_pathname != NULL)
if (bpt->exec_pathname != NULL)
- free (bpt->exec_pathname);
+
x
free (bpt->exec_pathname);
/* Be sure no bpstat's are pointing at it after it's been freed. */
/* FIXME, how can we find all bpstat's?
/* Be sure no bpstat's are pointing at it after it's been freed. */
/* FIXME, how can we find all bpstat's?
@@
-7022,7
+6858,7
@@
delete_breakpoint (bpt)
bp, we mark it as deleted before freeing its storage. */
bpt->type = bp_none;
bp, we mark it as deleted before freeing its storage. */
bpt->type = bp_none;
-
free ((PTR)
bpt);
+
xfree (
bpt);
}
static void
}
static void
@@
-7044,9
+6880,7
@@
make_exec_cleanup_delete_breakpoint (struct breakpoint *b)
}
void
}
void
-delete_command (arg, from_tty)
- char *arg;
- int from_tty;
+delete_command (char *arg, int from_tty)
{
struct breakpoint *b, *temp;
{
struct breakpoint *b, *temp;
@@
-7089,8
+6923,7
@@
delete_command (arg, from_tty)
Unused in this case. */
static int
Unused in this case. */
static int
-breakpoint_re_set_one (bint)
- PTR bint;
+breakpoint_re_set_one (PTR bint)
{
/* get past catch_errs */
struct breakpoint *b = (struct breakpoint *) bint;
{
/* get past catch_errs */
struct breakpoint *b = (struct breakpoint *) bint;
@@
-7135,7
+6968,7
@@
breakpoint_re_set_one (bint)
{
s = b->cond_string;
if (b->cond)
{
s = b->cond_string;
if (b->cond)
-
free ((PTR)
b->cond);
+
xfree (
b->cond);
b->cond = parse_exp_1 (&s, block_for_pc (sals.sals[i].pc), 0);
}
b->cond = parse_exp_1 (&s, block_for_pc (sals.sals[i].pc), 0);
}
@@
-7154,7
+6987,7
@@
breakpoint_re_set_one (bint)
)
{
if (b->source_file != NULL)
)
{
if (b->source_file != NULL)
- free (b->source_file);
+
x
free (b->source_file);
if (sals.sals[i].symtab == NULL)
b->source_file = NULL;
else
if (sals.sals[i].symtab == NULL)
b->source_file = NULL;
else
@@
-7183,7
+7016,7
@@
breakpoint_re_set_one (bint)
check_duplicates (b->address, b->section);
}
check_duplicates (b->address, b->section);
}
-
free ((PTR)
sals.sals);
+
xfree (
sals.sals);
break;
case bp_watchpoint:
break;
case bp_watchpoint:
@@
-7201,7
+7034,7
@@
breakpoint_re_set_one (bint)
/* So for now, just use a global context. */
if (b->exp)
/* So for now, just use a global context. */
if (b->exp)
-
free ((PTR)
b->exp);
+
xfree (
b->exp);
b->exp = parse_expression (b->exp_string);
b->exp_valid_block = innermost_block;
mark = value_mark ();
b->exp = parse_expression (b->exp_string);
b->exp_valid_block = innermost_block;
mark = value_mark ();
@@
-7216,7
+7049,7
@@
breakpoint_re_set_one (bint)
{
s = b->cond_string;
if (b->cond)
{
s = b->cond_string;
if (b->cond)
-
free ((PTR)
b->cond);
+
xfree (
b->cond);
b->cond = parse_exp_1 (&s, (struct block *) 0, 0);
}
if (b->enable == enabled)
b->cond = parse_exp_1 (&s, (struct block *) 0, 0);
}
if (b->enable == enabled)
@@
-7269,7
+7102,7
@@
breakpoint_re_set_one (bint)
/* Re-set all breakpoints after symbols have been re-loaded. */
void
/* Re-set all breakpoints after symbols have been re-loaded. */
void
-breakpoint_re_set ()
+breakpoint_re_set (
void
)
{
struct breakpoint *b, *temp;
enum language save_language;
{
struct breakpoint *b, *temp;
enum language save_language;
@@
-7311,21
+7144,19
@@
breakpoint_re_set ()
/* Reset the thread number of this breakpoint:
- If the breakpoint is for all threads, leave it as-is.
/* Reset the thread number of this breakpoint:
- If the breakpoint is for all threads, leave it as-is.
- - Else, reset it to the current thread for inferior_pid. */
+ - Else, reset it to the current thread for inferior_p
t
id. */
void
void
-breakpoint_re_set_thread (b)
- struct breakpoint *b;
+breakpoint_re_set_thread (struct breakpoint *b)
{
if (b->thread != -1)
{
{
if (b->thread != -1)
{
- if (in_thread_list (inferior_pid))
- b->thread = pid_to_thread_id (inferior_pid);
+ if (in_thread_list (inferior_p
t
id))
+ b->thread = pid_to_thread_id (inferior_p
t
id);
}
}
void
}
}
void
-set_ignore_count (bptnum, count, from_tty)
- int bptnum, count, from_tty;
+set_ignore_count (int bptnum, int count, int from_tty)
{
register struct breakpoint *b;
{
register struct breakpoint *b;
@@
-7356,7
+7187,7
@@
set_ignore_count (bptnum, count, from_tty)
/* Clear the ignore counts of all breakpoints. */
void
/* Clear the ignore counts of all breakpoints. */
void
-breakpoint_clear_ignore_counts ()
+breakpoint_clear_ignore_counts (
void
)
{
struct breakpoint *b;
{
struct breakpoint *b;
@@
-7367,9
+7198,7
@@
breakpoint_clear_ignore_counts ()
/* Command to set ignore-count of breakpoint N to COUNT. */
static void
/* Command to set ignore-count of breakpoint N to COUNT. */
static void
-ignore_command (args, from_tty)
- char *args;
- int from_tty;
+ignore_command (char *args, int from_tty)
{
char *p = args;
register int num;
{
char *p = args;
register int num;
@@
-7394,9
+7223,7
@@
ignore_command (args, from_tty)
whose numbers are given in ARGS. */
static void
whose numbers are given in ARGS. */
static void
-map_breakpoint_numbers (args, function)
- char *args;
- void (*function) (struct breakpoint *);
+map_breakpoint_numbers (char *args, void (*function) (struct breakpoint *))
{
register char *p = args;
char *p1;
{
register char *p = args;
char *p1;
@@
-7437,8
+7264,7
@@
map_breakpoint_numbers (args, function)
}
void
}
void
-disable_breakpoint (bpt)
- struct breakpoint *bpt;
+disable_breakpoint (struct breakpoint *bpt)
{
/* Never disable a watchpoint scope breakpoint; we want to
hit them when we leave scope so we can delete both the
{
/* Never disable a watchpoint scope breakpoint; we want to
hit them when we leave scope so we can delete both the
@@
-7461,9
+7287,7
@@
disable_breakpoint (bpt)
/* ARGSUSED */
static void
/* ARGSUSED */
static void
-disable_command (args, from_tty)
- char *args;
- int from_tty;
+disable_command (char *args, int from_tty)
{
register struct breakpoint *bpt;
if (args == 0)
{
register struct breakpoint *bpt;
if (args == 0)
@@
-7496,9
+7320,7
@@
disable_command (args, from_tty)
}
static void
}
static void
-do_enable_breakpoint (bpt, disposition)
- struct breakpoint *bpt;
- enum bpdisp disposition;
+do_enable_breakpoint (struct breakpoint *bpt, enum bpdisp disposition)
{
struct frame_info *save_selected_frame = NULL;
int save_selected_frame_level = -1;
{
struct frame_info *save_selected_frame = NULL;
int save_selected_frame_level = -1;
@@
-7593,8
+7415,7
@@
have been allocated for other watchpoints.\n", bpt->number);
}
void
}
void
-enable_breakpoint (bpt)
- struct breakpoint *bpt;
+enable_breakpoint (struct breakpoint *bpt)
{
do_enable_breakpoint (bpt, bpt->disposition);
}
{
do_enable_breakpoint (bpt, bpt->disposition);
}
@@
-7605,9
+7426,7
@@
enable_breakpoint (bpt)
/* ARGSUSED */
static void
/* ARGSUSED */
static void
-enable_command (args, from_tty)
- char *args;
- int from_tty;
+enable_command (char *args, int from_tty)
{
register struct breakpoint *bpt;
if (args == 0)
{
register struct breakpoint *bpt;
if (args == 0)
@@
-7640,33
+7459,27
@@
enable_command (args, from_tty)
}
static void
}
static void
-enable_once_breakpoint (bpt)
- struct breakpoint *bpt;
+enable_once_breakpoint (struct breakpoint *bpt)
{
do_enable_breakpoint (bpt, disable);
}
/* ARGSUSED */
static void
{
do_enable_breakpoint (bpt, disable);
}
/* ARGSUSED */
static void
-enable_once_command (args, from_tty)
- char *args;
- int from_tty;
+enable_once_command (char *args, int from_tty)
{
map_breakpoint_numbers (args, enable_once_breakpoint);
}
static void
{
map_breakpoint_numbers (args, enable_once_breakpoint);
}
static void
-enable_delete_breakpoint (bpt)
- struct breakpoint *bpt;
+enable_delete_breakpoint (struct breakpoint *bpt)
{
do_enable_breakpoint (bpt, del);
}
/* ARGSUSED */
static void
{
do_enable_breakpoint (bpt, del);
}
/* ARGSUSED */
static void
-enable_delete_command (args, from_tty)
- char *args;
- int from_tty;
+enable_delete_command (char *args, int from_tty)
{
map_breakpoint_numbers (args, enable_delete_breakpoint);
}
{
map_breakpoint_numbers (args, enable_delete_breakpoint);
}
@@
-7674,9
+7487,7
@@
enable_delete_command (args, from_tty)
/* Use default_breakpoint_'s, or nothing if they aren't valid. */
struct symtabs_and_lines
/* 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;
+decode_line_spec_1 (char *string, int funfirstline)
{
struct symtabs_and_lines sals;
if (string == 0)
{
struct symtabs_and_lines sals;
if (string == 0)
@@
-7695,7
+7506,7
@@
decode_line_spec_1 (string, funfirstline)
}
\f
void
}
\f
void
-_initialize_breakpoint ()
+_initialize_breakpoint (
void
)
{
struct cmd_list_element *c;
{
struct cmd_list_element *c;
This page took
0.052742 seconds
and
4
git commands to generate.