* ppc-linux-tdep.c (ppc64_desc_entry_point): New function.

(ppc64_standard_linkage_target): Use it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e7d32b2ea4222788396c898f4e2b61dae0eab875..cf526c099a2523815d514ffb88367a720351b123 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-24  Jim Blandy  <jimb@redhat.com>
+
+       * ppc-linux-tdep.c (ppc64_desc_entry_point): New function.
+       (ppc64_standard_linkage_target): Use it.
+
 2003-06-23  Andrew Cagney  <cagney@redhat.com>
 
        * rs6000-tdep.c (rs6000_register_virtual_type): Add explict cases

diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index ab038b7a2e9ed00b5f50515b398f59724159bbd9..2f369cdccc673786b7f0332189f7e8810137ee03 100644 (file)
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -731,6 +731,16 @@ insn_ds_field (unsigned int insn)
 }
 
 
+/* If DESC is the address of a 64-bit PowerPC Linux function
+   descriptor, return the descriptor's entry point.  */
+static CORE_ADDR
+ppc64_desc_entry_point (CORE_ADDR desc)
+{
+  /* The first word of the descriptor is the entry point.  */
+  return (CORE_ADDR) read_memory_unsigned_integer (desc, 8);
+}
+
+
 /* Pattern for the standard linkage function.  These are built by
    build_plt_stub in elf64-ppc.c, whose GLINK argument is always
    zero.  */
@@ -865,7 +875,7 @@ ppc64_standard_linkage_target (CORE_ADDR pc, unsigned int *insn)
        + insn_ds_field (insn[2]));
 
   /* The first word of the descriptor is the entry point.  Return that.  */
-  return (CORE_ADDR) read_memory_unsigned_integer (desc, 8);
+  return ppc64_desc_entry_point (desc);
 }