From 4c1d86d9a8f7ddfbf7ff095a88a59497c8f6ddc9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 21 Sep 2019 19:50:40 -0400 Subject: [PATCH] gdb: make watchpoint::val_valid a bool gdb/ChangeLog: * breakpoint.h (struct watchpoint) : Change type to bool. * breakpoint.c (update_watchpoint): Assign false instead of 0, true instead of 1. (breakpoint_init_inferior): Likewise. (watchpoint_check): Likewise. (watch_command_1): Likewise. (invalidate_bp_value_on_memory_change): Likewise. --- gdb/breakpoint.c | 12 ++++++------ gdb/breakpoint.h | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 8ef3aac0c1..838c9d136f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -1727,7 +1727,7 @@ update_watchpoint (struct watchpoint *b, int reparse) to the user when the old value and the new value may actually be completely different objects. */ b->val = NULL; - b->val_valid = 0; + b->val_valid = false; /* Note that unlike with breakpoints, the watchpoint's condition expression is stored in the breakpoint object, not in the @@ -1780,7 +1780,7 @@ update_watchpoint (struct watchpoint *b, int reparse) if (b->val_bitsize != 0) v = extract_bitfield_from_watchpoint_value (b, v); b->val = release_value (v); - b->val_valid = 1; + b->val_valid = true; } frame_pspace = get_frame_program_space (get_selected_frame (NULL)); @@ -3900,7 +3900,7 @@ breakpoint_init_inferior (enum inf_context context) /* Reset val field to force reread of starting value in insert_breakpoints. */ w->val.reset (nullptr); - w->val_valid = 0; + w->val_valid = false; } } } @@ -4877,7 +4877,7 @@ watchpoint_check (bpstat bs) { bs->old_val = b->val; b->val = release_value (new_val); - b->val_valid = 1; + b->val_valid = true; if (new_val != NULL) value_free_to_mark (mark); return WP_VALUE_CHANGED; @@ -10717,7 +10717,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty, w->val = val; w->val_bitpos = saved_bitpos; w->val_bitsize = saved_bitsize; - w->val_valid = 1; + w->val_valid = true; } if (cond_start) @@ -14375,7 +14375,7 @@ invalidate_bp_value_on_memory_change (struct inferior *inferior, && addr + len > loc->address) { wp->val = NULL; - wp->val_valid = 0; + wp->val_valid = false; } } } diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 80bb11c141..9791032c5e 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -817,9 +817,10 @@ struct watchpoint : public breakpoint we do not know the value yet or the value was not readable. VAL is never lazy. */ value_ref_ptr val; - /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, + + /* True if VAL is valid. If VAL_VALID is set but VAL is NULL, then an error occurred reading the value. */ - int val_valid; + bool val_valid; /* When watching the location of a bitfield, contains the offset and size of the bitfield. Otherwise contains 0. */ -- 2.34.1