mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-24 01:33:32 +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.
77 lines
2.0 KiB
C
77 lines
2.0 KiB
C
/* Memory ranges
|
|
|
|
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/>. */
|
|
|
|
#include "defs.h"
|
|
#include "memrange.h"
|
|
#include <algorithm>
|
|
|
|
int
|
|
mem_ranges_overlap (CORE_ADDR start1, int len1,
|
|
CORE_ADDR start2, int len2)
|
|
{
|
|
ULONGEST h, l;
|
|
|
|
l = std::max (start1, start2);
|
|
h = std::min (start1 + len1, start2 + len2);
|
|
return (l < h);
|
|
}
|
|
|
|
/* See memrange.h. */
|
|
|
|
int
|
|
address_in_mem_range (CORE_ADDR address, const struct mem_range *r)
|
|
{
|
|
return (r->start <= address
|
|
&& (address - r->start) < r->length);
|
|
}
|
|
|
|
void
|
|
normalize_mem_ranges (std::vector<mem_range> *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<mem_range> &m = *memory;
|
|
|
|
std::sort (m.begin (), m.end ());
|
|
|
|
int a = 0;
|
|
for (int b = 1; b < m.size (); b++)
|
|
{
|
|
/* If mem_range B overlaps or is adjacent to mem_range A,
|
|
merge them. */
|
|
if (m[b].start <= m[a].start + m[a].length)
|
|
{
|
|
m[a].length = std::max ((CORE_ADDR) m[a].length,
|
|
(m[b].start - m[a].start) + m[b].length);
|
|
continue; /* next b, same a */
|
|
}
|
|
a++; /* next a */
|
|
|
|
if (a != b)
|
|
m[a] = m[b];
|
|
}
|
|
|
|
m.resize (a + 1);
|
|
}
|
|
}
|