Re: [PATCH] Memory reads and writes should have size_t length

Siddhesh Poyarekar
2012-06-05T03:16:05Z

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

On Mon, 4 Jun 2012 23:54:19 +0200, Jan wrote:
>
> Unless someone else is going to protect all the hundreds/thousands of
> callers I do not think it is worth it and ssize_t is good enough.
>

OK, thanks for the explanation. Updated patch attached.

Regards,
Siddhesh

gdb/ChangeLog:

2012-06-05 Siddhesh Poyarekar <siddhesh@redhat.com>

* corefile.c (read_memory): Accept LEN argument as ssize_t.
(read_stack): Likewise.
(write_memory): Likewise.
* gdbcore.h (read_memory): Likewise.
(read_stack): Likewise.
(write_memory): Likewise.
* remote.c (remote_write_bytes_aux): Likewise.
(remote_write_bytes): Likewise.
* target.c (target_read_stack): Likewise.
(target_write_memory): Likewise.
(target_write_raw_memory): Likewise.
* target.h (target_read_stack): Likewise.
(target_write_memory): Likewise.
(target_write_raw_memory): Likewise.

[-- Attachment #2: gdb-memory-ssizet.patch --]
[-- Type: text/x-patch, Size: 5186 bytes --]

diff --git a/gdb/corefile.c b/gdb/corefile.c
index 986e4f5..611cd62 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -213,7 +213,7 @@ memory_error (int status, CORE_ADDR memaddr)
/* Same as target_read_memory, but report an error if can't read. */

void
-read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
+read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len)
{
int status;

@@ -225,7 +225,7 @@ read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
/* Same as target_read_stack, but report an error if can't read. */

void
-read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
+read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len)
{
int status;

@@ -352,7 +352,7 @@ read_memory_typed_address (CORE_ADDR addr, struct type *type)
write. */
void
write_memory (CORE_ADDR memaddr,
- const bfd_byte *myaddr, int len)
+ const bfd_byte *myaddr, ssize_t len)
{
int status;

diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h
index 776ce9f..1081f3f 100644
--- a/gdb/gdbcore.h
+++ b/gdb/gdbcore.h
@@ -45,11 +45,11 @@ extern void memory_error (int status, CORE_ADDR memaddr);

/* Like target_read_memory, but report an error if can't read. */

-extern void read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
+extern void read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len);

/* Like target_read_stack, but report an error if can't read. */

-extern void read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
+extern void read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len);

/* Read an integer from debugged memory, given address and number of
bytes. */
@@ -83,7 +83,8 @@ CORE_ADDR read_memory_typed_address (CORE_ADDR addr, struct type *type);
byteswapping, alignment, different sizes for host vs. target types,
etc. */

-extern void write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len);
+extern void write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
+ ssize_t len);

/* Store VALUE at ADDR in the inferior as a LEN-byte unsigned integer. */
extern void write_memory_unsigned_integer (CORE_ADDR addr, int len,
diff --git a/gdb/remote.c b/gdb/remote.c
index 54e7a67..322ff01 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -6450,7 +6450,7 @@ check_binary_download (CORE_ADDR addr)

static int
remote_write_bytes_aux (const char *header, CORE_ADDR memaddr,
- const gdb_byte *myaddr, int len,
+ const gdb_byte *myaddr, ssize_t len,
char packet_format, int use_length)
{
struct remote_state *rs = get_remote_state ();
@@ -6611,7 +6611,7 @@ remote_write_bytes_aux (const char *header, CORE_ADDR memaddr,
error. Only transfer a single packet. */

static int
-remote_write_bytes (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
+remote_write_bytes (CORE_ADDR memaddr, const gdb_byte *myaddr, ssize_t len)
{
char *packet_format = 0;

diff --git a/gdb/target.c b/gdb/target.c
index a2b2098..f7a78bb 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1772,7 +1772,7 @@ target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, size_t len)
the target's stack. This may trigger different cache behavior. */

int
-target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
+target_read_stack (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
@@ -1791,7 +1791,7 @@ target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
Callers that can deal with partial writes should call target_write. */

int
-target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
+target_write_memory (CORE_ADDR memaddr, const 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
@@ -1810,7 +1810,7 @@ target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
should call target_write. */

int
-target_write_raw_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len)
+target_write_raw_memory (CORE_ADDR memaddr, const 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 a615e47..1057a02 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -999,13 +999,13 @@ extern int target_read_string (CORE_ADDR, char **, int, int *);
extern int target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr,
size_t len);

-extern int target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
+extern int target_read_stack (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len);

extern int target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
- int len);
+ ssize_t len);

extern int target_write_raw_memory (CORE_ADDR memaddr, const gdb_byte *myaddr,
- int len);
+ ssize_t len);

/* Fetches the target's memory map. If one is found it is sorted
and returned, after some consistency checking. Otherwise, NULL