This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[rfc] Get rid of paddr_t


This is an improved version of a patch I originally submitted in March
2006.  I noticed at the time that we were mixing CORE_ADDR and
psaddr_t carelessly; psaddr_t comes from system headers, is used by
libthread_db, and is a pointer type on every system I could check.
This time I introduced helper routines to make the conversion
explicit, as well as to handle it correctly on MIPS.

Of course this means that libthread_db won't work if a target pointer
doesn't fit in a host pointer (i.e. using a 32-bit GDB to debug a
64-bit threaded program).  But it should fix the opposite case of
using a 64-bit GDB to debug a 32-bit threaded program, where a host
pointer is wider than a target pointer.

Does anyone see a problem in this version?  Tested x86_64-linux.

-- 
Daniel Jacobowitz
CodeSourcery

2007-04-30  Daniel Jacobowitz  <dan@codesourcery.com>

	* gdb_proc_service.h (paddr_t): Delete typedef.
	* proc-service.c (ps_addr_to_core_addr, core_addr_to_ps_addr): New.
	(ps_xfer_memory): Take a psaddr_t.  Use ps_addr_to_core_addr.
	(ps_pglobal_lookup): Take a psaddr_t *.  Use core_addr_to_ps_addr.
	(ps_pdread, ps_pdwrite, ps_ptread, ps_ptwrite): Take a psaddr_t.
	* sol-thread.c (gdb_ps_addr_t): Use psaddr_t instead of paddr_t.
	* Makefile.in (proc-service.o): Update.

---
 Makefile.in        |    2 +-
 gdb_proc_service.h |    2 --
 proc-service.c     |   51 ++++++++++++++++++++++++++++++++++++++-------------
 sol-thread.c       |    2 +-
 4 files changed, 40 insertions(+), 17 deletions(-)

Index: gdb/gdb_proc_service.h
===================================================================
--- gdb.orig/gdb_proc_service.h	2007-04-30 13:14:20.000000000 -0400
+++ gdb/gdb_proc_service.h	2007-04-30 13:14:35.000000000 -0400
@@ -48,8 +48,6 @@ typedef enum
 typedef unsigned int lwpid_t;
 #endif
 
-typedef unsigned long paddr_t;
-
 #ifndef HAVE_PSADDR_T
 typedef unsigned long psaddr_t;
 #endif
Index: gdb/proc-service.c
===================================================================
--- gdb.orig/proc-service.c	2007-04-30 13:14:20.000000000 -0400
+++ gdb/proc-service.c	2007-04-30 13:42:23.000000000 -0400
@@ -21,14 +21,16 @@
 
 #include "defs.h"
 
-#include "gdb_proc_service.h"
-#include <sys/procfs.h>
-
+#include "gdbcore.h"
 #include "inferior.h"
 #include "symtab.h"
 #include "target.h"
 
-/* Prototypes for supply_gregset etc.  */
+#include "gdb_proc_service.h"
+#include "gdb_stdint.h"
+
+#include <sys/procfs.h>
+
 #include "gregset.h"
 
 
@@ -57,6 +59,28 @@ typedef size_t gdb_ps_size_t;
 
 /* Helper functions.  */
 
+/* Convert a psaddr_t to a CORE_ADDR.  */
+
+static CORE_ADDR
+ps_addr_to_core_addr (psaddr_t addr)
+{
+  if (exec_bfd && bfd_get_sign_extend_vma (exec_bfd))
+    return (intptr_t) addr;
+  else
+    return (uintptr_t) addr;
+}
+
+/* Convert a CORE_ADDR to a psaddr_t.  */
+
+static psaddr_t
+core_addr_to_ps_addr (CORE_ADDR addr)
+{
+  if (exec_bfd && bfd_get_sign_extend_vma (exec_bfd))
+    return (psaddr_t) (intptr_t) addr;
+  else
+    return (psaddr_t) (uintptr_t) addr;
+}
+
 /* Transfer LEN bytes of memory between BUF and address ADDR in the
    process specified by PH.  If WRITE, transfer them to the process,
    else transfer them from the process.  Returns PS_OK for success,
@@ -66,18 +90,19 @@ typedef size_t gdb_ps_size_t;
    ps_ptwrite.  */
 
 static ps_err_e
