2
0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-21 04:42:53 +08:00
binutils-gdb/gdb/target-memory.c
Tom Tromey 268a13a5a3 Rename common to gdbsupport
This is the next patch in the ongoing series to move gdbsever to the
top level.

This patch just renames the "common" directory.  The idea is to do
this move in two parts: first rename the directory (this patch), then
move the directory to the top.  This approach makes the patches a bit
more tractable.

I chose the name "gdbsupport" for the directory.  However, as this
patch was largely written by sed, we could pick a new name without too
much difficulty.

Tested by the buildbot.

gdb/ChangeLog
2019-07-09  Tom Tromey  <tom@tromey.com>

	* contrib/ari/gdb_ari.sh: Change common to gdbsupport.
	* configure: Rebuild.
	* configure.ac: Change common to gdbsupport.
	* gdbsupport: Rename from common.
	* acinclude.m4: Change common to gdbsupport.
	* Makefile.in (CONFIG_SRC_SUBDIR, COMMON_SFILES)
	(HFILES_NO_SRCDIR, stamp-version, ALLDEPFILES): Change common to
	gdbsupport.
	* aarch64-tdep.c, ada-lang.c, ada-lang.h, agent.c, alloc.c,
	amd64-darwin-tdep.c, amd64-dicos-tdep.c, amd64-fbsd-nat.c,
	amd64-fbsd-tdep.c, amd64-linux-nat.c, amd64-linux-tdep.c,
	amd64-nbsd-tdep.c, amd64-obsd-tdep.c, amd64-sol2-tdep.c,
	amd64-tdep.c, amd64-windows-tdep.c, arch-utils.c,
	arch/aarch64-insn.c, arch/aarch64.c, arch/aarch64.h, arch/amd64.c,
	arch/amd64.h, arch/arm-get-next-pcs.c, arch/arm-linux.c,
	arch/arm.c, arch/i386.c, arch/i386.h, arch/ppc-linux-common.c,
	arch/riscv.c, arch/riscv.h, arch/tic6x.c, arm-tdep.c, auto-load.c,
	auxv.c, ax-gdb.c, ax-general.c, ax.h, breakpoint.c, breakpoint.h,
	btrace.c, btrace.h, build-id.c, build-id.h, c-lang.h, charset.c,
	charset.h, cli/cli-cmds.c, cli/cli-cmds.h, cli/cli-decode.c,
	cli/cli-dump.c, cli/cli-option.h, cli/cli-script.c,
	coff-pe-read.c, command.h, compile/compile-c-support.c,
	compile/compile-c.h, compile/compile-cplus-symbols.c,
	compile/compile-cplus-types.c, compile/compile-cplus.h,
	compile/compile-loc2c.c, compile/compile.c, completer.c,
	completer.h, contrib/ari/gdb_ari.sh, corefile.c, corelow.c,
	cp-support.c, cp-support.h, cp-valprint.c, csky-tdep.c, ctf.c,
	darwin-nat.c, debug.c, defs.h, disasm-selftests.c, disasm.c,
	disasm.h, dtrace-probe.c, dwarf-index-cache.c,
	dwarf-index-cache.h, dwarf-index-write.c, dwarf2-frame.c,
	dwarf2expr.c, dwarf2loc.c, dwarf2read.c, event-loop.c,
	event-top.c, exceptions.c, exec.c, extension.h, fbsd-nat.c,
	features/aarch64-core.c, features/aarch64-fpu.c,
	features/aarch64-pauth.c, features/aarch64-sve.c,
	features/i386/32bit-avx.c, features/i386/32bit-avx512.c,
	features/i386/32bit-core.c, features/i386/32bit-linux.c,
	features/i386/32bit-mpx.c, features/i386/32bit-pkeys.c,
	features/i386/32bit-segments.c, features/i386/32bit-sse.c,
	features/i386/64bit-avx.c, features/i386/64bit-avx512.c,
	features/i386/64bit-core.c, features/i386/64bit-linux.c,
	features/i386/64bit-mpx.c, features/i386/64bit-pkeys.c,
	features/i386/64bit-segments.c, features/i386/64bit-sse.c,
	features/i386/x32-core.c, features/riscv/32bit-cpu.c,
	features/riscv/32bit-csr.c, features/riscv/32bit-fpu.c,
	features/riscv/64bit-cpu.c, features/riscv/64bit-csr.c,
	features/riscv/64bit-fpu.c, features/tic6x-c6xp.c,
	features/tic6x-core.c, features/tic6x-gp.c, filename-seen-cache.h,
	findcmd.c, findvar.c, fork-child.c, gcore.c, gdb_bfd.c, gdb_bfd.h,
	gdb_proc_service.h, gdb_regex.c, gdb_select.h, gdb_usleep.c,
	gdbarch-selftests.c, gdbthread.h, gdbtypes.h, gnu-nat.c,
	go32-nat.c, guile/guile.c, guile/scm-ports.c,
	guile/scm-safe-call.c, guile/scm-type.c, i386-fbsd-nat.c,
	i386-fbsd-tdep.c, i386-go32-tdep.c, i386-linux-nat.c,
	i386-linux-tdep.c, i386-tdep.c, i387-tdep.c,
	ia64-libunwind-tdep.c, ia64-linux-nat.c, inf-child.c,
	inf-ptrace.c, infcall.c, infcall.h, infcmd.c, inferior-iter.h,
	inferior.c, inferior.h, inflow.c, inflow.h, infrun.c, infrun.h,
	inline-frame.c, language.h, linespec.c, linux-fork.c, linux-nat.c,
	linux-tdep.c, linux-thread-db.c, location.c, machoread.c,
	macrotab.h, main.c, maint.c, maint.h, memattr.c, memrange.h,
	mi/mi-cmd-break.h, mi/mi-cmd-env.c, mi/mi-cmd-stack.c,
	mi/mi-cmd-var.c, mi/mi-interp.c, mi/mi-main.c, mi/mi-parse.h,
	minsyms.c, mips-linux-tdep.c, namespace.h,
	nat/aarch64-linux-hw-point.c, nat/aarch64-linux-hw-point.h,
	nat/aarch64-linux.c, nat/aarch64-sve-linux-ptrace.c,
	nat/amd64-linux-siginfo.c, nat/fork-inferior.c,
	nat/linux-btrace.c, nat/linux-btrace.h, nat/linux-namespaces.c,
	nat/linux-nat.h, nat/linux-osdata.c, nat/linux-personality.c,
	nat/linux-procfs.c, nat/linux-ptrace.c, nat/linux-ptrace.h,
	nat/linux-waitpid.c, nat/mips-linux-watch.c,
	nat/mips-linux-watch.h, nat/ppc-linux.c, nat/x86-dregs.c,
	nat/x86-dregs.h, nat/x86-linux-dregs.c, nat/x86-linux.c,
	nto-procfs.c, nto-tdep.c, objfile-flags.h, objfiles.c, objfiles.h,
	obsd-nat.c, observable.h, osdata.c, p-valprint.c, parse.c,
	parser-defs.h, ppc-linux-nat.c, printcmd.c, probe.c, proc-api.c,
	procfs.c, producer.c, progspace.h, psymtab.h,
	python/py-framefilter.c, python/py-inferior.c, python/py-ref.h,
	python/py-type.c, python/python.c, record-btrace.c, record-full.c,
	record.c, record.h, regcache-dump.c, regcache.c, regcache.h,
	remote-fileio.c, remote-fileio.h, remote-sim.c, remote.c,
	riscv-tdep.c, rs6000-aix-tdep.c, rust-exp.y, s12z-tdep.c,
	selftest-arch.c, ser-base.c, ser-event.c, ser-pipe.c, ser-tcp.c,
	ser-unix.c, skip.c, solib-aix.c, solib-target.c, solib.c,
	source-cache.c, source.c, source.h, sparc-nat.c, spu-linux-nat.c,
	stack.c, stap-probe.c, symfile-add-flags.h, symfile.c, symfile.h,
	symtab.c, symtab.h, target-descriptions.c, target-descriptions.h,
	target-memory.c, target.c, target.h, target/waitstatus.c,
	target/waitstatus.h, thread-iter.h, thread.c, tilegx-tdep.c,
	top.c, top.h, tracefile-tfile.c, tracefile.c, tracepoint.c,
	tracepoint.h, tui/tui-io.c, ui-file.c, ui-out.h,
	unittests/array-view-selftests.c,
	unittests/child-path-selftests.c, unittests/cli-utils-selftests.c,
	unittests/common-utils-selftests.c,
	unittests/copy_bitwise-selftests.c, unittests/environ-selftests.c,
	unittests/format_pieces-selftests.c,
	unittests/function-view-selftests.c,
	unittests/lookup_name_info-selftests.c,
	unittests/memory-map-selftests.c, unittests/memrange-selftests.c,
	unittests/mkdir-recursive-selftests.c,
	unittests/observable-selftests.c,
	unittests/offset-type-selftests.c, unittests/optional-selftests.c,
	unittests/parse-connection-spec-selftests.c,
	unittests/ptid-selftests.c, unittests/rsp-low-selftests.c,
	unittests/scoped_fd-selftests.c,
	unittests/scoped_mmap-selftests.c,
	unittests/scoped_restore-selftests.c,
	unittests/string_view-selftests.c, unittests/style-selftests.c,
	unittests/tracepoint-selftests.c, unittests/unpack-selftests.c,
	unittests/utils-selftests.c, unittests/xml-utils-selftests.c,
	utils.c, utils.h, valarith.c, valops.c, valprint.c, value.c,
	value.h, varobj.c, varobj.h, windows-nat.c, x86-linux-nat.c,
	xml-support.c, xml-support.h, xml-tdesc.h, xstormy16-tdep.c,
	xtensa-linux-nat.c, dwarf2read.h: Change common to gdbsupport.

