diff options
| author | Tom Tromey <tom@tromey.com> | 2017-04-07 16:01:10 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-04-12 11:16:19 -0600 |
| commit | 52d214d3e1b2f6a1382feafbf2984acdb24c0c95 (patch) | |
| tree | 271aac61643cea48878c147ddd1860498ecaed3b | |
| parent | 4c404b8be6b1d8759eed50366207fc0e2e47d2b1 (diff) | |
| download | gdb-52d214d3e1b2f6a1382feafbf2984acdb24c0c95.zip gdb-52d214d3e1b2f6a1382feafbf2984acdb24c0c95.tar.gz gdb-52d214d3e1b2f6a1382feafbf2984acdb24c0c95.tar.bz2 | |
Use std::vector in find_instruction_backward
This changes find_instruction_backward to use std::vector, removing a
cleanup.
gdb/ChangeLog
2017-04-12 Tom Tromey <tom@tromey.com>
* printcmd.c (find_instruction_backward): Use std::vector.
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/printcmd.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e735272..85beca8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2017-04-12 Tom Tromey <tom@tromey.com> + * printcmd.c (find_instruction_backward): Use std::vector. + +2017-04-12 Tom Tromey <tom@tromey.com> + * symfile.c (objfilep): Remove typedef. (reread_symbols): Use a std::vector. diff --git a/gdb/printcmd.c b/gdb/printcmd.c index f09f18a..02d6e1c 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -806,9 +806,8 @@ find_instruction_backward (struct gdbarch *gdbarch, CORE_ADDR addr, /* The vector PCS is used to store instruction addresses within a pc range. */ CORE_ADDR loop_start, loop_end, p; - VEC (CORE_ADDR) *pcs = NULL; + std::vector<CORE_ADDR> pcs; struct symtab_and_line sal; - struct cleanup *cleanup = make_cleanup (VEC_cleanup (CORE_ADDR), &pcs); *inst_read = 0; loop_start = loop_end = addr; @@ -822,7 +821,7 @@ find_instruction_backward (struct gdbarch *gdbarch, CORE_ADDR addr, instructions from INST_COUNT, and go to the next iteration. */ do { - VEC_truncate (CORE_ADDR, pcs, 0); + pcs.clear (); sal = find_pc_sect_line (loop_start, NULL, 1); if (sal.line <= 0) { @@ -844,12 +843,12 @@ find_instruction_backward (struct gdbarch *gdbarch, CORE_ADDR addr, LOOP_START to LOOP_END. */ for (p = loop_start; p < loop_end;) { - VEC_safe_push (CORE_ADDR, pcs, p); + pcs.push_back (p); p += gdb_insn_length (gdbarch, p); } - inst_count -= VEC_length (CORE_ADDR, pcs); - *inst_read += VEC_length (CORE_ADDR, pcs); + inst_count -= pcs.size (); + *inst_read += pcs.size (); } while (inst_count > 0); @@ -875,9 +874,7 @@ find_instruction_backward (struct gdbarch *gdbarch, CORE_ADDR addr, The case when the length of PCS is 0 means that we reached an area for which line info is not available. In such case, we return LOOP_START, which was the lowest instruction address that had line info. */ - p = VEC_length (CORE_ADDR, pcs) > 0 - ? VEC_index (CORE_ADDR, pcs, -inst_count) - : loop_start; + p = pcs.size () > 0 ? pcs[-inst_count] : loop_start; /* INST_READ includes all instruction addresses in a pc range. Need to exclude the beginning part up to the address we're returning. That @@ -885,7 +882,6 @@ find_instruction_backward (struct gdbarch *gdbarch, CORE_ADDR addr, if (inst_count < 0) *inst_read += inst_count; - do_cleanups (cleanup); return p; } |