From 4543b422ecb03616d2560b06657372da7031601b Mon Sep 17 00:00:00 2001 From: hjl Date: Tue, 17 Mar 2009 12:50:52 +0000 Subject: [PATCH] 2009-03-16 H.J. Lu 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144901 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/config/i386/i386.c | 14 +++++--------- gcc/config/i386/i386.md | 12 +++++++++--- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6edb3a66338..be2837f2854 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2009-03-16 H.J. Lu + 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 + * doc/extend.texi: Replace x86_65 with x86_64. 2009-03-16 Jakub Jelinek diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index e993dce0bde..bc912b60b5a 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 d68d0c83239..023f2e19f98 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); -- 2.11.0