Revert 415fa612

2016-04-18  Yao Qi  <yao.qi@linaro.org>

	Revert:
	2016-04-15  Yao Qi  <yao.qi@linaro.org>

	* arm-tdep.c (thumb_stack_frame_destroyed_p): Return zero if
	PC is far from the end of function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bafbbe6d34de4128fd74e89ae923036a13eb17e5..daf86d9e7f6b34ffccd22463c1840f8becab3e43 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2016-04-18  Yao Qi  <yao.qi@linaro.org>
+
+       Revert:
+       2016-04-15  Yao Qi  <yao.qi@linaro.org>
+
+       * arm-tdep.c (thumb_stack_frame_destroyed_p): Return zero if
+       PC is far from the end of function.
+
 2016-04-16  Pedro Alves  <palves@redhat.com>
 
        * ada-exp.y (yydefred): Define as ada_yydefred.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 36b0bcda34108f612bff10949bbccd602ec6ccdd..0412f71d24a948222a167e7dc13e678903c0057b 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -3135,14 +3135,6 @@ thumb_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR pc)
   if (!find_pc_partial_function (pc, NULL, &func_start, &func_end))
     return 0;
 
-  if (func_end - pc > 4 * 4)
-    {
-      /* There shouldn't be more than four instructions in epilogue.
-        If PC is still 16 bytes away from FUNC_END, it isn't in
-        epilogue.  */
-      return 0;
-    }
-
   /* The epilogue is a sequence of instructions along the following lines:
 
     - add stack frame size to SP or FP