From cf3a9e5b487979829d23b66bb053ab30823a8c1d Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 6 Nov 2003 18:24:55 +0000 Subject: [PATCH] * breakpoint.h (struct bp_location): Add section. (struct breakpoint): Remove section. * breakpoint.c (insert_breakpoints, remove_breakpoint) (breakpoint_here_p, breakpoint_inserted_here_p) (breakpoint_thread_match, bpstat_stop_status, print_one_breakpoint) (describe_other_breakpoints, check_duplicates, set_raw_breakpoint) (clear_command, delete_breakpoint, breakpoint_re_set_one): Access section through loc. --- gdb/ChangeLog | 11 +++++++++++ gdb/breakpoint.c | 56 ++++++++++++++++++++++++++++---------------------------- gdb/breakpoint.h | 6 ++++-- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2938b2f..e70c210 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2003-11-06 Daniel Jacobowitz + * breakpoint.h (struct bp_location): Add section. + (struct breakpoint): Remove section. + * breakpoint.c (insert_breakpoints, remove_breakpoint) + (breakpoint_here_p, breakpoint_inserted_here_p) + (breakpoint_thread_match, bpstat_stop_status, print_one_breakpoint) + (describe_other_breakpoints, check_duplicates, set_raw_breakpoint) + (clear_command, delete_breakpoint, breakpoint_re_set_one): Access + section through loc. + +2003-11-06 Daniel Jacobowitz + * breakpoint.c (read_memory_nobpt): Use ALL_BP_LOCATIONS instead of ALL_BREAKPOINTS. Check for software breakpoints only. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 87ce33c..68403cb 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -802,8 +802,8 @@ insert_breakpoints (void) /* First check to see if we have to handle an overlay. */ if (overlay_debugging == ovly_off - || b->section == NULL - || !(section_is_overlay (b->section))) + || b->loc->section == NULL + || !(section_is_overlay (b->loc->section))) { /* No overlay handling: just set the breakpoint. */ @@ -828,7 +828,7 @@ insert_breakpoints (void) else { CORE_ADDR addr = overlay_unmapped_address (b->loc->address, - b->section); + b->loc->section); /* Set a software (trap) breakpoint at the LMA. */ val = target_insert_breakpoint (addr, b->loc->shadow_contents); if (val != 0) @@ -838,7 +838,7 @@ insert_breakpoints (void) } } /* Shall we set a breakpoint at the VMA? */ - if (section_is_mapped (b->section)) + if (section_is_mapped (b->loc->section)) { /* Yes. This overlay section is mapped into memory. */ if (b->type == bp_hardware_breakpoint) @@ -1383,8 +1383,8 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is) /* First check to see if we have to handle an overlay. */ if (overlay_debugging == ovly_off - || b->section == NULL - || !(section_is_overlay (b->section))) + || b->loc->section == NULL + || !(section_is_overlay (b->loc->section))) { /* No overlay handling: just remove the breakpoint. */ @@ -1404,7 +1404,7 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is) should have set a breakpoint at the LMA. Remove it. */ CORE_ADDR addr = overlay_unmapped_address (b->loc->address, - b->section); + b->loc->section); /* Ignore any failures: if the LMA is in ROM, we will have already warned when we failed to insert it. */ if (b->type != bp_hardware_breakpoint) @@ -1656,8 +1656,8 @@ breakpoint_here_p (CORE_ADDR pc) && b->loc->address == pc) /* bp is enabled and matches pc */ { if (overlay_debugging - && section_is_overlay (b->section) - && !section_is_mapped (b->section)) + && section_is_overlay (b->loc->section) + && !section_is_mapped (b->loc->section)) continue; /* unmapped overlay -- can't be a match */ else if (b->enable_state == bp_permanent) return permanent_breakpoint_here; @@ -1683,8 +1683,8 @@ breakpoint_inserted_here_p (CORE_ADDR pc) && b->loc->address == pc) /* bp is inserted and matches pc */ { if (overlay_debugging - && section_is_overlay (b->section) - && !section_is_mapped (b->section)) + && section_is_overlay (b->loc->section) + && !section_is_mapped (b->loc->section)) continue; /* unmapped overlay -- can't be a match */ else return 1; @@ -1743,8 +1743,8 @@ breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid) && (b->thread == -1 || b->thread == thread)) { if (overlay_debugging - && section_is_overlay (b->section) - && !section_is_mapped (b->section)) + && section_is_overlay (b->loc->section) + && !section_is_mapped (b->loc->section)) continue; /* unmapped overlay -- can't be a match */ else return 1; @@ -2557,8 +2557,8 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_sw_breakpoint) if (b->loc->address != bp_addr) /* address doesn't match */ continue; if (overlay_debugging /* unmapped overlay section */ - && section_is_overlay (b->section) - && !section_is_mapped (b->section)) + && section_is_overlay (b->loc->section) + && !section_is_mapped (b->loc->section)) continue; } @@ -2567,8 +2567,8 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_sw_breakpoint) if (b->loc->address != (*pc - DECR_PC_AFTER_HW_BREAK)) continue; if (overlay_debugging /* unmapped overlay section */ - && section_is_overlay (b->section) - && !section_is_mapped (b->section)) + && section_is_overlay (b->loc->section) + && !section_is_mapped (b->loc->section)) continue; } @@ -3430,7 +3430,7 @@ print_one_breakpoint (struct breakpoint *b, *last_addr = b->loc->address; if (b->source_file) { - sym = find_pc_sect_function (b->loc->address, b->section); + sym = find_pc_sect_function (b->loc->address, b->loc->section); if (sym) { ui_out_text (uiout, "in "); @@ -3710,14 +3710,14 @@ describe_other_breakpoints (CORE_ADDR pc, asection *section) ALL_BREAKPOINTS (b) if (b->loc->address == pc) /* address match / overlay match */ - if (!overlay_debugging || b->section == section) + if (!overlay_debugging || b->loc->section == section) others++; if (others > 0) { printf_filtered ("Note: breakpoint%s ", (others > 1) ? "s" : ""); ALL_BREAKPOINTS (b) if (b->loc->address == pc) /* address match / overlay match */ - if (!overlay_debugging || b->section == section) + if (!overlay_debugging || b->loc->section == section) { others--; printf_filtered ("%d%s%s ", @@ -3798,7 +3798,7 @@ check_duplicates (struct breakpoint *bpt) int count = 0; struct breakpoint *perm_bp = 0; CORE_ADDR address = bpt->loc->address; - asection *section = bpt->section; + asection *section = bpt->loc->section; if (! breakpoint_address_is_meaningful (bpt)) return; @@ -3808,7 +3808,7 @@ check_duplicates (struct breakpoint *bpt) && b->enable_state != bp_shlib_disabled && b->enable_state != bp_call_disabled && b->loc->address == address /* address / overlay match */ - && (!overlay_debugging || b->section == section) + && (!overlay_debugging || b->loc->section == section) && breakpoint_address_is_meaningful (b)) { /* Have we found a permanent breakpoint? */ @@ -3847,7 +3847,7 @@ check_duplicates (struct breakpoint *bpt) && b->enable_state != bp_shlib_disabled && b->enable_state != bp_call_disabled && b->loc->address == address /* address / overlay match */ - && (!overlay_debugging || b->section == section) + && (!overlay_debugging || b->loc->section == section) && breakpoint_address_is_meaningful (b)) b->loc->duplicate = 1; } @@ -3997,7 +3997,7 @@ set_raw_breakpoint (struct symtab_and_line sal, enum bptype bptype) else b->source_file = savestring (sal.symtab->filename, strlen (sal.symtab->filename)); - b->section = sal.section; + b->loc->section = sal.section; b->type = bptype; b->language = current_language->la_language; b->input_radix = input_radix; @@ -6553,8 +6553,8 @@ clear_command (char *arg, int from_tty) && b->type != bp_access_watchpoint /* Not if b is a watchpoint of any sort... */ && (((sal.pc && (b->loc->address == sal.pc)) - && (!section_is_overlay (b->section) - || b->section == sal.section)) + && (!section_is_overlay (b->loc->section) + || b->loc->section == sal.section)) /* Yes, if sal.pc matches b (modulo overlays). */ || ((default_match || (0 == sal.pc)) && b->source_file != NULL @@ -6723,7 +6723,7 @@ delete_breakpoint (struct breakpoint *bpt) { ALL_BREAKPOINTS (b) if (b->loc->address == bpt->loc->address - && b->section == bpt->section + && b->loc->section == bpt->loc->section && !b->loc->duplicate && b->enable_state != bp_disabled && b->enable_state != bp_shlib_disabled @@ -6991,7 +6991,7 @@ breakpoint_re_set_one (void *bint) rather than once for every breakpoint. */ breakpoints_changed (); } - b->section = sals.sals[i].section; + b->loc->section = sals.sals[i].section; b->enable_state = save_enable; /* Restore it, this worked. */ diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 2dde3c9..85cc8b9 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -237,6 +237,10 @@ struct bp_location bp_loc_other. */ CORE_ADDR address; + /* For any breakpoint type with an address, this is the BFD section + associated with the address. Used primarily for overlay debugging. */ + asection *section; + /* "Real" contents of byte where breakpoint has been inserted. Valid only when breakpoints are in the program. Under the complete control of the target insert_breakpoint and remove_breakpoint routines. @@ -379,8 +383,6 @@ struct breakpoint triggered. */ char *exec_pathname; - asection *section; - /* Methods associated with this breakpoint. */ struct breakpoint_ops *ops; }; -- 2.7.4