Remove IRIX 5 <sys/proc.h> _KMEMUSER workaround

[deliverable/binutils-gdb.git] / gdb / m88k-tdep.c

diff --git a/gdb/m88k-tdep.c b/gdb/m88k-tdep.c
index 74d4b3516d18630fb8be387daa2b2822f6ba2d01..e8e19df754d14836924a6d1b460e3d3ae05d6330 100644 (file)
--- a/gdb/m88k-tdep.c
+++ b/gdb/m88k-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for the Motorola 88000 series.
 
-   Copyright (C) 2004-2014 Free Software Foundation, Inc.
+   Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,6 +30,7 @@
 #include "symtab.h"
 #include "trad-frame.h"
 #include "value.h"
+#include <algorithm>
 
 #include "m88k-tdep.h"
 
@@ -533,11 +534,9 @@ m88k_analyze_prologue (struct gdbarch *gdbarch,
   /* Provide a dummy cache if necessary.  */
   if (cache == NULL)
     {
-      size_t sizeof_saved_regs =
-       (M88K_R31_REGNUM + 1) * sizeof (struct trad_frame_saved_reg);
-
-      cache = alloca (sizeof (struct m88k_frame_cache));
-      cache->saved_regs = alloca (sizeof_saved_regs);
+      cache = XALLOCA (struct m88k_frame_cache);
+      cache->saved_regs =
+        XALLOCAVEC (struct trad_frame_saved_reg, M88K_R31_REGNUM + 1);
 
       /* We only initialize the members we care about.  */
       cache->saved_regs[M88K_R1_REGNUM].addr = -1;
@@ -560,7 +559,7 @@ m88k_analyze_prologue (struct gdbarch *gdbarch,
              prologue.  */
          if (cache->fp_offset != -1
              && cache->saved_regs[M88K_R1_REGNUM].addr != -1)
-           return min (pc, end);
+           return std::min (pc, end);
          break;
 
        case M88K_PIA_NOTE_ST:
@@ -568,7 +567,7 @@ m88k_analyze_prologue (struct gdbarch *gdbarch,
          /* If no frame has been allocated, the stores aren't part of
              the prologue.  */
          if (cache->sp_offset == 0)
-           return min (pc, end);
+           return std::min (pc, end);
 
          /* Record location of saved registers.  */
          {
@@ -585,7 +584,7 @@ m88k_analyze_prologue (struct gdbarch *gdbarch,
          /* A second stack pointer adjustment isn't part of the
              prologue.  */
          if (cache->sp_offset != 0)
-           return min (pc, end);
+           return std::min (pc, end);
 
          /* Store stack pointer adjustment.  */
          cache->sp_offset = -SUBU_OFFSET (insn);
@@ -595,7 +594,7 @@ m88k_analyze_prologue (struct gdbarch *gdbarch,
          /* A second frame pointer assignment isn't part of the
              prologue.  */
          if (cache->fp_offset != -1)
-           return min (pc, end);
+           return std::min (pc, end);
 
          /* Record frame pointer assignment.  */
          cache->fp_offset = ADDU_OFFSET (insn);
@@ -606,12 +605,12 @@ m88k_analyze_prologue (struct gdbarch *gdbarch,
              the instruction in the delay slot might be.  Limit the
              prologue analysis to the delay slot and record the branch
              instruction as the end of the prologue.  */
-         limit = min (limit, pc + 2 * M88K_INSN_SIZE);
+         limit = std::min (limit, pc + 2 * M88K_INSN_SIZE);
          end = pc;
          break;
 
        case M88K_PIA_NOTE_PROLOGUE_END:
-         return min (pc, end);
+         return std::min (pc, end);
        }
 
       pc += M88K_INSN_SIZE;
@@ -654,7 +653,7 @@ m88k_frame_cache (struct frame_info *this_frame, void **this_cache)
   CORE_ADDR frame_sp;
 
   if (*this_cache)
-    return *this_cache;
+    return (struct m88k_frame_cache *) *this_cache;
 
   cache = FRAME_OBSTACK_ZALLOC (struct m88k_frame_cache);
   cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
@@ -784,7 +783,7 @@ m88k_supply_gregset (const struct regset *regset,
                     struct regcache *regcache,
                     int regnum, const void *gregs, size_t len)
 {
-  const gdb_byte *regs = gregs;
+  const gdb_byte *regs = (const gdb_byte *) gregs;
   int i;
 
   for (i = 0; i < M88K_NUM_REGS; i++)