|
 |
26bbde |
Index: gdb-7.7.50.20140609/gdb/breakpoint.c
|
|
|
26bbde |
===================================================================
|
|
|
26bbde |
--- gdb-7.7.50.20140609.orig/gdb/breakpoint.c 2014-06-13 20:24:34.564667225 +0200
|
|
|
26bbde |
+++ gdb-7.7.50.20140609/gdb/breakpoint.c 2014-06-13 20:24:35.650668351 +0200
|
|
|
26bbde |
@@ -16364,6 +16364,50 @@ initialize_breakpoint_ops (void)
|
|
|
26bbde |
static struct cmd_list_element *enablebreaklist = NULL;
|
|
|
26bbde |
|
|
|
26bbde |
void
|
|
|
26bbde |
+breakpoints_relocate (struct objfile *objfile, struct section_offsets *delta)
|
|
|
26bbde |
+{
|
|
|
26bbde |
+ struct bp_location *bl, **blp_tmp;
|
|
|
26bbde |
+ int changed = 0;
|
|
|
26bbde |
+
|
|
|
26bbde |
+ gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
|
|
|
26bbde |
+
|
|
|
26bbde |
+ ALL_BP_LOCATIONS (bl, blp_tmp)
|
|
|
26bbde |
+ {
|
|
|
26bbde |
+ struct obj_section *osect;
|
|
|
26bbde |
+
|
|
|
26bbde |
+ /* BL->SECTION can be correctly NULL for breakpoints with multiple
|
|
|
26bbde |
+ locations expanded through symtab. */
|
|
|
26bbde |
+
|
|
|
26bbde |
+ ALL_OBJFILE_OSECTIONS (objfile, osect)
|
|
|
26bbde |
+ {
|
|
|
26bbde |
+ CORE_ADDR relocated_address;
|
|
|
26bbde |
+ CORE_ADDR delta_offset;
|
|
|
26bbde |
+
|
|
|
26bbde |
+ delta_offset = ANOFFSET (delta, osect->the_bfd_section->index);
|
|
|
26bbde |
+ if (delta_offset == 0)
|
|
|
26bbde |
+ continue;
|
|
|
26bbde |
+ relocated_address = bl->address + delta_offset;
|
|
|
26bbde |
+
|
|
|
26bbde |
+ if (obj_section_addr (osect) <= relocated_address
|
|
|
26bbde |
+ && relocated_address < obj_section_endaddr (osect))
|
|
|
26bbde |
+ {
|
|
|
26bbde |
+ if (bl->inserted)
|
|
|
26bbde |
+ remove_breakpoint (bl, mark_uninserted);
|
|
|
26bbde |
+
|
|
|
26bbde |
+ bl->address += delta_offset;
|
|
|
26bbde |
+ bl->requested_address += delta_offset;
|
|
|
26bbde |
+
|
|
|
26bbde |
+ changed = 1;
|
|
|
26bbde |
+ }
|
|
|
26bbde |
+ }
|
|
|
26bbde |
+ }
|
|
|
26bbde |
+
|
|
|
26bbde |
+ if (changed)
|
|
|
26bbde |
+ qsort (bp_location, bp_location_count, sizeof (*bp_location),
|
|
|
26bbde |
+ bp_location_compare);
|
|
|
26bbde |
+}
|
|
|
26bbde |
+
|
|
|
26bbde |
+void
|
|
|
26bbde |
_initialize_breakpoint (void)
|
|
|
26bbde |
{
|
|
|
26bbde |
struct cmd_list_element *c;
|
|
|
26bbde |
Index: gdb-7.7.50.20140609/gdb/breakpoint.h
|
|
|
26bbde |
===================================================================
|
|
|
26bbde |
--- gdb-7.7.50.20140609.orig/gdb/breakpoint.h 2014-06-13 20:24:34.566667227 +0200
|
|
|
26bbde |
+++ gdb-7.7.50.20140609/gdb/breakpoint.h 2014-06-13 20:24:35.651668352 +0200
|
|
|
26bbde |
@@ -1553,4 +1553,7 @@ extern void breakpoint_free_objfile (str
|
|
|
26bbde |
|
|
|
26bbde |
extern char *ep_parse_optional_if_clause (char **arg);
|
|
|
26bbde |
|
|
|
26bbde |
+extern void breakpoints_relocate (struct objfile *objfile,
|
|
|
26bbde |
+ struct section_offsets *delta);
|
|
|
26bbde |
+
|
|
|
26bbde |
#endif /* !defined (BREAKPOINT_H) */
|
|
|
26bbde |
Index: gdb-7.7.50.20140609/gdb/objfiles.c
|
|
|
26bbde |
===================================================================
|
|
|
26bbde |
--- gdb-7.7.50.20140609.orig/gdb/objfiles.c 2014-06-13 20:24:35.652668353 +0200
|
|
|
26bbde |
+++ gdb-7.7.50.20140609/gdb/objfiles.c 2014-06-13 20:25:10.867704891 +0200
|
|
|
26bbde |
@@ -820,6 +820,11 @@ objfile_relocate1 (struct objfile *objfi
|
|
|
26bbde |
obj_section_addr (s));
|
|
|
26bbde |
}
|
|
|
26bbde |
|
|
|
26bbde |
+ /* Final call of breakpoint_re_set can keep breakpoint locations disabled if
|
|
|
26bbde |
+ their addresses match. */
|
|
|
26bbde |
+ if (objfile->separate_debug_objfile_backlink == NULL)
|
|
|
26bbde |
+ breakpoints_relocate (objfile, delta);
|
|
|
26bbde |
+
|
|
|
26bbde |
/* Data changed. */
|
|
|
26bbde |
return 1;
|
|
|
26bbde |
}
|