* gdb/arm-tdep.c (thumb2_modify_constant): Silence compiler warning.

        (thumb_scan_prologue): Fix typo.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 7a92461dba5ff26efc0b198a1908d583411c698f..a37ae1a71e99a836d78d962e9bf192e8c96a9cde 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,8 @@
+2005-10-20  Julian Brown  <julian@codesourcery.com>
+
+       * gdb/arm-tdep.c (thumb2_modify_constant): Silence compiler warning.
+       (thumb_scan_prologue): Fix typo.
+
 2005-10-20  Julian Brown  <julian@codesourcery.com>
 
        * gdb/arm-tdep.c (bitcount): Move function higher up in file.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 548043915d217d33b07180fc361d938240417338..d68882cc1f0c825eda4363e9c6d9f2740a7acdf8 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -515,6 +515,8 @@ thumb2_modify_constant (unsigned long imm12)
          return imm12 | (imm12 << 8) | (imm12 << 16) | (imm12 << 24);
        }
     }
+
+  return 0;
 }
 
 /* *INDENT-OFF* */
@@ -669,7 +671,7 @@ thumb_scan_prologue (CORE_ADDR prev_pc, struct arm_prologue_cache *cache)
          imm = thumb2_modify_constant (imm);
 
          cache->frameoffset += imm;
-         cache->framesize += offset;
+         cache->framesize += imm;
        }
       else if ((insn & 0xffffff00) == 0xaf00)  /* add r7, sp, #imm */
        {