From b7576e5cf47c6212c0bc1613e74a4c35bc2941d7 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 19 Sep 2014 16:37:07 +0800 Subject: [PATCH] Fix typo in thumb_in_function_epilogue_p This patch fixes a typo in the bit mask I've made in my previous code refactor. If PC is in the register list, the bit 8 is one, so bit mask 0xff00 should be used. Current condition is a constant false. gdb: 2014-09-24 Yao Qi * arm-tdep.c (thumb_in_function_epilogue_p): Fix typo in the bitmask. --- gdb/ChangeLog | 5 +++++ gdb/arm-tdep.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 35ecebcafd..0efcb7215c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-09-24 Yao Qi + + * arm-tdep.c (thumb_in_function_epilogue_p): Fix typo in the + bitmask. + 2014-09-22 Gary Benson * target.c (target_stop): Updated comment. diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 5cdfc5bf4e..e2559ecbd2 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -3273,7 +3273,7 @@ thumb_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc) found_return = 1; else if (thumb_instruction_restores_sp (insn)) { - if ((insn & 0xfe00) == 0xbd00) /* pop */ + if ((insn & 0xff00) == 0xbd00) /* pop */ found_return = 1; } else if (thumb_insn_size (insn) == 4) /* 32-bit Thumb-2 instruction */