gdbserver/proc-service.c: Change CORE_ADDR cast to uintptr_t

Fixes on i386:

../../../binutils-gdb/gdb/gdbserver/proc-service.c: In function ps_pdread:
../../../binutils-gdb/gdb/gdbserver/proc-service.c:83:25: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
../../../binutils-gdb/gdb/gdbserver/proc-service.c: In function ps_pdwrite:
../../../binutils-gdb/gdb/gdbserver/proc-service.c:93:30: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]

I could have kept both casts:

  (CORE_ADDR) (uintptr_t) addr

but it's cleaner this way.  The uintptr_t implicitely gets promoted to a
CORE_ADDR, which is at least as long as uintptr_t.

gdb/gdbserver/ChangeLog:

	* proc-service.c (ps_pdread): Change CORE_ADDR cast to uintptr_t.
	(ps_pdwrite): Likewise.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 52d6b50342394b399c826209158297e0aa34cb83..dda226edb25d3d218892d3254c38352d2b58ed3f 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-30  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * proc-service.c (ps_pdread): Change CORE_ADDR cast to uintptr_t.
+       (ps_pdwrite): Likewise.
+
 2015-10-29 Henrik Wallin <henrik.wallin@windriver.com>
 
        * linux-arm-low.c (arm_new_thread): Move pointer dereference

diff --git a/gdb/gdbserver/proc-service.c b/gdb/gdbserver/proc-service.c
index ae000862a44cd69009c8753d168ddf834c09bb38..f86a2c3c8f5030ed904f80df8bececce93cc6ec8 100644 (file)
--- a/gdb/gdbserver/proc-service.c
+++ b/gdb/gdbserver/proc-service.c
@@ -80,7 +80,7 @@ ps_err_e
 ps_pdread (gdb_ps_prochandle_t ph, psaddr_t addr,
           gdb_ps_read_buf_t buf, gdb_ps_size_t size)
 {
-  read_inferior_memory ((CORE_ADDR) addr, (gdb_byte *) buf, size);
+  read_inferior_memory ((uintptr_t) addr, (gdb_byte *) buf, size);
   return PS_OK;
 }
 
@@ -90,7 +90,7 @@ ps_err_e
 ps_pdwrite (gdb_ps_prochandle_t ph, psaddr_t addr,
            gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
-  if (write_inferior_memory ((CORE_ADDR) addr, (const gdb_byte *) buf, size)
+  if (write_inferior_memory ((uintptr_t) addr, (const gdb_byte *) buf, size)
       != 0)
     return PS_ERR;
   return PS_OK;