Re: creating the gdb-7.4 branch tomorrow (?)

Tom Tromey
2011-12-06T18:53:49Z

[-- Attachment #1: Type: text/plain, Size: 124 bytes --]

Here is patch #2, to make breakpoint->pspace optional.
It hasn't changed in a while, I'm sending it for completeness.

Tom

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch 2 --]
[-- Type: text/x-patch, Size: 3479 bytes --]

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index f0a351f..a26c933 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5819,9 +5819,11 @@ init_raw_breakpoint (struct breakpoint *b, struct gdbarch *gdbarch,
if (bptype != bp_catchpoint)
gdb_assert (sal.pspace != NULL);

- /* Store the program space that was used to set the breakpoint, for
- breakpoint resetting. */
- b->pspace = sal.pspace;
+ /* Store the program space that was used to set the breakpoint,
+ except for ordinary breakpoints, which are independent of the
+ program space. */
+ if (bptype != bp_breakpoint && bptype != bp_hardware_breakpoint)
+ b->pspace = sal.pspace;

if (sal.symtab == NULL)
b->source_file = NULL;
@@ -7268,7 +7270,6 @@ init_breakpoint_sal (struct breakpoint *b, struct gdbarch *gdbarch,
b->ignore_count = ignore_count;
b->enable_state = enabled ? bp_enabled : bp_disabled;
b->disposition = disposition;
- b->pspace = sals.sals[0].pspace;

if (type == bp_static_tracepoint)
{
@@ -8036,7 +8037,8 @@ create_breakpoint (struct gdbarch *gdbarch,
b->disposition = tempflag ? disp_del : disp_donttouch;
b->condition_not_parsed = 1;
b->enable_state = enabled ? bp_enabled : bp_disabled;
- b->pspace = current_program_space;
+ if (type_wanted != bp_breakpoint && type_wanted != bp_hardware_breakpoint)
+ b->pspace = current_program_space;

install_breakpoint (internal, b, 0);
}
@@ -10988,9 +10990,6 @@ static struct breakpoint_ops base_breakpoint_ops =
static void
bkpt_re_set (struct breakpoint *b)
{
- if (current_program_space->executing_startup)
- return;
-
/* FIXME: is this still reachable? */
if (b->addr_string == NULL)
{
@@ -11925,6 +11924,7 @@ addr_string_to_sals (struct breakpoint *b, char *addr_string, int *found)
if (e.error == NOT_FOUND_ERROR
&& (b->condition_not_parsed
|| (b->loc && b->loc->shlib_disabled)
+ || (b->loc && b->loc->pspace->executing_startup)
|| b->enable_state == bp_disabled))
not_found_and_ok = 1;

@@ -12013,7 +12013,8 @@ prepare_re_set_context (struct breakpoint *b)

input_radix = b->input_radix;
cleanups = save_current_space_and_thread ();
- switch_to_program_space_and_thread (b->pspace);
+ if (b->pspace != NULL)
+ switch_to_program_space_and_thread (b->pspace);
set_language (b->language);

return cleanups;
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 17e65d6..de1491e 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -567,7 +567,9 @@ struct breakpoint
equals this. */
struct frame_id frame_id;

- /* The program space used to set the breakpoint. */
+ /* The program space used to set the breakpoint. This is only set
+ for breakpoints which are specific to a program space; for
+ ordinary breakpoints this is NULL. */
struct program_space *pspace;

/* String we used to set the breakpoint (malloc'd). */
diff --git a/gdb/elfread.c b/gdb/elfread.c
index a309a2c..067c77f 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1032,7 +1032,7 @@ elf_gnu_ifunc_resolver_return_stop (struct breakpoint *b)
}
gdb_assert (b->type == bp_gnu_ifunc_resolver);

- gdb_assert (current_program_space == b->pspace);
+ gdb_assert (current_program_space == b->pspace || b->pspace == NULL);
elf_gnu_ifunc_record_cache (b->addr_string, resolved_pc);

sal = find_pc_line (resolved_pc, 0);
--
1.7.6.4