From 03d4a9d66909aa556fec62f70793fe0192028832 Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Thu, 20 Oct 2005 14:10:25 +0000 Subject: [PATCH] * gdb/arm-tdep.c (thumb2_modify_constant): Silence compiler warning. (thumb_scan_prologue): Fix typo. --- ChangeLog.csl | 5 +++++ gdb/arm-tdep.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.csl b/ChangeLog.csl index 7a92461dba5..a37ae1a71e9 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,8 @@ +2005-10-20 Julian Brown + + * gdb/arm-tdep.c (thumb2_modify_constant): Silence compiler warning. + (thumb_scan_prologue): Fix typo. + 2005-10-20 Julian Brown * gdb/arm-tdep.c (bitcount): Move function higher up in file. 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 */ { -- 2.47.2