Blame SOURCES/libffi-3.0.13-ppc64le-2.patch

c52aaa
Date: Wed, 20 Nov 2013 18:05:21 +1030
c52aaa
From: Alan Modra <amodra at gmail dot com>
c52aaa
To: libffi-discuss at sourceware dot org
c52aaa
Subject: PowerPC64 ELFv2 fix 2 of 2
c52aaa
Message-ID: <20131120073521.GG22514@bubble.grove.modra.org>
c52aaa
References: <20131117031650.GR22514@bubble.grove.modra.org> <87eh6e2b4o.fsf@redhat.com> <20131119001430.GX22514@bubble.grove.modra.org>
c52aaa
MIME-Version: 1.0
c52aaa
Content-Type: text/plain; charset=us-ascii
c52aaa
Content-Disposition: inline
c52aaa
In-Reply-To: <20131119001430 dot GX22514 at bubble dot grove dot modra dot org>
c52aaa
User-Agent: Mutt/1.5.21 (2010-09-15)
c52aaa
c52aaa
Using NUM_FPR_ARG_REGISTERS rather than NUM_FPR_ARG_REGISTERS64 meant
c52aaa
that a parameter save area could be allocated before it was strictly
c52aaa
necessary.  Wrong but harmless.  Found when splitting apart ffi.c
c52aaa
into 32-bit and 64-bit support.
c52aaa
c52aaa
	* src/powerpc/ffi.c (ffi_prep_cif_machdep_core): Use
c52aaa
	NUM_FPR_ARG_REGISTERS64 and NUM_GPR_ARG_REGISTERS64 not their
c52aaa
	32-bit versions for 64-bit code.
c52aaa
c52aaa
diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
c52aaa
index feb2144..6896065 100644
c52aaa
--- a/src/powerpc/ffi.c
c52aaa
+++ b/src/powerpc/ffi.c
c52aaa
@@ -978,7 +978,7 @@ ffi_prep_cif_machdep_core (ffi_cif *cif)
c52aaa
 	  case FFI_TYPE_LONGDOUBLE:
c52aaa
 	    fparg_count += 2;
c52aaa
 	    intarg_count += 2;
c52aaa
-	    if (fparg_count > NUM_FPR_ARG_REGISTERS)
c52aaa
+	    if (fparg_count > NUM_FPR_ARG_REGISTERS64)
c52aaa
 	      flags |= FLAG_ARG_NEEDS_PSAVE;
c52aaa
 	    break;
c52aaa
 #endif
c52aaa
@@ -986,7 +986,7 @@ ffi_prep_cif_machdep_core (ffi_cif *cif)
c52aaa
 	  case FFI_TYPE_DOUBLE:
c52aaa
 	    fparg_count++;
c52aaa
 	    intarg_count++;
c52aaa
-	    if (fparg_count > NUM_FPR_ARG_REGISTERS)
c52aaa
+	    if (fparg_count > NUM_FPR_ARG_REGISTERS64)
c52aaa
 	      flags |= FLAG_ARG_NEEDS_PSAVE;
c52aaa
 	    break;
c52aaa
 
c52aaa
@@ -1007,12 +1007,12 @@ ffi_prep_cif_machdep_core (ffi_cif *cif)
c52aaa
 	    if (elt)
c52aaa
 	      {
c52aaa
 		fparg_count += elnum;
c52aaa
-		if (fparg_count > NUM_FPR_ARG_REGISTERS)
c52aaa
+		if (fparg_count > NUM_FPR_ARG_REGISTERS64)
c52aaa
 		  flags |= FLAG_ARG_NEEDS_PSAVE;
c52aaa
 	      }
c52aaa
 	    else
c52aaa
 	      {
c52aaa
-		if (intarg_count > NUM_GPR_ARG_REGISTERS)
c52aaa
+		if (intarg_count > NUM_GPR_ARG_REGISTERS64)
c52aaa
 		  flags |= FLAG_ARG_NEEDS_PSAVE;
c52aaa
 	      }
c52aaa
 	    break;
c52aaa
@@ -1030,7 +1030,7 @@ ffi_prep_cif_machdep_core (ffi_cif *cif)
c52aaa
 	    /* Everything else is passed as a 8-byte word in a GPR, either
c52aaa
 	       the object itself or a pointer to it.  */
c52aaa
 	    intarg_count++;
c52aaa
-	    if (intarg_count > NUM_GPR_ARG_REGISTERS)
c52aaa
+	    if (intarg_count > NUM_GPR_ARG_REGISTERS64)
c52aaa
 	      flags |= FLAG_ARG_NEEDS_PSAVE;
c52aaa
 	    break;
c52aaa
 	  default:
c52aaa
c52aaa
-- 
c52aaa
Alan Modra
c52aaa
Australia Development Lab, IBM
c52aaa