Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* breakpoint.c (breakpoint_init_inferior): Mark as not inserted only

Browse Source 
non-permanent breakpoints.
	(bpstat_stop_status): Change enable_state to bp_disabled only for
	non-permanent breakpoints.
	(bp_loc_is_permanent): New function.
	(create_breakpoint): Check if the location points to a permanent
	breakpoint and if it does, make breakpoint permanent.
	(update_breakpoint_locations): Make sure new locations of permanent
	breakpoints are properly initialized.
	* i386-tdep.c (i386_skip_permanent_breakpoint): New function.
	(i386_gdbarch_init): Set gdbarch_skip_permanent_breakpoint.

	* gdb.arch/i386-bp_permanent.exp: New test.
This commit is contained in:
Aleksandar Ristovski
2008-09-03 13:39:56 +00:00
parent ee60f13c8b
commit 514f746bdc
5 changed files with 176 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gdb/breakpoint.c
View File

@@ -1750,7 +1750,8 @@ breakpoint_init_inferior (enum inf_context context)
struct bp_location *bpt;
ALL_BP_LOCATIONS (bpt)
bpt->inserted = 0;
if (bpt->owner->enable_state != bp_permanent)
bpt->inserted = 0;
ALL_BREAKPOINTS_SAFE (b, temp)
{
@@ -3088,7 +3089,8 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid)
/* We will stop here */
if (b->disposition == disp_disable)
{
b->enable_state = bp_disabled;
if (b->enable_state != bp_permanent)
b->enable_state = bp_disabled;
update_global_location_list (0);
}
if (b->silent)
@@ -5081,6 +5083,34 @@ add_location_to_breakpoint (struct breakpoint *b, enum bptype bptype,
set_breakpoint_location_function (loc);
return loc;
}
/* Return 1 if LOC is pointing to a permanent breakpoint,
return 0 otherwise. */
static int
bp_loc_is_permanent (struct bp_location *loc)
{
int len;
CORE_ADDR addr;
const gdb_byte *brk;
gdb_byte *target_mem;
gdb_assert (loc != NULL);
addr = loc->address;
brk = gdbarch_breakpoint_from_pc (current_gdbarch, &addr, &len);
target_mem = alloca (len);
if (target_read_memory (loc->address, target_mem, len) == 0
&& memcmp (target_mem, brk, len) == 0)
return 1;
return 0;
}
/* Create a breakpoint with SAL as location. Use ADDR_STRING
as textual description of the location, and COND_STRING
@@ -5135,6 +5165,9 @@ create_breakpoint (struct symtabs_and_lines sals, char *addr_string,
loc = add_location_to_breakpoint (b, type, &sal);
}
if (bp_loc_is_permanent (loc))
make_breakpoint_permanent (b);
if (b->cond_string)
{
char *arg = b->cond_string;
@@ -7391,6 +7424,10 @@ update_breakpoint_locations (struct breakpoint *b,
b->line_number = sals.sals[i].line;
}
/* Update locations of permanent breakpoints. */
if (b->enable_state == bp_permanent)
make_breakpoint_permanent (b);
/* If possible, carry over 'disable' status from existing breakpoints. */
{
struct bp_location *e = existing_locations;