aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/frv-tdep.c8
2 files changed, 10 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ffd6b7..e357733 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2007-11-07 Markus Deuling <deuling@de.ibm.com>
+ * 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 <deuling@de.ibm.com>
+
* MAINTAINERS (Write After Approval): Add self.
2007-11-05 Ulrich Weigand <uweigand@de.ibm.com>
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index bab497c..fa88d64 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)