2011-02-14 12:20:27 +01:00
|
|
|
/* Memory ranges
|
|
|
|
|
2018-01-01 05:43:02 +01:00
|
|
|
Copyright (C) 2010-2018 Free Software Foundation, Inc.
|
2011-02-14 12:20:27 +01:00
|
|
|
|
|
|
|
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"
|
gdb: Use std::min and std::max throughout
Otherwise including <string> or some other C++ header is broken.
E.g.:
In file included from /opt/gcc/include/c++/7.0.0/bits/char_traits.h:39:0,
from /opt/gcc/include/c++/7.0.0/string:40,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/infrun.c:68:
/opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:243:56: error: macro "min" passed 3 arguments, but takes just 2
min(const _Tp& __a, const _Tp& __b, _Compare __comp)
^
/opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:265:56: error: macro "max" passed 3 arguments, but takes just 2
max(const _Tp& __a, const _Tp& __b, _Compare __comp)
^
In file included from .../src/gdb/infrun.c:21:0:
To the best of my grepping abilities, I believe I adjusted all min/max
calls.
gdb/ChangeLog:
2016-09-16 Pedro Alves <palves@redhat.com>
* defs.h (min, max): Delete.
* aarch64-tdep.c: Include <algorithm> and use std::min and
std::max throughout.
* aarch64-tdep.c: Likewise.
* alpha-tdep.c: Likewise.
* amd64-tdep.c: Likewise.
* amd64-windows-tdep.c: Likewise.
* arm-tdep.c: Likewise.
* avr-tdep.c: Likewise.
* breakpoint.c: Likewise.
* btrace.c: Likewise.
* ctf.c: Likewise.
* disasm.c: Likewise.
* doublest.c: Likewise.
* dwarf2loc.c: Likewise.
* dwarf2read.c: Likewise.
* environ.c: Likewise.
* exec.c: Likewise.
* f-exp.y: Likewise.
* findcmd.c: Likewise.
* ft32-tdep.c: Likewise.
* gcore.c: Likewise.
* hppa-tdep.c: Likewise.
* i386-darwin-tdep.c: Likewise.
* i386-tdep.c: Likewise.
* linux-thread-db.c: Likewise.
* lm32-tdep.c: Likewise.
* m32r-tdep.c: Likewise.
* m88k-tdep.c: Likewise.
* memrange.c: Likewise.
* minidebug.c: Likewise.
* mips-tdep.c: Likewise.
* moxie-tdep.c: Likewise.
* nds32-tdep.c: Likewise.
* nios2-tdep.c: Likewise.
* nto-procfs.c: Likewise.
* parse.c: Likewise.
* ppc-sysv-tdep.c: Likewise.
* probe.c: Likewise.
* record-btrace.c: Likewise.
* remote.c: Likewise.
* rs6000-tdep.c: Likewise.
* rx-tdep.c: Likewise.
* s390-linux-nat.c: Likewise.
* s390-linux-tdep.c: Likewise.
* ser-tcp.c: Likewise.
* sh-tdep.c: Likewise.
* sh64-tdep.c: Likewise.
* source.c: Likewise.
* sparc-tdep.c: Likewise.
* symfile.c: Likewise.
* target-memory.c: Likewise.
* target.c: Likewise.
* tic6x-tdep.c: Likewise.
* tilegx-tdep.c: Likewise.
* tracefile-tfile.c: Likewise.
* tracepoint.c: Likewise.
* valprint.c: Likewise.
* value.c: Likewise.
* xtensa-tdep.c: Likewise.
* cli/cli-cmds.c: Likewise.
* compile/compile-object-load.c: Likewise.
2016-09-16 20:55:17 +02:00
|
|
|
#include <algorithm>
|
2011-02-14 12:20:27 +01:00
|
|
|
|
|
|
|
int
|
|
|
|
mem_ranges_overlap (CORE_ADDR start1, int len1,
|
|
|
|
CORE_ADDR start2, int len2)
|
|
|
|
{
|
|
|
|
ULONGEST h, l;
|
|
|
|
|
gdb: Use std::min and std::max throughout
Otherwise including <string> or some other C++ header is broken.
E.g.:
In file included from /opt/gcc/include/c++/7.0.0/bits/char_traits.h:39:0,
from /opt/gcc/include/c++/7.0.0/string:40,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/infrun.c:68:
/opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:243:56: error: macro "min" passed 3 arguments, but takes just 2
min(const _Tp& __a, const _Tp& __b, _Compare __comp)
^
/opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:265:56: error: macro "max" passed 3 arguments, but takes just 2
max(const _Tp& __a, const _Tp& __b, _Compare __comp)
^
In file included from .../src/gdb/infrun.c:21:0:
To the best of my grepping abilities, I believe I adjusted all min/max
calls.
gdb/ChangeLog:
2016-09-16 Pedro Alves <palves@redhat.com>
* defs.h (min, max): Delete.
* aarch64-tdep.c: Include <algorithm> and use std::min and
std::max throughout.
* aarch64-tdep.c: Likewise.
* alpha-tdep.c: Likewise.
* amd64-tdep.c: Likewise.
* amd64-windows-tdep.c: Likewise.
* arm-tdep.c: Likewise.
* avr-tdep.c: Likewise.
* breakpoint.c: Likewise.
* btrace.c: Likewise.
* ctf.c: Likewise.
* disasm.c: Likewise.
* doublest.c: Likewise.
* dwarf2loc.c: Likewise.
* dwarf2read.c: Likewise.
* environ.c: Likewise.
* exec.c: Likewise.
* f-exp.y: Likewise.
* findcmd.c: Likewise.
* ft32-tdep.c: Likewise.
* gcore.c: Likewise.
* hppa-tdep.c: Likewise.
* i386-darwin-tdep.c: Likewise.
* i386-tdep.c: Likewise.
* linux-thread-db.c: Likewise.
* lm32-tdep.c: Likewise.
* m32r-tdep.c: Likewise.
* m88k-tdep.c: Likewise.
* memrange.c: Likewise.
* minidebug.c: Likewise.
* mips-tdep.c: Likewise.
* moxie-tdep.c: Likewise.
* nds32-tdep.c: Likewise.
* nios2-tdep.c: Likewise.
* nto-procfs.c: Likewise.
* parse.c: Likewise.
* ppc-sysv-tdep.c: Likewise.
* probe.c: Likewise.
* record-btrace.c: Likewise.
* remote.c: Likewise.
* rs6000-tdep.c: Likewise.
* rx-tdep.c: Likewise.
* s390-linux-nat.c: Likewise.
* s390-linux-tdep.c: Likewise.
* ser-tcp.c: Likewise.
* sh-tdep.c: Likewise.
* sh64-tdep.c: Likewise.
* source.c: Likewise.
* sparc-tdep.c: Likewise.
* symfile.c: Likewise.
* target-memory.c: Likewise.
* target.c: Likewise.
* tic6x-tdep.c: Likewise.
* tilegx-tdep.c: Likewise.
* tracefile-tfile.c: Likewise.
* tracepoint.c: Likewise.
* valprint.c: Likewise.
* value.c: Likewise.
* xtensa-tdep.c: Likewise.
* cli/cli-cmds.c: Likewise.
* compile/compile-object-load.c: Likewise.
2016-09-16 20:55:17 +02:00
|
|
|
l = std::max (start1, start2);
|
|
|
|
h = std::min (start1 + len1, start2 + len2);
|
2011-02-14 12:20:27 +01:00
|
|
|
return (l < h);
|
|
|
|
}
|
|
|
|
|
2014-10-10 16:57:13 +02:00
|
|
|
/* 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);
|
|
|
|
}
|
|
|
|
|
2011-02-14 12:20:27 +01:00
|
|
|
void
|
2017-10-16 16:14:53 +02:00
|
|
|
normalize_mem_ranges (std::vector<mem_range> *memory)
|
2011-02-14 12:20:27 +01:00
|
|
|
{
|
2011-02-14 20:19:18 +01:00
|
|
|
/* 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. */
|
|
|
|
|
2017-10-16 16:14:53 +02:00
|
|
|
if (!memory->empty ())
|
2011-02-14 12:20:27 +01:00
|
|
|
{
|
2017-10-16 16:14:53 +02:00
|
|
|
std::vector<mem_range> &m = *memory;
|
2011-02-14 12:20:27 +01:00
|
|
|
|
2017-10-16 16:14:53 +02:00
|
|
|
std::sort (m.begin (), m.end ());
|
2011-02-14 12:20:27 +01:00
|
|
|
|
2017-10-16 16:14:53 +02:00
|
|
|
int a = 0;
|
|
|
|
for (int b = 1; b < m.size (); b++)
|
2011-02-14 12:20:27 +01:00
|
|
|
{
|
|
|
|
/* If mem_range B overlaps or is adjacent to mem_range A,
|
|
|
|
merge them. */
|
2017-10-16 16:14:53 +02:00
|
|
|
if (m[b].start <= m[a].start + m[a].length)
|
2011-02-14 12:20:27 +01:00
|
|
|
{
|
2017-10-16 16:14:53 +02:00
|
|
|
m[a].length = std::max ((CORE_ADDR) m[a].length,
|
|
|
|
(m[b].start - m[a].start) + m[b].length);
|
2011-02-14 12:20:27 +01:00
|
|
|
continue; /* next b, same a */
|
|
|
|
}
|
|
|
|
a++; /* next a */
|
|
|
|
|
|
|
|
if (a != b)
|
2017-10-16 16:14:53 +02:00
|
|
|
m[a] = m[b];
|
2011-02-14 12:20:27 +01:00
|
|
|
}
|
2017-10-16 16:14:53 +02:00
|
|
|
|
|
|
|
m.resize (a + 1);
|
2011-02-14 12:20:27 +01:00
|
|
|
}
|
|
|
|
}
|