From: Andreas Arnez <arnez@linux.vnet.ibm.com>
Date: Wed, 11 Mar 2015 10:11:45 +0000 (+0100)
Subject: S390: Skip prologue using SAL information, if possible
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f054145ed2bad0aa0f57b2a4c3ca6988b213d1a3;p=binutils-gdb.git

S390: Skip prologue using SAL information, if possible

Instead of analyzing the prologue and possibly coming to a wrong
conclusion, this change tries to skip the prologue with the use of
skip_prologue_using_sal.  Only if that fails, the prologue analyzer is
invoked as before.

gdb/ChangeLog:

	* s390-linux-tdep.c (s390_skip_prologue): Skip the prologue using
	SAL, if possible.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9101efdf100..d247a6a31a5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-11  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+	* s390-linux-tdep.c (s390_skip_prologue): Skip the prologue using
+	SAL, if possible.
+
 2015-03-11  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* s390-linux-nat.c (struct arch_lwp_info): New.
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index e33eb8e8fd6..cafa57b4d54 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -1462,7 +1462,16 @@ static CORE_ADDR
 s390_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
   struct s390_prologue_data data;
-  CORE_ADDR skip_pc;
+  CORE_ADDR skip_pc, func_addr;
+
+  if (find_pc_partial_function (pc, NULL, &func_addr, NULL))
+    {
+      CORE_ADDR post_prologue_pc
+	= skip_prologue_using_sal (gdbarch, func_addr);
+      if (post_prologue_pc != 0)
+	return max (pc, post_prologue_pc);
+    }
+
   skip_pc = s390_analyze_prologue (gdbarch, pc, (CORE_ADDR)-1, &data);
   return skip_pc ? skip_pc : pc;
 }