Refactor Cortex-A8 erratum workaround in preparation

[binutils-gdb.git] / gdb / mips-linux-nat.c

diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 6df618d380fded8e9c384c57b2345f35ec7f1a2c..bfe9fcbe687724349f19ad4ea0267df9d1c0c6a7 100644 (file)
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for GNU/Linux on MIPS processors.
 
-   Copyright (C) 2001-2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -509,7 +509,8 @@ mips_show_dr (const char *func, CORE_ADDR addr,
 
 static int
 mips_linux_can_use_hw_breakpoint (struct target_ops *self,
-                                 int type, int cnt, int ot)
+                                 enum bptype type,
+                                 int cnt, int ot)
 {
   int i;
   uint32_t wanted_mask, irw_mask;
@@ -643,7 +644,8 @@ mips_linux_new_thread (struct lwp_info *lp)
 
 static int
 mips_linux_insert_watchpoint (struct target_ops *self,
-                             CORE_ADDR addr, int len, int type,
+                             CORE_ADDR addr, int len,
+                             enum target_hw_bp_type type,
                              struct expression *cond)
 {
   struct pt_watch_regs regs;
@@ -671,8 +673,7 @@ mips_linux_insert_watchpoint (struct target_ops *self,
     return -1;
 
   /* It fit.  Stick it on the end of the list.  */
-  new_watch = (struct mips_watchpoint *)
-    xmalloc (sizeof (struct mips_watchpoint));
+  new_watch = XNEW (struct mips_watchpoint);
   new_watch->addr = addr;
   new_watch->len = len;
   new_watch->type = type;
@@ -697,7 +698,8 @@ mips_linux_insert_watchpoint (struct target_ops *self,
 
 static int
 mips_linux_remove_watchpoint (struct target_ops *self,
-                             CORE_ADDR addr, int len, int type,
+                             CORE_ADDR addr, int len,
+                             enum target_hw_bp_type type,
                              struct expression *cond)
 {
   int retval;