From: H.J. Lu <hongjiu.lu@intel.com>
Date: Tue, 17 Mar 2009 12:50:52 +0000 (+0000)
Subject: re PR target/39473 (Typo in untyped_call in i386.md)
X-Git-Tag: releases/gcc-4.4.0~257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=435a61d30a253600992c6a613ccbc00c7c47584e;p=thirdparty%2Fgcc.git

re PR target/39473 (Typo in untyped_call in i386.md)

2009-03-16  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/39473
	* config/i386/i386.c (ix86_expand_call): Check extra clobbers
	for ms->sysv ABI calls only in 64bit mode.

	* config/i386/i386.md (untyped_call): Support 32bit.

From-SVN: r144901
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6edb3a66338a..be2837f2854d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/39473
+	* config/i386/i386.c (ix86_expand_call): Check extra clobbers
+	for ms->sysv ABI calls only in 64bit mode.
+
+	* config/i386/i386.md (untyped_call): Support 32bit.
+
 2009-03-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* doc/extend.texi: Replace x86_65 with x86_64.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index e993dce0bde4..bc912b60b5af 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -18617,12 +18617,7 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1,
 		  rtx pop, int sibcall)
 {
   rtx use = NULL, call;
-  enum calling_abi function_call_abi;
 
-  if (callarg2 && INTVAL (callarg2) == -2)
-    function_call_abi = MS_ABI;
-  else
-    function_call_abi = SYSV_ABI;
   if (pop == const0_rtx)
     pop = NULL;
   gcc_assert (!TARGET_64BIT || !pop);
@@ -18678,12 +18673,13 @@ ix86_expand_call (rtx retval, rtx fnaddr, rtx callarg1,
       pop = gen_rtx_PLUS (Pmode, stack_pointer_rtx, pop);
       pop = gen_rtx_SET (VOIDmode, stack_pointer_rtx, pop);
       call = gen_rtx_PARALLEL (VOIDmode, gen_rtvec (2, call, pop));
-      gcc_assert (ix86_cfun_abi () != MS_ABI || function_call_abi != SYSV_ABI);
     }
-  /* We need to represent that SI and DI registers are clobbered
-     by SYSV calls.  */
-  if (ix86_cfun_abi () == MS_ABI && function_call_abi == SYSV_ABI)
+  if (TARGET_64BIT
+      && ix86_cfun_abi () == MS_ABI
+      && (!callarg2 || INTVAL (callarg2) != -2))
     {
+      /* We need to represent that SI and DI registers are clobbered
+	 by SYSV calls.  */
       static int clobbered_registers[] = {
 	XMM6_REG, XMM7_REG, XMM8_REG,
 	XMM9_REG, XMM10_REG, XMM11_REG,
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index d68d0c832394..023f2e19f981 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -15159,13 +15159,19 @@
   /* In order to give reg-stack an easier job in validating two
      coprocessor registers as containing a possible return value,
      simply pretend the untyped call returns a complex long double
-     value.  */
+     value. 
+
+     We can't use SSE_REGPARM_MAX here since callee is unprototyped
+     and should have the default ABI.  */
 
   ix86_expand_call ((TARGET_FLOAT_RETURNS_IN_80387
 		     ? gen_rtx_REG (XCmode, FIRST_FLOAT_REG) : NULL),
 		    operands[0], const0_rtx,
-		    GEN_INT ((DEFAULT_ABI == SYSV_ABI ? X86_64_SSE_REGPARM_MAX
-		    				      : X64_SSE_REGPARM_MAX)
+		    GEN_INT ((TARGET_64BIT
+			      ? (DEFAULT_ABI == SYSV_ABI
+				 ? X86_64_SSE_REGPARM_MAX
+				 : X64_SSE_REGPARM_MAX)
+			      : X86_32_SSE_REGPARM_MAX)
 		    	     - 1),
 		    NULL, 0);