From 39d615713374a605484fcb0fe9576f91c98ebe78 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 8 Dec 2008 13:27:38 +0000 Subject: [PATCH] Fix loc_type of `bp_location's created by update_watchpoint. * breakpoint.c (allocate_bp_location): Remove the bp_type parameter. Replace bp_type by bpt->type. Update prototype. All callers updated. (add_location_to_breakpoint): Remove the bp_type parameter. Replace bp_type by b->type. All callers updated. (set_breakpoint_location_function): Replace bptype by b->type. --- gdb/ChangeLog | 9 +++++++++ gdb/breakpoint.c | 24 +++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 518ab63f612..4a24e60fa06 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2008-12-08 Jan Kratochvil + + Fix loc_type of `bp_location's created by update_watchpoint. + * breakpoint.c (allocate_bp_location): Remove the bp_type parameter. + Replace bp_type by bpt->type. Update prototype. All callers updated. + (add_location_to_breakpoint): Remove the bp_type parameter. + Replace bp_type by b->type. All callers updated. + (set_breakpoint_location_function): Replace bptype by b->type. + 2008-12-07 Jan Kratochvil * breakpoint.c (update_global_location_list): Fix the comment. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 071909ef23f..0322d023db5 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -181,8 +181,7 @@ static int single_step_breakpoint_inserted_here_p (CORE_ADDR pc); static void free_bp_location (struct bp_location *loc); -static struct bp_location * -allocate_bp_location (struct breakpoint *bpt, enum bptype bp_type); +static struct bp_location *allocate_bp_location (struct breakpoint *bpt); static void update_global_location_list (int); @@ -924,7 +923,7 @@ update_watchpoint (struct breakpoint *b, int reparse) else if (b->type == bp_access_watchpoint) type = hw_access; - loc = allocate_bp_location (b, bp_hardware_watchpoint); + loc = allocate_bp_location (b); for (tmp = &(b->loc); *tmp != NULL; tmp = &((*tmp)->next)) ; *tmp = loc; @@ -4013,7 +4012,7 @@ adjust_breakpoint_address (CORE_ADDR bpaddr, enum bptype bptype) /* Allocate a struct bp_location. */ static struct bp_location * -allocate_bp_location (struct breakpoint *bpt, enum bptype bp_type) +allocate_bp_location (struct breakpoint *bpt) { struct bp_location *loc, *loc_p; @@ -4025,7 +4024,7 @@ allocate_bp_location (struct breakpoint *bpt, enum bptype bp_type) loc->shlib_disabled = 0; loc->enabled = 1; - switch (bp_type) + switch (bpt->type) { case bp_breakpoint: case bp_until: @@ -4153,9 +4152,9 @@ set_raw_breakpoint (struct symtab_and_line sal, enum bptype bptype) breakpoint may cause target_read_memory() to be called and we do not want its scan of the location chain to find a breakpoint and location that's only been partially initialized. */ - adjusted_address = adjust_breakpoint_address (sal.pc, bptype); + adjusted_address = adjust_breakpoint_address (sal.pc, b->type); - b->loc = allocate_bp_location (b, bptype); + b->loc = allocate_bp_location (b); b->loc->requested_address = sal.pc; b->loc->address = adjusted_address; @@ -4981,18 +4980,17 @@ mention (struct breakpoint *b) static struct bp_location * -add_location_to_breakpoint (struct breakpoint *b, enum bptype bptype, +add_location_to_breakpoint (struct breakpoint *b, const struct symtab_and_line *sal) { struct bp_location *loc, **tmp; - loc = allocate_bp_location (b, bptype); + loc = allocate_bp_location (b); for (tmp = &(b->loc); *tmp != NULL; tmp = &((*tmp)->next)) ; *tmp = loc; loc->requested_address = sal->pc; - loc->address = adjust_breakpoint_address (loc->requested_address, - bptype); + loc->address = adjust_breakpoint_address (loc->requested_address, b->type); loc->section = sal->section; set_breakpoint_location_function (loc); @@ -5090,7 +5088,7 @@ create_breakpoint (struct symtabs_and_lines sals, char *addr_string, } else { - loc = add_location_to_breakpoint (b, type, &sal); + loc = add_location_to_breakpoint (b, &sal); } if (bp_loc_is_permanent (loc)) @@ -7226,7 +7224,7 @@ update_breakpoint_locations (struct breakpoint *b, for (i = 0; i < sals.nelts; ++i) { struct bp_location *new_loc = - add_location_to_breakpoint (b, b->type, &(sals.sals[i])); + add_location_to_breakpoint (b, &(sals.sals[i])); /* Reparse conditions, they might contain references to the old symtab. */ -- 2.30.2