2004-02-22 Andrew Cagney <cagney@redhat.com>

	* config/pa/tm-hppa.h: Update copyright.
	(DEPRECATED_INIT_FRAME_PC): Delete macro.
	(deprecated_init_frame_pc_default): Delete declaration.
	(hppa_frame_init_saved_regs): Delete declaration.
	(DEPRECATED_FRAME_INIT_SAVED_REGS): Delete macro.
	* hppa-tdep.c: Include "arch-utils.h".
	(hppa_gdbarch_init): Set deprecated init_frame_pc
	and deprecated frame_init_saved_regs.
	(hppa_frame_init_saved_regs): Make static.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e3aead891bf25a21b32e440595bd3a686622914c..7baa02adfefa1428e1fe6f084d8d86c1e9471a69 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-22  Andrew Cagney  <cagney@redhat.com>
+
+       * config/pa/tm-hppa.h: Update copyright.
+       (DEPRECATED_INIT_FRAME_PC): Delete macro.
+       (deprecated_init_frame_pc_default): Delete declaration.
+       (hppa_frame_init_saved_regs): Delete declaration.
+       (DEPRECATED_FRAME_INIT_SAVED_REGS): Delete macro.
+       * hppa-tdep.c: Include "arch-utils.h".
+       (hppa_gdbarch_init): Set deprecated init_frame_pc
+       and deprecated frame_init_saved_regs.
+       (hppa_frame_init_saved_regs): Make static.
+
 2004-02-22  Mark Kettenis  <kettenis@gnu.org>
 
        Remove old 386BSD support.

diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index b8c971c5dc55502af47c3d98dc59c6514c7a9956..c097ccc192dce3a88016765e061b96ccf20a4f52 100644 (file)
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -1,6 +1,8 @@
 /* Parameters for execution on any Hewlett-Packard PA-RISC machine.
-   Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
-   1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+   Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -35,8 +37,6 @@
 #define DEPRECATED_PC_IN_CALL_DUMMY(pc, sp, frame_address) deprecated_pc_in_call_dummy_on_stack (pc, sp, frame_address)
 /* Hack, get around problem with including "arch-utils.h".  */
 struct frame_info;
-extern CORE_ADDR deprecated_init_frame_pc_default (int fromleaf, struct frame_info *prev);
-#define DEPRECATED_INIT_FRAME_PC(l,f) (deprecated_init_frame_pc_default (l, f))
 
 /* Forward declarations of some types we use in prototypes */
 
@@ -109,10 +109,6 @@ extern int hppa_instruction_nullified (void);
 #define INSTRUCTION_NULLIFIED hppa_instruction_nullified ()
 #endif
 
-extern void hppa_frame_init_saved_regs (struct frame_info *);
-#define DEPRECATED_FRAME_INIT_SAVED_REGS(FI) \
-  hppa_frame_init_saved_regs (FI)
-
 #define INSTRUCTION_SIZE 4
 
 /* This sequence of words is the instructions

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 06aa5a9896f387ec482225ddbb1e9913f41bfc3e..3cf05cf1d5282ecabbe4b77c65a8615cf9ad9bac 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -35,6 +35,7 @@
 #include "osabi.h"
 #include "gdb_assert.h"
 #include "infttrace.h"
+#include "arch-utils.h"
 /* For argument passing to the inferior */
 #include "symtab.h"
 #include "infcall.h"
@@ -114,6 +115,8 @@ static unsigned extract_5R_store (unsigned int);
 
 static unsigned extract_5r_store (unsigned int);
 
+static void hppa_frame_init_saved_regs (struct frame_info *frame);
+
 static void find_dummy_frame_regs (struct frame_info *, CORE_ADDR *);
 
 static int find_proc_framesize (CORE_ADDR);
@@ -4226,7 +4229,7 @@ hppa_frame_find_saved_regs (struct frame_info *frame_info,
    that do not yet implement DEPRECATED_FRAME_INIT_SAVED_REGS.  */
 /* Find the addresses in which registers are saved in FRAME.  */
 
-void
+static void
 hppa_frame_init_saved_regs (struct frame_info *frame)
 {
   if (deprecated_get_frame_saved_regs (frame) == NULL)
@@ -5214,6 +5217,8 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 #if 0
 #else
   set_gdbarch_deprecated_saved_pc_after_call (gdbarch, hppa_saved_pc_after_call);
+  set_gdbarch_deprecated_init_frame_pc (gdbarch, deprecated_init_frame_pc_default);
+  set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, hppa_frame_init_saved_regs);
   set_gdbarch_deprecated_init_extra_frame_info (gdbarch, hppa_init_extra_frame_info);
   set_gdbarch_deprecated_frame_chain (gdbarch, hppa_frame_chain);
   set_gdbarch_deprecated_frame_chain_valid (gdbarch, hppa_frame_chain_valid);