diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-07-15 17:37:27 +0200 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-07-15 17:40:38 +0200 |
commit | 9904185cfde13d6c6849f1f042c8e3b74974cf08 (patch) | |
tree | d5118046648aec766d6176db9b1ae6c1b7baecec /gdb/gdbserver/target.c | |
parent | f7af1fcd759fa126612018a5916cf808df7bb8bc (diff) | |
download | fsf-binutils-gdb-9904185cfde13d6c6849f1f042c8e3b74974cf08.zip fsf-binutils-gdb-9904185cfde13d6c6849f1f042c8e3b74974cf08.tar.gz fsf-binutils-gdb-9904185cfde13d6c6849f1f042c8e3b74974cf08.tar.bz2 |
Move linux_find_memory_regions_full & co.
This should be just a move with no changes.
gdb/ChangeLog
2015-07-15 Aleksandar Ristovski <aristovski@qnx.com
Jan Kratochvil <jan.kratochvil@redhat.com>
Move linux_find_memory_regions_full & co.
* linux-tdep.c (nat/linux-maps.h): Include.
(gdb_regex.h): Remove the include.
(enum filterflags, struct smaps_vmflags, read_mapping, decode_vmflags)
(mapping_is_anonymous_p, dump_mapping_p): Moved to nat/linux-maps.c.
(linux_find_memory_region_ftype): Moved typedef to nat/linux-maps.h.
(linux_find_memory_regions_full): Moved definition to nat/linux-maps.c.
* nat/linux-maps.c: Include ctype.h, target/target-utils.h, gdb_regex.h
and target/target.h.
(struct smaps_vmflags, read_mapping, decode_vmflags)
(mapping_is_anonymous_p, dump_mapping_p): Move from linux-tdep.c.
(linux_find_memory_regions_full): Move from linux-tdep.c.
* nat/linux-maps.h (read_mapping): New declaration.
(linux_find_memory_region_ftype, enum filterflags): Moved from
linux-tdep.c.
(linux_find_memory_regions_full): New declaration.
* target.c (target/target-utils.h): Include.
(read_alloc_pread_ftype): Moved typedef to target/target-utils.h.
(read_alloc, read_stralloc_func_ftype, read_stralloc): Moved
definitions to target/target-utils.c.
* target.h (target_fileio_read_stralloc): Move it to target/target.h.
* target/target-utils.c (read_alloc, read_stralloc): Move definitions
from target.c.
* target/target-utils.h (read_alloc_pread_ftype): New typedef.
(read_alloc): New declaration.
(read_stralloc_func_ftype): New typedef.
(read_stralloc): New declaration.
* target/target.h (target_fileio_read_stralloc): Move it from target.h.
gdb/gdbserver/ChangeLog
2015-07-15 Aleksandar Ristovski <aristovski@qnx.com
Jan Kratochvil <jan.kratochvil@redhat.com>
* target.c: Include target/target-utils.h and fcntl.h.
(target_fileio_read_stralloc_1_pread, target_fileio_read_stralloc_1)
(target_fileio_read_stralloc): New functions.
Diffstat (limited to 'gdb/gdbserver/target.c')
-rw-r--r-- | gdb/gdbserver/target.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index 14999e6..5525b1f 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -20,6 +20,8 @@ #include "server.h" #include "tracepoint.h" +#include "target/target-utils.h" +#include <fcntl.h> struct target_ops *the_target; @@ -218,3 +220,37 @@ kill_inferior (int pid) return (*the_target->kill) (pid); } + +static int +target_fileio_read_stralloc_1_pread (int handle, gdb_byte *read_buf, int len, + ULONGEST offset, int *target_errno) +{ + int retval = pread (handle, read_buf, len, offset); + + *target_errno = errno; + return retval; +} + +static LONGEST +target_fileio_read_stralloc_1 (struct inferior *inf, const char *filename, + gdb_byte **buf_p, int padding) +{ + int fd; + LONGEST retval; + + fd = open (filename, O_RDONLY); + if (fd == -1) + return -1; + + retval = read_alloc (buf_p, fd, target_fileio_read_stralloc_1_pread, padding); + + close (fd); + + return retval; +} + +char * +target_fileio_read_stralloc (struct inferior *inf, const char *filename) +{ + return read_stralloc (inf, filename, target_fileio_read_stralloc_1); +} |