4cdd21a8d3
Straightforward change from a VEC to std::vector. This allows making the destruction of a traceframe_info trivial. I added a constructor with parameters to mem_range to be able to emplace_back directly with the values. It is necessary to leave a default constructor there because mem_range is still used in a VEC. gdb/ChangeLog: * memrange.h (struct mem_range): Add constructors. * tracepoint.h (struct traceframe_info) <memory>: Change type to std::vector<mem_range>. * tracepoint.c (free_traceframe_info): Don't manually free vector. (traceframe_info_start_memory): Adjust to vector change. (traceframe_available_memory): Likewise. * tracefile-tfile.c (build_traceframe_info): Likewise. * ctf.c (ctf_traceframe_info): Likewise.
62 lines
1.7 KiB
C
62 lines
1.7 KiB
C
/* The memory range data structure, and associated utilities.
|
|
|
|
Copyright (C) 2010-2017 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef MEMRANGE_H
|
|
#define MEMRANGE_H
|
|
|
|
#include "vec.h"
|
|
|
|
/* Defines a [START, START + LENGTH) memory range. */
|
|
|
|
struct mem_range
|
|
{
|
|
mem_range () = default;
|
|
|
|
mem_range (CORE_ADDR start_, int length_)
|
|
: start (start_), length (length_)
|
|
{}
|
|
|
|
/* Lowest address in the range. */
|
|
CORE_ADDR start;
|
|
|
|
/* Length of the range. */
|
|
int length;
|
|
};
|
|
|
|
typedef struct mem_range mem_range_s;
|
|
|
|
DEF_VEC_O(mem_range_s);
|
|
|
|
/* Returns true if the ranges defined by [start1, start1+len1) and
|
|
[start2, start2+len2) overlap. */
|
|
|
|
extern int mem_ranges_overlap (CORE_ADDR start1, int len1,
|
|
CORE_ADDR start2, int len2);
|
|
|
|
/* Returns true if ADDR is in RANGE. */
|
|
|
|
extern int address_in_mem_range (CORE_ADDR addr,
|
|
const struct mem_range *range);
|
|
|
|
/* Sort ranges by start address, then coalesce contiguous or
|
|
overlapping ranges. */
|
|
|
|
extern void normalize_mem_ranges (VEC(mem_range_s) *memory);
|
|
|
|
#endif
|