* hppa-tdep.h (hppa_frame_prev_register_helper): Change types of

last argument to `gdb_byte *'.
* hppa-tdep.c (hppa32_convert_from_func_ptr_addr): Rewrite.
(hppa_frame_prev_register_helper): Change types of last argument
to `gdb_byte *'.
* hppa-hpux-tdep.c (hppa_hpux_sigtramp_frame_prev_register):
Change types of last argument to `gdb_byte *'.

4 files changed, 31 insertions, 23 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eb827f7c053..129e2e1fec7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,14 @@
 2005-07-18  Mark Kettenis  <kettenis@gnu.org>
+
+	* hppa-tdep.h (hppa_frame_prev_register_helper): Change types of
+	last argument to `gdb_byte *'.
+	* hppa-tdep.c (hppa32_convert_from_func_ptr_addr): Rewrite.
+	(hppa_frame_prev_register_helper): Change types of last argument
+	to `gdb_byte *'.
+	* hppa-hpux-tdep.c (hppa_hpux_sigtramp_frame_prev_register):
+	Change types of last argument to `gdb_byte *'.
+	
+2005-07-18  Mark Kettenis  <kettenis@gnu.org>
 	    Jason Molenda  <jmolenda@apple.com>
 
 	* i386-tdep.c (i386_match_insn): Match complete instruction
diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c
index da43b5253b4..c0f9a3ab1d6 100644
--- a/gdb/hppa-hpux-tdep.c
+++ b/gdb/hppa-hpux-tdep.c
@@ -1225,11 +1225,11 @@ hppa_hpux_sigtramp_frame_this_id (struct frame_info *next_frame,
 
 static void
 hppa_hpux_sigtramp_frame_prev_register (struct frame_info *next_frame,
-					 void **this_prologue_cache,
-					 int regnum, int *optimizedp,
-					 enum lval_type *lvalp, 
-					 CORE_ADDR *addrp,
-					 int *realnump, void *valuep)
+					void **this_prologue_cache,
+					int regnum, int *optimizedp,
+					enum lval_type *lvalp, 
+					CORE_ADDR *addrp,
+					int *realnump, gdb_byte *valuep)
 {
   struct hppa_hpux_sigtramp_unwind_cache *info
     = hppa_hpux_sigtramp_frame_unwind_cache (next_frame, this_prologue_cache);
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 289cf093e97..0f5518c87d0 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -1,8 +1,8 @@
-/* Target-dependent code for the HP PA architecture, for GDB.
+/* Target-dependent code for the HP PA-RISC architecture.
 
    Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -1166,16 +1166,13 @@ hppa64_return_value (struct gdbarch *gdbarch,
 
 
 static CORE_ADDR
-hppa32_convert_from_func_ptr_addr (struct gdbarch *gdbarch,
-				   CORE_ADDR addr,
+hppa32_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr,
 				   struct target_ops *targ)
 {
   if (addr & 2)
     {
-      CORE_ADDR plabel;
-
-      plabel = addr & ~3;
-      target_read_memory(plabel, (char *)&addr, 4);
+      CORE_ADDR plabel = addr & ~3;
+      return read_memory_typed_address (plabel, builtin_type_void_func_ptr);
     }
 
   return addr;
@@ -2599,7 +2596,7 @@ hppa_frame_prev_register_helper (struct frame_info *next_frame,
 			         struct trad_frame_saved_reg saved_regs[],
 				 int regnum, int *optimizedp,
 				 enum lval_type *lvalp, CORE_ADDR *addrp,
-				 int *realnump, void *valuep)
+				 int *realnump, gdb_byte *valuep)
 {
   struct gdbarch *arch = get_frame_arch (next_frame);
 
diff --git a/gdb/hppa-tdep.h b/gdb/hppa-tdep.h
index 35cca4d6560..484a2d50439 100644
--- a/gdb/hppa-tdep.h
+++ b/gdb/hppa-tdep.h
@@ -1,5 +1,6 @@
-/* Common target dependent code for GDB on HPPA systems.
-   Copyright 2003, 2004 Free Software Foundation, Inc.
+/* Target-dependent code for the HP PA-RISC architecture.
+
+   Copyright 2003, 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -226,12 +227,12 @@ int hppa_low_sign_extend (unsigned int, unsigned int);
 int hppa_sign_extend (unsigned int, unsigned int);
 CORE_ADDR hppa_symbol_address(const char *sym);
 
-void
-hppa_frame_prev_register_helper (struct frame_info *next_frame,
-			         struct trad_frame_saved_reg *saved_regs,
-				 int regnum, int *optimizedp,
-				 enum lval_type *lvalp, CORE_ADDR *addrp,
-				 int *realnump, void *valuep);
+extern void
+  hppa_frame_prev_register_helper (struct frame_info *next_frame,
+				   struct trad_frame_saved_reg *saved_regs,
+				   int regnum, int *optimizedp,
+				   enum lval_type *lvalp, CORE_ADDR *addrp,
+				   int *realnump, gdb_byte *valuep);
 
 extern CORE_ADDR hppa_read_pc (ptid_t ptid);
 extern void hppa_write_pc (CORE_ADDR pc, ptid_t ptid);