2004-04-06 Andrew Cagney <cagney@redhat.com>

	* hppa-tdep.c (hppa_breakpoint_from_pc): Make static.
	(hppa_gdbarch_init): Set gdbarch_breakpoint_from_pc
	* config/pa/tm-hppa.h (BREAKPOINT_FROM_PC, BREAKPOINT32):
	(hppa_breakpoint_from_pc): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f63459be2cdbc8f0ad99e3353aad275ed89f691b..da5f30144d1dab785dd9771b8ccbffcfe6cd8f9f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-04-06  Andrew Cagney  <cagney@redhat.com>
 
+       * hppa-tdep.c (hppa_breakpoint_from_pc): Make static.
+       (hppa_gdbarch_init): Set gdbarch_breakpoint_from_pc
+       * config/pa/tm-hppa.h (BREAKPOINT_FROM_PC, BREAKPOINT32): 
+       (hppa_breakpoint_from_pc): Delete.
+
        * MAINTAINERS: Mark hppa-elf as buildable with -Werror.
 
 2004-04-05  Andrew Cagney  <cagney@redhat.com>

diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index b3fd8c546adeea6e7a2f05381fe0ab5d6e58dc41..d5d2d038684109c9533b59ca9c9c1a3ca3e28d01 100644 (file)
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -39,12 +39,6 @@ struct value;
 struct type;
 struct inferior_status;
 
-/* Sequence of bytes for breakpoint instruction.  */
-
-const unsigned char *hppa_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr);
-#define BREAKPOINT_FROM_PC(PCPTR,LENPTR) hppa_breakpoint_from_pc ((PCPTR), (LENPTR))
-#define BREAKPOINT32 0x10004
-
 extern int hppa_pc_requires_run_before_use (CORE_ADDR pc);
 #define PC_REQUIRES_RUN_BEFORE_USE(pc) hppa_pc_requires_run_before_use (pc)
 

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index d383c3db14241553d6ff1babf0d6d514af031652..90bdd10a60bf93abf18457cbc2d2b7ec240f735c 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -658,7 +658,7 @@ find_unwind_entry (CORE_ADDR pc)
   return NULL;
 }
 
-const unsigned char *
+static const unsigned char *
 hppa_breakpoint_from_pc (CORE_ADDR *pc, int *len)
 {
   static const unsigned char breakpoint[] = {0x00, 0x01, 0x00, 0x04};
@@ -2726,7 +2726,9 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     default:
       internal_error (__FILE__, __LINE__, "bad switch");
     }
-      
+
+  set_gdbarch_breakpoint_from_pc (gdbarch, hppa_breakpoint_from_pc);
+
   /* Frame unwind methods.  */
   set_gdbarch_unwind_dummy_id (gdbarch, hppa_unwind_dummy_id);
   set_gdbarch_unwind_pc (gdbarch, hppa_unwind_pc);