gdb/gdbserver/ChangeLog
2019-07-09  Tom Tromey  <tom@tromey.com>

	* configure: Rebuild.
	* configure.ac: Change common to gdbsupport.
	* acinclude.m4: Change common to gdbsupport.
	* Makefile.in (SFILES, OBS, GDBREPLAY_OBS, IPA_OBJS)
	(version-generated.c, gdbsupport/%-ipa.o, gdbsupport/%.o): Change
	common to gdbsupport.
	* ax.c, event-loop.c, fork-child.c, gdb_proc_service.h,
	gdbreplay.c, gdbthread.h, hostio-errno.c, hostio.c, i387-fp.c,
	inferiors.c, inferiors.h, linux-aarch64-tdesc-selftest.c,
	linux-amd64-ipa.c, linux-i386-ipa.c, linux-low.c,
	linux-tic6x-low.c, linux-x86-low.c, linux-x86-tdesc-selftest.c,
	linux-x86-tdesc.c, lynx-i386-low.c, lynx-low.c, mem-break.h,
	nto-x86-low.c, regcache.c, regcache.h, remote-utils.c, server.c,
	server.h, spu-low.c, symbol.c, target.h, tdesc.c, tdesc.h,
	thread-db.c, tracepoint.c, win32-i386-low.c, win32-low.c: Change
	common to gdbsupport.