-ps_xfer_memory (const struct ps_prochandle *ph, paddr_t addr,
+ps_xfer_memory (const struct ps_prochandle *ph, psaddr_t addr,
 		gdb_byte *buf, size_t len, int write)
 {
   struct cleanup *old_chain = save_inferior_ptid ();
   int ret;
+  CORE_ADDR core_addr = ps_addr_to_core_addr (addr);
 
   inferior_ptid = pid_to_ptid (ph->pid);
 
   if (write)
-    ret = target_write_memory (addr, buf, len);
+    ret = target_write_memory (core_addr, buf, len);
   else
-    ret = target_read_memory (addr, buf, len);
+    ret = target_read_memory (core_addr, buf, len);
 
   do_cleanups (old_chain);
 
@@ -172,7 +197,7 @@ ps_plog (const char *fmt, ...)
 
 ps_err_e
 ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *obj,
-		   const char *name, paddr_t *sym_addr)
+		   const char *name, psaddr_t *sym_addr)
 {
   struct minimal_symbol *ms;
 
@@ -181,7 +206,7 @@ ps_pglobal_lookup (gdb_ps_prochandle_t p
   if (ms == NULL)
     return PS_NOSYM;
 
-  *sym_addr = SYMBOL_VALUE_ADDRESS (ms);
+  *sym_addr = core_addr_to_ps_addr (SYMBOL_VALUE_ADDRESS (ms));
   return PS_OK;
 }
 
@@ -189,7 +214,7 @@ ps_pglobal_lookup (gdb_ps_prochandle_t p
    them into BUF.  */
 
 ps_err_e
-ps_pdread (gdb_ps_prochandle_t ph, paddr_t addr,
+ps_pdread (gdb_ps_prochandle_t ph, psaddr_t addr,
 	   gdb_ps_read_buf_t buf, gdb_ps_size_t size)
 {
   return ps_xfer_memory (ph, addr, buf, size, 0);
@@ -198,7 +223,7 @@ ps_pdread (gdb_ps_prochandle_t ph, paddr
 /* Write SIZE bytes from BUF into the target process PH at address ADDR.  */
 
 ps_err_e
-ps_pdwrite (gdb_ps_prochandle_t ph, paddr_t addr,
+ps_pdwrite (gdb_ps_prochandle_t ph, psaddr_t addr,
 	    gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
   return ps_xfer_memory (ph, addr, (gdb_byte *) buf, size, 1);
@@ -208,7 +233,7 @@ ps_pdwrite (gdb_ps_prochandle_t ph, padd
    them into BUF.  */
 
 ps_err_e
-ps_ptread (gdb_ps_prochandle_t ph, paddr_t addr,
+ps_ptread (gdb_ps_prochandle_t ph, psaddr_t addr,
 	   gdb_ps_read_buf_t buf, gdb_ps_size_t size)
 {
   return ps_xfer_memory (ph, addr, (gdb_byte *) buf, size, 0);
@@ -217,7 +242,7 @@ ps_ptread (gdb_ps_prochandle_t ph, paddr
 /* Write SIZE bytes from BUF into the target process PH at address ADDR.  */
 
 ps_err_e
-ps_ptwrite (gdb_ps_prochandle_t ph, paddr_t addr,
+ps_ptwrite (gdb_ps_prochandle_t ph, psaddr_t addr,
 	    gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
   return ps_xfer_memory (ph, addr, (gdb_byte *) buf, size, 1);
Index: gdb/sol-thread.c
===================================================================
--- gdb.orig/sol-thread.c	2007-04-30 13:14:20.000000000 -0400
+++ gdb/sol-thread.c	2007-04-30 13:16:10.000000000 -0400
@@ -921,7 +921,7 @@ typedef const struct ps_prochandle *gdb_
 typedef char *gdb_ps_read_buf_t;
 typedef char *gdb_ps_write_buf_t;
 typedef int gdb_ps_size_t;
-typedef paddr_t gdb_ps_addr_t;
+typedef psaddr_t gdb_ps_addr_t;
 #else
 typedef struct ps_prochandle *gdb_ps_prochandle_t;
 typedef void *gdb_ps_read_buf_t;
Index: gdb/Makefile.in
===================================================================
--- gdb.orig/Makefile.in	2007-04-30 13:38:14.000000000 -0400
+++ gdb/Makefile.in	2007-04-30 13:38:40.000000000 -0400
@@ -2467,7 +2467,7 @@ procfs.o: procfs.c $(defs_h) $(inferior_
 	$(gdb_string_h) $(gdb_assert_h) $(inflow_h) $(auxv_h) \
 	$(gdb_dirent_h) $(gdb_stat_h) $(proc_utils_h) $(gregset_h)
 proc-service.o: proc-service.c $(defs_h) $(gdb_proc_service_h) $(inferior_h) \
-	$(symtab_h) $(target_h) $(gregset_h)
+	$(symtab_h) $(target_h) $(gregset_h) $(gdbcore_h) $(gdb_stdint_h)
 proc-why.o: proc-why.c $(defs_h) $(proc_utils_h)
 prologue-value.o: prologue-value.c $(defs_h) $(gdb_string_h) $(gdb_assert_h) \
 	$(prologue_value_h) $(regcache_h)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]