This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: Watchpoint on an unloaded shared library(1)
Hello Joel,
From: Joel Brobecker <brobecker at adacore.com>
Subject: Re: Watchpoint on an unloaded shared library(1)
Date: Fri, 26 Dec 2008 10:10:55 +0400
>> This does work for me, except one duplication of the codes (that you
>> may have noticed already):
>>
>> static void
>> do_enable_breakpoint (struct breakpoint *bpt, enum bpdisp disposition)
>> {
>> int target_resources_ok, other_type_used;
>> struct value *mark;
>>
>> if (bpt->type == bp_hardware_breakpoint)
>
> Not quite: As you can see, this part of the code deals with hardware
> *breakpoints*, not watchpoints.
Shame on me... I've totally missed that :-(
>> I would try to address incapabilities on PPC after those codes are
>> committed. Thank you for taking care of it!
>
> Er, ... Can you send a patch? I was merely suggesting a different
> approach that I hoped would work.
Certainly; is it like below then?
2008-12-26 Joel Brobecker <brobecker@adacore.com>
Emi Suzuki <emi-suzuki@tjsys.co.jp>
* breakpoint.c (do_enable_breakpoint): Use update_watchpoint for
watchpoints.
Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.367
diff -u -r1.367 breakpoint.c
--- breakpoint.c 22 Dec 2008 04:37:37 -0000 1.367
+++ breakpoint.c 26 Dec 2008 06:55:49 -0000
@@ -7765,56 +7765,17 @@
bpt->type == bp_read_watchpoint ||
bpt->type == bp_access_watchpoint)
{
- struct frame_id saved_frame_id;
-
- saved_frame_id = get_frame_id (get_selected_frame (NULL));
- if (bpt->exp_valid_block != NULL)
+ struct gdb_exception e;
+ TRY_CATCH (e, RETURN_MASK_ALL)
{
- struct frame_info *fr =
- fr = frame_find_by_id (bpt->watchpoint_frame);
- if (fr == NULL)
- {
- printf_filtered (_("\
-Cannot enable watchpoint %d because the block in which its expression\n\
-is valid is not currently in scope.\n"), bpt->number);
- return;
- }
- select_frame (fr);
+ update_watchpoint (bpt, 1 /* reparse */);
}
-
- if (bpt->val)
- value_free (bpt->val);
- mark = value_mark ();
- fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL);
- if (bpt->val)
- release_value (bpt->val);
- bpt->val_valid = 1;
-
- if (bpt->type == bp_hardware_watchpoint ||
- bpt->type == bp_read_watchpoint ||
- bpt->type == bp_access_watchpoint)
+ if (e.reason < 0)
{
- int i = hw_watchpoint_used_count (bpt->type, &other_type_used);
- int mem_cnt = can_use_hardware_watchpoint (bpt->val);
-
- /* Hack around 'unused var' error for some targets here */
- (void) mem_cnt, (void) i;
- target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
- bpt->type, i + mem_cnt, other_type_used);
- /* we can consider of type is bp_hardware_watchpoint, convert to
- bp_watchpoint in the following condition */
- if (target_resources_ok < 0)
- {
- printf_filtered (_("\
-Cannot enable watchpoint %d because target watch resources\n\
-have been allocated for other watchpoints.\n"), bpt->number);
- value_free_to_mark (mark);
- return;
- }
+ exception_fprintf (gdb_stderr, e, _("Cannot enable watchpoint %d: "),
+ bpt->number);
+ return;
}
-
- select_frame (frame_find_by_id (saved_frame_id));
- value_free_to_mark (mark);
}
if (bpt->enable_state != bp_permanent)
Anyway, thank you for your help!
--
Emi SUZUKI / emi-suzuki at tjsys.co.jp