From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-41172-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 5514 invoked by alias); 24 Oct 2005 23:05:06 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 5501 invoked by uid 22791); 24 Oct 2005 23:05:04 -0000
Received: from e32.co.us.ibm.com (HELO e32.co.us.ibm.com) (32.97.110.150)
    by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Mon, 24 Oct 2005 23:05:04 +0000
Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106])
	by e32.co.us.ibm.com (8.12.11/8.12.11) with ESMTP id j9ON5285029392
	for <gdb-patches@sources.redhat.com>; Mon, 24 Oct 2005 19:05:02 -0400
Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168])
	by d03relay04.boulder.ibm.com (8.12.10/NCO/VERS6.7) with ESMTP id j9ON5xNM534482
	for <gdb-patches@sources.redhat.com>; Mon, 24 Oct 2005 17:06:00 -0600
Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1])
	by d03av02.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id j9ON525s010541
	for <gdb-patches@sources.redhat.com>; Mon, 24 Oct 2005 17:05:02 -0600
Received: from dyn9047022123-009047022095.beaverton.ibm.com (dyn9047022123-009047022095.beaverton.ibm.com [9.47.22.95])
	by d03av02.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id j9ON51Cu010510
	for <gdb-patches@sources.redhat.com>; Mon, 24 Oct 2005 17:05:01 -0600
From: Paul Gilliam <pgilliam@us.ibm.com>
Reply-To: pgilliam@us.ibm.com
To: gdb-patches@sources.redhat.com
Subject: [PATCH] deal with vector return value for ppc68
Date: Mon, 24 Oct 2005 23:47:00 -0000
User-Agent: KMail/1.6.2
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <200510241606.10304.pgilliam@us.ibm.com>
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-SW-Source: 2005-10/txt/msg00194.txt.bz2

2005-10-24  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.

Index: ppc-sysv-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/ppc-sysv-tdep.c,v
retrieving revision 1.31
diff -a -u -p -r1.31 ppc-sysv-tdep.c
--- ppc-sysv-tdep.c     17 Aug 2005 07:44:13 -0000      1.31
+++ ppc-sysv-tdep.c     24 Oct 2005 22:57:31 -0000
@@ -906,11 +906,11 @@ ppc64_sysv_abi_return_value (struct gdba
        }
       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,41 @@ ppc64_sysv_abi_return_value (struct gdba
        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_CODE (valtype) == TYPE_CODE_ARRAY
+        && 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))
     {