Automatic date update in version.in

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

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 34070452e1731be227b4af81011933a3643fcb5a..8e9552a1e19d06784e5d48e15df064d5e061e196 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1,6 +1,6 @@
 /* Common target dependent code for GDB on ARM systems.
 
-   Copyright (C) 1988-2014 Free Software Foundation, Inc.
+   Copyright (C) 1988-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -1388,7 +1388,6 @@ arm_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   enum bfd_endian byte_order_for_code = gdbarch_byte_order_for_code (gdbarch);
   unsigned long inst;
-  CORE_ADDR skip_pc;
   CORE_ADDR func_addr, limit_pc;
 
   /* See if we can determine the end of the prologue via the symbol table.
@@ -1462,65 +1461,8 @@ arm_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
   /* Check if this is Thumb code.  */
   if (arm_pc_is_thumb (gdbarch, pc))
     return thumb_analyze_prologue (gdbarch, pc, limit_pc, NULL);
-
-  for (skip_pc = pc; skip_pc < limit_pc; skip_pc += 4)
-    {
-      inst = read_memory_unsigned_integer (skip_pc, 4, byte_order_for_code);
-
-      /* "mov ip, sp" is no longer a required part of the prologue.  */
-      if (inst == 0xe1a0c00d)                  /* mov ip, sp */
-       continue;
-
-      if ((inst & 0xfffff000) == 0xe28dc000)    /* add ip, sp #n */
-       continue;
-
-      if ((inst & 0xfffff000) == 0xe24dc000)    /* sub ip, sp #n */
-       continue;
-
-      /* Some prologues begin with "str lr, [sp, #-4]!".  */
-      if (inst == 0xe52de004)                  /* str lr, [sp, #-4]! */
-       continue;
-
-      if ((inst & 0xfffffff0) == 0xe92d0000)   /* stmfd sp!,{a1,a2,a3,a4} */
-       continue;
-
-      if ((inst & 0xfffff800) == 0xe92dd800)   /* stmfd sp!,{fp,ip,lr,pc} */
-       continue;
-
-      /* Any insns after this point may float into the code, if it makes
-        for better instruction scheduling, so we skip them only if we
-        find them, but still consider the function to be frame-ful.  */
-
-      /* We may have either one sfmfd instruction here, or several stfe
-        insns, depending on the version of floating point code we
-        support.  */
-      if ((inst & 0xffbf0fff) == 0xec2d0200)   /* sfmfd fn, <cnt>, [sp]! */
-       continue;
-
-      if ((inst & 0xffff8fff) == 0xed6d0103)   /* stfe fn, [sp, #-12]! */
-       continue;
-
-      if ((inst & 0xfffff000) == 0xe24cb000)   /* sub fp, ip, #nn */
-       continue;
-
-      if ((inst & 0xfffff000) == 0xe24dd000)   /* sub sp, sp, #nn */
-       continue;
-
-      if ((inst & 0xffffc000) == 0xe54b0000    /* strb r(0123),[r11,#-nn] */
-         || (inst & 0xffffc0f0) == 0xe14b00b0  /* strh r(0123),[r11,#-nn] */
-         || (inst & 0xffffc000) == 0xe50b0000) /* str  r(0123),[r11,#-nn] */
-       continue;
-
-      if ((inst & 0xffffc000) == 0xe5cd0000    /* strb r(0123),[sp,#nn] */
-         || (inst & 0xffffc0f0) == 0xe1cd00b0  /* strh r(0123),[sp,#nn] */
-         || (inst & 0xffffc000) == 0xe58d0000) /* str  r(0123),[sp,#nn] */
-       continue;
-
-      /* Un-recognized instruction; stop scanning.  */
-      break;
-    }
-
-  return skip_pc;              /* End of prologue.  */
+  else
+    return arm_analyze_prologue (gdbarch, pc, limit_pc, NULL);
 }
 
 /* *INDENT-OFF* */
@@ -1905,10 +1847,17 @@ arm_analyze_prologue (struct gdbarch *gdbarch,
        continue;
       else
        {
-         /* The optimizer might shove anything into the prologue,
-            so we just skip what we don't recognize.  */
+         /* The optimizer might shove anything into the prologue, if
+            we build up cache (cache != NULL) from scanning prologue,
+            we just skip what we don't recognize and scan further to
+            make cache as complete as possible.  However, if we skip
+            prologue, we'll stop immediately on unrecognized
+            instruction.  */
          unrecognized_pc = current_pc;
-         continue;
+         if (cache != NULL)
+           continue;
+         else
+           break;
        }
     }
 
@@ -10019,27 +9968,34 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
                                                        OBJ_ATTR_PROC,
                                                        Tag_ABI_VFP_args))
                        {
-                       case 0:
+                       case AEABI_VFP_args_base:
                          /* "The user intended FP parameter/result
                             passing to conform to AAPCS, base
                             variant".  */
                          fp_model = ARM_FLOAT_SOFT_VFP;
                          break;
-                       case 1:
+                       case AEABI_VFP_args_vfp:
                          /* "The user intended FP parameter/result
                             passing to conform to AAPCS, VFP
                             variant".  */
                          fp_model = ARM_FLOAT_VFP;
                          break;
-                       case 2:
+                       case AEABI_VFP_args_toolchain:
                          /* "The user intended FP parameter/result
                             passing to conform to tool chain-specific
                             conventions" - we don't know any such
                             conventions, so leave it as "auto".  */
                          break;
+                       case AEABI_VFP_args_compatible:
+                         /* "Code is compatible with both the base
+                            and VFP variants; the user did not permit
+                            non-variadic functions to pass FP
+                            parameters/results" - leave it as
+                            "auto".  */
+                         break;
                        default:
                          /* Attribute value not mentioned in the
-                            October 2008 ABI, so leave it as
+                            November 2012 ABI, so leave it as
                             "auto".  */
                          break;
                        }