2019-07-09 07:45:38 -06:00

376 lines
11 KiB
C

/* Parts of target interface that deal with accessing memory and memory-like
objects.
Copyright (C) 2006-2019 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 "gdbsupport/vec.h"
#include "target.h"
#include "memory-map.h"
#include "gdbsupport/gdb_sys_time.h"
#include <algorithm>
static bool
compare_block_starting_address (const memory_write_request &a_req,
const memory_write_request &b_req)
{
return a_req.begin < b_req.begin;
}
/* Adds to RESULT all memory write requests from BLOCK that are
in [BEGIN, END) range.
If any memory request is only partially in the specified range,
that part of the memory request will be added. */
static void
claim_memory (const std::vector<memory_write_request> &blocks,
std::vector<memory_write_request> *result,
ULONGEST begin,
ULONGEST end)
{
ULONGEST claimed_begin;
ULONGEST claimed_end;
for (const memory_write_request &r : blocks)
{
/* If the request doesn't overlap [BEGIN, END), skip it. We
must handle END == 0 meaning the top of memory; we don't yet
check for R->end == 0, which would also mean the top of
memory, but there's an assertion in
target_write_memory_blocks which checks for that. */
if (begin >= r.end)
continue;
if (end != 0 && end <= r.begin)
continue;
claimed_begin = std::max (begin, r.begin);
if (end == 0)
claimed_end = r.end;
else
claimed_end = std::min (end, r.end);
if (claimed_begin == r.begin && claimed_end == r.end)
result->push_back (r);
else
{
struct memory_write_request n = r;
n.begin = claimed_begin;
n.end = claimed_end;
n.data += claimed_begin - r.begin;
result->push_back (n);
}
}
}
/* Given a vector of struct memory_write_request objects in BLOCKS,
add memory requests for flash memory into FLASH_BLOCKS, and for
regular memory to REGULAR_BLOCKS. */
static void
split_regular_and_flash_blocks (const std::vector<memory_write_request> &blocks,
std::vector<memory_write_request> *regular_blocks,
std::vector<memory_write_request> *flash_blocks)
{
struct mem_region *region;
CORE_ADDR cur_address;
/* This implementation runs in O(length(regions)*length(blocks)) time.
However, in most cases the number of blocks will be small, so this does
not matter.
Note also that it's extremely unlikely that a memory write request
will span more than one memory region, however for safety we handle
such situations. */
cur_address = 0;
while (1)
{
std::vector<memory_write_request> *r;
region = lookup_mem_region (cur_address);
r = region->attrib.mode == MEM_FLASH ? flash_blocks : regular_blocks;
cur_address = region->hi;
claim_memory (blocks, r, region->lo, region->hi);
if (cur_address == 0)
break;
}
}
/* Given an ADDRESS, if BEGIN is non-NULL this function sets *BEGIN
to the start of the flash block containing the address. Similarly,
if END is non-NULL *END will be set to the address one past the end
of the block containing the address. */
static void
block_boundaries (CORE_ADDR address, CORE_ADDR *begin, CORE_ADDR *end)
{
struct mem_region *region;
unsigned blocksize;
CORE_ADDR offset_in_region;
region = lookup_mem_region (address);
gdb_assert (region->attrib.mode == MEM_FLASH);
blocksize = region->attrib.blocksize;
offset_in_region = address - region->lo;
if (begin)
*begin = region->lo + offset_in_region / blocksize * blocksize;
if (end)
*end = region->lo + (offset_in_region + blocksize - 1) / blocksize * blocksize;
}
/* Given the list of memory requests to be WRITTEN, this function
returns write requests covering each group of flash blocks which must
be erased. */
static std::vector<memory_write_request>
blocks_to_erase (const std::vector<memory_write_request> &written)
{
std::vector<memory_write_request> result;
for (const memory_write_request &request : written)
{
CORE_ADDR begin, end;
block_boundaries (request.begin, &begin, 0);
block_boundaries (request.end - 1, 0, &end);
if (!result.empty () && result.back ().end >= begin)
result.back ().end = end;
else
result.emplace_back (begin, end);
}
return result;
}
/* Given ERASED_BLOCKS, a list of blocks that will be erased with
flash erase commands, and WRITTEN_BLOCKS, the list of memory
addresses that will be written, compute the set of memory addresses
that will be erased but not rewritten (e.g. padding within a block
which is only partially filled by "load"). */
static std::vector<memory_write_request>
compute_garbled_blocks (const std::vector<memory_write_request> &erased_blocks,
const std::vector<memory_write_request> &written_blocks)
{
std::vector<memory_write_request> result;
unsigned j;
unsigned je = written_blocks.size ();
/* Look at each erased memory_write_request in turn, and
see what part of it is subsequently written to.
This implementation is O(length(erased) * length(written)). If
the lists are sorted at this point it could be rewritten more
efficiently, but the complexity is not generally worthwhile. */
for (const memory_write_request &erased_iter : erased_blocks)
{
/* Make a deep copy -- it will be modified inside the loop, but
we don't want to modify original vector. */
struct memory_write_request erased = erased_iter;
for (j = 0; j != je;)
{
const memory_write_request *written = &written_blocks[j];
/* Now try various cases. */
/* If WRITTEN is fully to the left of ERASED, check the next
written memory_write_request. */
if (written->end <= erased.begin)
{
++j;
continue;
}
/* If WRITTEN is fully to the right of ERASED, then ERASED
is not written at all. WRITTEN might affect other
blocks. */
if (written->begin >= erased.end)
{
result.push_back (erased);
goto next_erased;
}
/* If all of ERASED is completely written, we can move on to
the next erased region. */
if (written->begin <= erased.begin
&& written->end >= erased.end)
{
goto next_erased;
}
/* If there is an unwritten part at the beginning of ERASED,
then we should record that part and try this inner loop
again for the remainder. */
if (written->begin > erased.begin)
{
result.emplace_back (erased.begin, written->begin);
erased.begin = written->begin;
continue;
}
/* If there is an unwritten part at the end of ERASED, we
forget about the part that was written to and wait to see
if the next write request writes more of ERASED. We can't
push it yet. */
if (written->end < erased.end)
{
erased.begin = written->end;
++j;
continue;
}
}
/* If we ran out of write requests without doing anything about
ERASED, then that means it's really erased. */
result.push_back (erased);
next_erased:
;
}
return result;
}
int
target_write_memory_blocks (const std::vector<memory_write_request> &requests,
enum flash_preserve_mode preserve_flash_p,
void (*progress_cb) (ULONGEST, void *))
{
std::vector<memory_write_request> blocks = requests;
std::vector<memory_write_request> regular;
std::vector<memory_write_request> flash;
std::vector<memory_write_request> erased, garbled;
/* END == 0 would represent wraparound: a write to the very last
byte of the address space. This file was not written with that
possibility in mind. This is fixable, but a lot of work for a
rare problem; so for now, fail noisily here instead of obscurely
later. */
for (const memory_write_request &iter : requests)
gdb_assert (iter.end != 0);
/* Sort the blocks by their start address. */
std::sort (blocks.begin (), blocks.end (), compare_block_starting_address);
/* Split blocks into list of regular memory blocks,
and list of flash memory blocks. */
split_regular_and_flash_blocks (blocks, &regular, &flash);
/* If a variable is added to forbid flash write, even during "load",
it should be checked here. Similarly, if this function is used
for other situations besides "load" in which writing to flash
is undesirable, that should be checked here. */
/* Find flash blocks to erase. */
erased = blocks_to_erase (flash);
/* Find what flash regions will be erased, and not overwritten; then
either preserve or discard the old contents. */
garbled = compute_garbled_blocks (erased, flash);
std::vector<gdb::unique_xmalloc_ptr<gdb_byte>> mem_holders;
if (!garbled.empty ())
{
if (preserve_flash_p == flash_preserve)
{
/* Read in regions that must be preserved and add them to
the list of blocks we read. */
for (memory_write_request &iter : garbled)
{
gdb_assert (iter.data == NULL);
gdb::unique_xmalloc_ptr<gdb_byte> holder
((gdb_byte *) xmalloc (iter.end - iter.begin));
iter.data = holder.get ();
mem_holders.push_back (std::move (holder));
int err = target_read_memory (iter.begin, iter.data,
iter.end - iter.begin);
if (err != 0)
return err;
flash.push_back (iter);
}
std::sort (flash.begin (), flash.end (),
compare_block_starting_address);
}
}
/* We could coalesce adjacent memory blocks here, to reduce the
number of write requests for small sections. However, we would
have to reallocate and copy the data pointers, which could be
large; large sections are more common in loadable objects than
large numbers of small sections (although the reverse can be true
in object files). So, we issue at least one write request per
passed struct memory_write_request. The remote stub will still
have the opportunity to batch flash requests. */
/* Write regular blocks. */
for (const memory_write_request &iter : regular)
{
LONGEST len;
len = target_write_with_progress (current_top_target (),
TARGET_OBJECT_MEMORY, NULL,
iter.data, iter.begin,
iter.end - iter.begin,
progress_cb, iter.baton);
if (len < (LONGEST) (iter.end - iter.begin))
{
/* Call error? */
return -1;
}
}
if (!erased.empty ())
{
/* Erase all pages. */
for (const memory_write_request &iter : erased)
target_flash_erase (iter.begin, iter.end - iter.begin);
/* Write flash data. */
for (const memory_write_request &iter : flash)
{
LONGEST len;
len = target_write_with_progress (current_top_target (),
TARGET_OBJECT_FLASH, NULL,
iter.data, iter.begin,
iter.end - iter.begin,
progress_cb, iter.baton);
if (len < (LONGEST) (iter.end - iter.begin))
error (_("Error writing data to flash"));
}
target_flash_done ();
}
return 0;
}