mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 02:53:48 +08:00
a79b1bc6f6
This patch replaces the last usages of VEC(mem_range_s) with std::vector<mem_range>. This allows getting rid of a few cleanups and of the DEF_VEC_O(mem_range_s). I added a test for normalize_mem_ranges to make sure I didn't break anything there. Regtested on the buildbot. gdb/ChangeLog: * memrange.h (struct mem_range): Define operator< and operator==. (mem_range_s): Remove. (DEF_VEC_O (mem_range_s)): Remove. (normalize_mem_ranges): Change parameter type to std::vector. * memrange.c (compare_mem_ranges): Remove. (normalize_mem_ranges): Change parameter type to std::vector, adjust to vector change. * exec.c (section_table_available_memory): Return vector, remove parameter. (section_table_read_available_memory): Adjust to std::vector change. * remote.c (remote_read_bytes): Adjust to std::vector change. * tracepoint.h (traceframe_available_memory): Change parameter type to std::vector. * tracepoint.c (traceframe_available_memory): Change parameter type to std::vector, adjust. * gdb/mi/mi-main.c (mi_cmd_trace_frame_collected): Adjust to std::vector change. * gdb/Makefile.in (SUBDIR_UNITTESTS_SRCS): Add unittests/memrange-selftests.c. (SUBDIR_UNITTESTS_OBS): Add memrange-selftests.o. * gdb/unittests/memrange-selftests.c: New file.
70 lines
1.8 KiB
C++
70 lines
1.8 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_)
|
|
{}
|
|
|
|
bool operator< (const mem_range &other) const
|
|
{
|
|
return this->start < other.start;
|
|
}
|
|
|
|
bool operator== (const mem_range &other) const
|
|
{
|
|
return (this->start == other.start
|
|
&& this->length == other.length);
|
|
}
|
|
|
|
/* Lowest address in the range. */
|
|
CORE_ADDR start;
|
|
|
|
/* Length of the range. */
|
|
int length;
|
|
};
|
|
|
|
/* 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 (std::vector<mem_range> *memory);
|
|
|
|
#endif
|