From 791b7405f4627ad65fd636d57adb9e5749d0b9e7 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 7 Oct 2019 16:45:24 +0100 Subject: [PATCH] gdb: Update comments that reference VEC or vec.h With the removal of the old VEC mechanism from the code base, update comments that still make reference to VECs. There should be no user visible changes after this commit. gdb/ChangeLog: * linespec.c (decode_digits_ordinary): Update comment. * make-target-delegates: No longer need to handle VEC case. * memrange.c (normalize_mem_ranges): Update comment. * namespace.c (add_using_directive): Update comment. * objc-lang.c (uniquify_strings): Update comment. * ppc-linux-nat.c (struct thread_points): Update comment. * probe.h (find_probes_in_objfile): Update comment. * target.h (enum flash_preserve_mode): Update comment. * varobj.c (varobj_restrict_range): Update comment. * varobj.h (varobj_list_children): Update comment. Change-Id: Iefd2e903705c3e79cd13b43395c7a1c167f9a088 --- gdb/ChangeLog | 13 +++++++++++++ gdb/linespec.c | 5 +++-- gdb/make-target-delegates | 4 +--- gdb/memrange.c | 4 ---- gdb/namespace.c | 4 ++-- gdb/objc-lang.c | 2 +- gdb/ppc-linux-nat.c | 6 +++--- gdb/probe.h | 2 +- gdb/target.h | 2 +- gdb/varobj.c | 7 +++---- gdb/varobj.h | 2 +- 11 files changed, 29 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8328a9b3c8..3827c4d323 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2019-10-15 Andrew Burgess + + * linespec.c (decode_digits_ordinary): Update comment. + * make-target-delegates: No longer need to handle VEC case. + * memrange.c (normalize_mem_ranges): Update comment. + * namespace.c (add_using_directive): Update comment. + * objc-lang.c (uniquify_strings): Update comment. + * ppc-linux-nat.c (struct thread_points): Update comment. + * probe.h (find_probes_in_objfile): Update comment. + * target.h (enum flash_preserve_mode): Update comment. + * varobj.c (varobj_restrict_range): Update comment. + * varobj.h (varobj_list_children): Update comment. + 2019-10-15 Andrew Burgess * Makefile.in: Remove references to vec.h and vec.c. diff --git a/gdb/linespec.c b/gdb/linespec.c index ac7d34dfe9..fb6b04e22b 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -4109,8 +4109,9 @@ decode_digits_list_mode (struct linespec_state *self, return values; } -/* A helper for create_sals_line_offset that iterates over the symtabs, - adding lines to the VEC. */ +/* A helper for create_sals_line_offset that iterates over the symtabs + associated with LS and returns a vector of corresponding symtab_and_line + structures. */ static std::vector decode_digits_ordinary (struct linespec_state *self, diff --git a/gdb/make-target-delegates b/gdb/make-target-delegates index 329306d7f2..a7a39b3289 100755 --- a/gdb/make-target-delegates +++ b/gdb/make-target-delegates @@ -43,11 +43,9 @@ $POINTER_PART = qr,\s*(\*)?\s*,; $CP_SYMBOL = qr,[a-zA-Z_][a-zA-Z0-9_<>:]*,; # Match the return type when it is "ordinary". $SIMPLE_RETURN_PART = qr,((struct|class|enum|union)\s+)?${CP_SYMBOL}+,; -# Match the return type when it is a VEC. -$VEC_RETURN_PART = qr,VEC\s*\([^\)]+\),; # Match a return type. -$RETURN_PART = qr,((const|volatile)\s+)?(${SIMPLE_RETURN_PART}|${VEC_RETURN_PART})${POINTER_PART},; +$RETURN_PART = qr,((const|volatile)\s+)?(${SIMPLE_RETURN_PART})${POINTER_PART},; # Match "virtual". $VIRTUAL_PART = qr,virtual\s,; diff --git a/gdb/memrange.c b/gdb/memrange.c index 0f999815c5..0c4b415829 100644 --- a/gdb/memrange.c +++ b/gdb/memrange.c @@ -44,10 +44,6 @@ address_in_mem_range (CORE_ADDR address, const struct mem_range *r) void normalize_mem_ranges (std::vector *memory) { - /* This function must not use any VEC operation on RANGES that - reallocates the memory block as that invalidates the RANGES - pointer, which callers expect to remain valid. */ - if (!memory->empty ()) { std::vector &m = *memory; diff --git a/gdb/namespace.c b/gdb/namespace.c index 04b49ef0e3..e08d4f7edb 100644 --- a/gdb/namespace.c +++ b/gdb/namespace.c @@ -30,8 +30,8 @@ it is NULL. EXCLUDES is a list of names not to import from an imported module or NULL. If COPY_NAMES is non-zero, then the arguments are copied into newly allocated memory so they can be - temporaries. For EXCLUDES the VEC pointers are copied but the - pointed to characters are not copied. */ + temporaries. For EXCLUDES the contents of the vector are copied, + but the pointed to characters are not copied. */ void add_using_directive (struct using_direct **using_directives, diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index ab40e54a16..fbf0dab2ae 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -1063,7 +1063,7 @@ find_methods (char type, const char *theclass, const char *category, } } -/* Uniquify a VEC of strings. */ +/* Uniquify a vector of strings. */ static void uniquify_strings (std::vector *strings) diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c index 53406f61c8..0d66ade456 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -1575,9 +1575,9 @@ struct hw_break_tuple struct ppc_hw_breakpoint *hw_break; }; -/* This is an internal VEC created to store information about *points inserted - for each thread. This is used when PowerPC HWDEBUG ptrace interface is - available. */ +/* This is an internal vector created to store information about *points + inserted for each thread. This is used when PowerPC HWDEBUG ptrace + interface is available. */ struct thread_points { /* The TID to which this *point relates. */ diff --git a/gdb/probe.h b/gdb/probe.h index 7410c5aadf..4227bd4377 100644 --- a/gdb/probe.h +++ b/gdb/probe.h @@ -274,7 +274,7 @@ extern std::vector parse_probes extern struct bound_probe find_probe_by_pc (CORE_ADDR pc); /* Search OBJFILE for a probe with the given PROVIDER, NAME. Return a - VEC of all probes that were found. If no matching probe is found, + vector of all probes that were found. If no matching probe is found, return an empty vector. */ extern std::vector find_probes_in_objfile (struct objfile *objfile, diff --git a/gdb/target.h b/gdb/target.h index 91e8a837ab..1bb7276673 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1535,7 +1535,7 @@ enum flash_preserve_mode that supports writing to flash memory, and it should be used for all cases where access to flash memory is desirable. - REQUESTS is the vector (see vec.h) of memory_write_request. + REQUESTS is the vector of memory_write_request. PRESERVE_FLASH_P indicates what to do with blocks which must be erased, but not completely rewritten. PROGRESS_CB is a function that will be periodically called to provide diff --git a/gdb/varobj.c b/gdb/varobj.c index 6265b2fa17..37a522be5d 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -597,10 +597,9 @@ varobj_get_frozen (const struct varobj *var) return var->frozen; } -/* A helper function that restricts a range to what is actually - available in a VEC. This follows the usual rules for the meaning - of FROM and TO -- if either is negative, the entire range is - used. */ +/* A helper function that updates the contents of FROM and TO based on the + size of the vector CHILDREN. If the contents of either FROM or TO are + negative the entire range is used. */ void varobj_restrict_range (const std::vector &children, diff --git a/gdb/varobj.h b/gdb/varobj.h index eb01da10e2..66db7807fe 100644 --- a/gdb/varobj.h +++ b/gdb/varobj.h @@ -286,7 +286,7 @@ extern int varobj_get_num_children (struct varobj *var); indicating the range of children to return. If either *FROM or *TO is less than zero on entry, then all children will be returned. On return, *FROM and *TO will be updated to indicate the real range - that was returned. The resulting VEC will contain at least the + that was returned. The resulting vector will contain at least the children from *FROM to just before *TO; it might contain more children, depending on whether any more were available. */ extern const std::vector & -- 2.34.1