aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <cagney@redhat.com>2004-04-06 16:11:06 +0000
committerAndrew Cagney <cagney@redhat.com>2004-04-06 16:11:06 +0000
commit85f4f2d828508af01a3726a13c73b082c4a760be (patch)
treeba8744f0157d6235da09da0dd4a8d81a6b8965d8
parent934494036e819377f0b7d7673e245d6354c9754d (diff)
downloadgdb-85f4f2d828508af01a3726a13c73b082c4a760be.zip
gdb-85f4f2d828508af01a3726a13c73b082c4a760be.tar.gz
gdb-85f4f2d828508af01a3726a13c73b082c4a760be.tar.bz2
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.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/config/pa/tm-hppa.h6
-rw-r--r--gdb/hppa-tdep.c6
3 files changed, 9 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f63459b..da5f301 100644
--- 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 b3fd8c5..d5d2d03 100644
--- 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 d383c3d..90bdd10 100644
--- 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);