From 7a22ecfc4b49af6e821525efa9c2f61bc7a959d8 Mon Sep 17 00:00:00 2001 From: Markus Deuling Date: Wed, 7 Nov 2007 06:10:23 +0000 Subject: [PATCH] 2007-11-07 Markus Deuling * frv-tdep.c (frv_register_name, frv_check_watch_resources): Replace macro CURRENT_VARIANT by its expression. (CURRENT_VARIANT): Remove. (frv_check_watch_resources): Add gdbarch parameter. --- gdb/ChangeLog | 7 +++++++ gdb/frv-tdep.c | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1ffd6b7c935..e357733c749 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2007-11-07 Markus Deuling + + * frv-tdep.c (frv_register_name, frv_check_watch_resources): Replace + macro CURRENT_VARIANT by its expression. + (CURRENT_VARIANT): Remove. + (frv_check_watch_resources): Add gdbarch parameter. + 2007-11-07 Markus Deuling * MAINTAINERS (Write After Approval): Add self. diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index bab497cc7e6..fa88d64ce56 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -91,8 +91,6 @@ struct gdbarch_tdep char **register_names; }; -#define CURRENT_VARIANT (gdbarch_tdep (current_gdbarch)) - /* Return the FR-V ABI associated with GDBARCH. */ enum frv_abi frv_abi (struct gdbarch *gdbarch) @@ -285,7 +283,7 @@ frv_register_name (struct gdbarch *gdbarch, int reg) if (reg >= frv_num_regs + frv_num_pseudo_regs) return "?toolarge?"; - return CURRENT_VARIANT->register_names[reg]; + return gdbarch_tdep (gdbarch)->register_names[reg]; } @@ -1280,9 +1278,9 @@ frv_return_value (struct gdbarch *gdbarch, struct type *valtype, and FR400. */ int -frv_check_watch_resources (int type, int cnt, int ot) +frv_check_watch_resources (struct gdbarch *gdbarch, int type, int cnt, int ot) { - struct gdbarch_tdep *var = CURRENT_VARIANT; + struct gdbarch_tdep *var = gdbarch_tdep (gdbarch); /* Watchpoints not supported on simulator. */ if (strcmp (target_shortname, "sim") == 0) -- 2.30.2