aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/arch-utils.c3
-rw-r--r--gdb/findvar.c3
3 files changed, 8 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b35e169..c46a241d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2004-02-14 Andrew Cagney <cagney@redhat.com>
+ * arch-utils.c (legacy_convert_register_p): Check
+ DEPRECATED_REGISTER_CONVERTIBLE_P.
+ * findvar.c (value_of_register): Ditto.
+
* gdbarch.sh (DEPRECATED_REGISTER_CONVERTIBLE): Add predicate.
* gdbarch.h, gdbarch.c: Re-generate.
* arch-utils.c (deprecated_register_convertible_not): Delete.
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index f567a55..09fc52c 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -317,7 +317,8 @@ legacy_pc_in_sigtramp (CORE_ADDR pc, char *name)
int
legacy_convert_register_p (int regnum, struct type *type)
{
- return DEPRECATED_REGISTER_CONVERTIBLE (regnum);
+ return (DEPRECATED_REGISTER_CONVERTIBLE_P ()
+ && DEPRECATED_REGISTER_CONVERTIBLE (regnum));
}
void
diff --git a/gdb/findvar.c b/gdb/findvar.c
index b5929fa..e737bc3 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -284,7 +284,8 @@ value_of_register (int regnum, struct frame_info *frame)
/* Convert raw data to virtual format if necessary. */
- if (DEPRECATED_REGISTER_CONVERTIBLE (regnum))
+ if (DEPRECATED_REGISTER_CONVERTIBLE_P ()
+ && DEPRECATED_REGISTER_CONVERTIBLE (regnum))
{
DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL (regnum, register_type (current_gdbarch, regnum),
raw_buffer, VALUE_CONTENTS_RAW (reg_val));