From 554ac434b02465f1fc925b0ae3393fb841e0d59c Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 19 Sep 2019 13:17:59 -0400 Subject: gdb: Change a VEC to std::vector in btrace.{c,h} Replace a VEC with a std::vector in btrace.h, and update btrace.c to match. It is worth noting that this code appears to be currently untested by the GDB testsuite. I've tried to do a like for like replacement when moving to std::vector, with minimal refactoring to try and avoid introducing any bugs. As the new vector is inside a union I've currently used a pointer to vector, which makes the code slightly uglier than it might otherwise be, but again, due to lack of testing I'm reluctant to start refactoring the code in a big way. gdb/ChangeLog: * btrace.c (btrace_maint_clear): Update to handle change from VEC to std::vector. (btrace_maint_decode_pt): Likewise, and move allocation of the vector outside of the loop. (btrace_maint_update_packets): Update to handle change from VEC to std::vector. (btrace_maint_print_packets): Likewise. (maint_info_btrace_cmd): Likewise. * btrace.h: Remove use of DEF_VEC_O. (typedef btrace_pt_packet_s): Delete. (struct btrace_maint_info) : Change fromm VEC to std::vector. * gdbsupport/btrace-common.h: Remove 'vec.h' include. --- gdb/btrace.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gdb/btrace.h') diff --git a/gdb/btrace.h b/gdb/btrace.h index ba8d27c..208c089 100644 --- a/gdb/btrace.h +++ b/gdb/btrace.h @@ -264,9 +264,6 @@ struct btrace_pt_packet struct pt_packet packet; }; -/* Define functions operating on a vector of packets. */ -typedef struct btrace_pt_packet btrace_pt_packet_s; -DEF_VEC_O (btrace_pt_packet_s); #endif /* defined (HAVE_LIBIPT) */ /* Branch trace iteration state for "maintenance btrace packet-history". */ @@ -300,7 +297,7 @@ struct btrace_maint_info struct { /* A vector of decoded packets. */ - VEC (btrace_pt_packet_s) *packets; + std::vector *packets; /* The packet history iterator. We are iterating over the above PACKETS vector. */ -- cgit v1.1