From: Paul Gilliam <pgilliam@us.ibm.com>
Date: Mon, 14 Nov 2005 22:15:57 +0000 (+0000)
Subject: 2005-11-14  Paul Gilliam  <pgilliam@us.ibm.com>
X-Git-Tag: gdb_6_4-20051202-release~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e420766b19899188493747bf9cdca8b8bb793e1e;p=thirdparty%2Fbinutils-gdb.git

2005-11-14  Paul Gilliam  <pgilliam@us.ibm.com>

        * ppc-sysv-tdep.c (ppc64_sysv_abi_return_value): Copy code from
        ppc_sysv_abi_return_value() to handle a vector return value.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b25e6385b0..1f5fd4e2f6b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14  Paul Gilliam  <pgilliam@us.ibm.com>
+
+	* ppc-sysv-tdep.c (ppc64_sysv_abi_return_value): Copy code from
+	ppc_sysv_abi_return_value() to handle a vector return value.
+
 2005-11-14  Andrew Stubbs  <andrew.stubbs@st.com>
 
 	* main.c (captured_main): Define struct cmdarg. Change type of cmdarg.
diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index 4285077e436..78933ee9d4a 100644
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -906,11 +906,11 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
 	}
       return RETURN_VALUE_REGISTER_CONVENTION;
     }
+  /* Integers in r3.  */
   if ((TYPE_CODE (valtype) == TYPE_CODE_INT
        || TYPE_CODE (valtype) == TYPE_CODE_ENUM)
       && TYPE_LENGTH (valtype) <= 8)
     {
-      /* Integers in r3.  */
       if (writebuf != NULL)
 	{
 	  /* Be careful to sign extend the value.  */
@@ -938,24 +938,36 @@ ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, struct type *valtype,
 	regcache_cooked_read (regcache, tdep->ppc_gp0_regnum + 3, readbuf);
       return RETURN_VALUE_REGISTER_CONVENTION;
     }
-  if (TYPE_CODE (valtype) == TYPE_CODE_ARRAY
-      && TYPE_LENGTH (valtype) <= 8
-      && TYPE_CODE (TYPE_TARGET_TYPE (valtype)) == TYPE_CODE_INT
-      && TYPE_LENGTH (TYPE_TARGET_TYPE (valtype)) == 1)
+  /* Array type has more than one use.  */
+  if (TYPE_CODE (valtype) == TYPE_CODE_ARRAY)
     {
       /* Small character arrays are returned, right justified, in r3.  */
-      int offset = (register_size (gdbarch, tdep->ppc_gp0_regnum + 3)
-		    - TYPE_LENGTH (valtype));
-      if (writebuf != NULL)
-	regcache_cooked_write_part (regcache, tdep->ppc_gp0_regnum + 3,
-				    offset, TYPE_LENGTH (valtype), writebuf);
-      if (readbuf != NULL)
-	regcache_cooked_read_part (regcache, tdep->ppc_gp0_regnum + 3,
-				   offset, TYPE_LENGTH (valtype), readbuf);
-      return RETURN_VALUE_REGISTER_CONVENTION;
+      if (TYPE_LENGTH (valtype) <= 8
+        && TYPE_CODE (TYPE_TARGET_TYPE (valtype)) == TYPE_CODE_INT
+        && TYPE_LENGTH (TYPE_TARGET_TYPE (valtype)) == 1)
+        {
+          int offset = (register_size (gdbarch, tdep->ppc_gp0_regnum + 3)
+		        - TYPE_LENGTH (valtype));
+          if (writebuf != NULL)
+	    regcache_cooked_write_part (regcache, tdep->ppc_gp0_regnum + 3,
+				       offset, TYPE_LENGTH (valtype), writebuf);
+          if (readbuf != NULL)
+	    regcache_cooked_read_part (regcache, tdep->ppc_gp0_regnum + 3,
+				       offset, TYPE_LENGTH (valtype), readbuf);
+          return RETURN_VALUE_REGISTER_CONVENTION;
+        }
+      /* A VMX vector is returned in v2.  */
+      if (TYPE_VECTOR (valtype) && tdep->ppc_vr0_regnum >= 0)
+	{
+	  if (readbuf)
+	    regcache_cooked_read (regcache, tdep->ppc_vr0_regnum + 2, readbuf);
+	  if (writebuf)
+	    regcache_cooked_write (regcache, tdep->ppc_vr0_regnum + 2, writebuf);
+	  return RETURN_VALUE_REGISTER_CONVENTION;
+	}
     }
   /* Big floating point values get stored in adjacent floating
-     point registers.  */
+     point registers, starting with F1.  */
   if (TYPE_CODE (valtype) == TYPE_CODE_FLT
       && (TYPE_LENGTH (valtype) == 16 || TYPE_LENGTH (valtype) == 32))
     {