diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-06-05 21:18:05 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-06-05 21:18:05 +0000 |
| commit | 1b162304d12fb239357849951093adf48609265a (patch) | |
| tree | 85df35493914699d8e3142209c8286a35bdc5ee2 | |
| parent | 8556afb4f53f99b32e75285a7eb3839e0b6911ee (diff) | |
| download | gdb-1b162304d12fb239357849951093adf48609265a.zip gdb-1b162304d12fb239357849951093adf48609265a.tar.gz gdb-1b162304d12fb239357849951093adf48609265a.tar.bz2 | |
gdb/
* symfile-mem.c: Change gdb_static_assert to ssize_t.
(target_read_memory_bfd): Cast gdb_assert LEN to ssize_t.
* target.c (target_read_memory): Change LEN to ssize_t.
* target.h (target_read_memory): Change LEN to ssize_t.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/symfile-mem.c | 6 | ||||
| -rw-r--r-- | gdb/target.c | 2 | ||||
| -rw-r--r-- | gdb/target.h | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5c5f8c5..bf9a266 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-06-05 Jan Kratochvil <jan.kratochvil@redhat.com> + + * symfile-mem.c: Change gdb_static_assert to ssize_t. + (target_read_memory_bfd): Cast gdb_assert LEN to ssize_t. + * target.c (target_read_memory): Change LEN to ssize_t. + * target.h (target_read_memory): Change LEN to ssize_t. + 2012-06-05 Pedro Alves <palves@redhat.com> PR backtrace/13866 diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index 45d95a7..e80fd25 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -60,7 +60,7 @@ gdb_static_assert (sizeof (CORE_ADDR) == sizeof (bfd_vma)); gdb_static_assert (sizeof (gdb_byte) == sizeof (bfd_byte)); -gdb_static_assert (sizeof (size_t) <= sizeof (bfd_size_type)); +gdb_static_assert (sizeof (ssize_t) <= sizeof (bfd_size_type)); /* Provide bfd/ compatible prototype for target_read_memory. Casting would not be enough as LEN width may differ. */ @@ -69,8 +69,8 @@ static int target_read_memory_bfd (bfd_vma memaddr, bfd_byte *myaddr, bfd_size_type len) { /* MYADDR must be already allocated for the LEN size so it has to fit in - size_t. */ - gdb_assert ((size_t) len == len); + ssize_t. */ + gdb_assert ((ssize_t) len == len); return target_read_memory (memaddr, myaddr, len); } diff --git a/gdb/target.c b/gdb/target.c index 91b4b47..f63291d 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1756,7 +1756,7 @@ target_xfer_partial (struct target_ops *ops, it makes no progress, and then return how much was transferred). */ int -target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, size_t len) +target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len) { /* Dispatch to the topmost target, not the flattened current_target. Memory accesses check target->to_has_(all_)memory, and the diff --git a/gdb/target.h b/gdb/target.h index f3ef33a..de96bcd 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -997,7 +997,7 @@ extern void target_dcache_invalidate (void); extern int target_read_string (CORE_ADDR, char **, int, int *); extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, - size_t len); + ssize_t len); extern int target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len); |