Regenerate spu overlay and icache manager files

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

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index ef75fe2bc9dcecdfebedb93b056907e06e227b59..9e632a7609108588889d5f3f50213f4a55836564 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1204,7 +1204,9 @@ arm_analyze_load_stack_chk_guard(CORE_ADDR pc, struct gdbarch *gdbarch,
        {
          *destreg = bits (insn1, 8, 10);
          *offset = 2;
-         address = bits (insn1, 0, 7);
+         address = (pc & 0xfffffffc) + 4 + (bits (insn1, 0, 7) << 2);
+         address = read_memory_unsigned_integer (address, 4,
+                                                 byte_order_for_code);
        }
       else if ((insn1 & 0xfbf0) == 0xf240) /* movw Rd, #const */
        {
@@ -1233,9 +1235,12 @@ arm_analyze_load_stack_chk_guard(CORE_ADDR pc, struct gdbarch *gdbarch,
       unsigned int insn
        = read_memory_unsigned_integer (pc, 4, byte_order_for_code);
 
-      if ((insn & 0x0e5f0000) == 0x041f0000) /* ldr Rd, #immed */
+      if ((insn & 0x0e5f0000) == 0x041f0000) /* ldr Rd, [PC, #immed] */
        {
-         address = bits (insn, 0, 11);
+         address = bits (insn, 0, 11) + pc + 8;
+         address = read_memory_unsigned_integer (address, 4,
+                                                 byte_order_for_code);
+
          *destreg = bits (insn, 12, 15);
          *offset = 4;
        }
@@ -1306,11 +1311,10 @@ arm_skip_stack_protector(CORE_ADDR pc, struct gdbarch *gdbarch)
     return pc;
 
   stack_chk_guard = lookup_minimal_symbol_by_pc (addr);
-  /* If name of symbol doesn't start with '__stack_chk_guard', this
-     instruction sequence is not for stack protector.  If symbol is
-     removed, we conservatively think this sequence is for stack protector.  */
-  if (stack_chk_guard.minsym
-      && strncmp (MSYMBOL_LINKAGE_NAME (stack_chk_guard.minsym),
+  /* ADDR must correspond to a symbol whose name is __stack_chk_guard.
+     Otherwise, this sequence cannot be for stack protector.  */
+  if (stack_chk_guard.minsym == NULL
+      || strncmp (MSYMBOL_LINKAGE_NAME (stack_chk_guard.minsym),
                  "__stack_chk_guard",
                  strlen ("__stack_chk_guard")) != 0)
    return pc;
@@ -13807,7 +13811,7 @@ extract_arm_insn (insn_decode_record *insn_record, uint32_t insn_size)
     return 1;
   insn_record->arm_insn = (uint32_t) extract_unsigned_integer (&buf[0],
                            insn_size, 
-                           gdbarch_byte_order (insn_record->gdbarch));
+                          gdbarch_byte_order_for_code (insn_record->gdbarch));
   return 0;
 }