Re: RFC: don't set the pspace on ordinary breakpoints

Tom Tromey
2011-11-14T21:12:38Z

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Tom> No problem, here it is.

Here is the split off part of the patch.

I plan to put this in with the rest of the ambiguous linespec change.

Tom

2011-11-10 Tom Tromey <tromey@redhat.com>

* elfread.c (elf_gnu_ifunc_resolver_return_stop): Allow
breakpoint's pspace to be NULL.
* breakpoint.h (struct breakpoint) <pspace>: Update comment.
* breakpoint.c (init_raw_breakpoint): Conditionally set
breakpoint's pspace.
(init_breakpoint_sal): Don't set breakpoint's pspace.
(prepare_re_set_context): Conditionally switch program space.
(addr_string_to_sals): Check executing_startup on location's
program space.

From 9930b7e45aed489de6055ed960c13aff1bd8aff9 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 10 Nov 2011 08:56:39 -0700
Subject: [PATCH 2/4] make pspace optional

---
gdb/ChangeLog | 12 ++++++++++++
gdb/breakpoint.c | 19 ++++++++++---------
gdb/breakpoint.h | 4 +++-
gdb/elfread.c | 2 +-
4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index f2e1c57..01ca912 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5792,9 +5792,11 @@ init_raw_breakpoint (struct breakpoint *b, struct gdbarch *gdbarch,
b->loc->address = adjusted_address;
b->loc->pspace = sal.pspace;

- /* 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;
@@ -7179,7 +7181,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)
{
@@ -7939,7 +7940,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;
b->py_bp_object = NULL;

if (!internal)
@@ -10840,9 +10842,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)
{
@@ -11773,6 +11772,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;

@@ -11861,7 +11861,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 d9060cf..94e324a 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -563,7 +563,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