summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Brown <julian@codesourcery.com>2005-10-20 14:10:25 +0000
committerJulian Brown <julian@codesourcery.com>2005-10-20 14:10:25 +0000
commit7d13fa8d2f4bcb8499ff9f014e594442f2adca05 (patch)
treec37019c2ace97455661e2e6a3abcdfee8be48754
parent78a00e2e66a90082926a30f911df4262fbaa08ea (diff)
downloadgdb-7d13fa8d2f4bcb8499ff9f014e594442f2adca05.tar.gz
* gdb/arm-tdep.c (thumb2_modify_constant): Silence compiler warning.
(thumb_scan_prologue): Fix typo.
-rw-r--r--ChangeLog.csl5
-rw-r--r--gdb/arm-tdep.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 7a92461dba5..a37ae1a71e9 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,5 +1,10 @@
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.
(thumb2_it_block): New function. Find the next instruction to be
executed in an IT block.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 548043915d2..d68882cc1f0 100644
--- 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 */
{