OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i386.h (X86_64_MS_REGPARM_MAX): Rename from X64_REGPARM_MAX.

Browse Source 
* config/i386/i386.h (X86_64_MS_REGPARM_MAX): Rename from
	X64_REGPARM_MAX.
	(REGPARM_MAX): Use X86_64_MS_REGPARM_MAX.
	(X86_64_MS_SSE_REGPARM_MAX): Rename from X64_SSE_REGPARM_MAX.
	(SSE_REGPARM_MAX): Use X86_64_MS_SSE_REGPARM_MAX.
	* config/i386/i386.c: Use X86_64_MS_REGPARM_MAX instead of
	X64_REGPARM_MAX.  Use X86_64_MS_SSE_REGPARM_MAX instead of
	X64_SSE_REGPARM_MAX.
	* config/i386/i386.md: Use X86_64_MS_SSE_REGPARM_MAX instead of
	X64_SSE_REGPARM_MAX.

From-SVN: r148163
This commit is contained in:
Uros Bizjak 2009-06-04 10:32:52 +02:00 committed by Uros Bizjak
parent bdde878c07
commit 72fa360537
4 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/ChangeLog
View File

@ -1,3 +1,16 @@
2009-06-04 Uros Bizjak <ubizjak@gmail.com>
* config/i386/i386.h (X86_64_MS_REGPARM_MAX): Rename from
X64_REGPARM_MAX.
(REGPARM_MAX): Use X86_64_MS_REGPARM_MAX.
(X86_64_MS_SSE_REGPARM_MAX): Rename from X64_SSE_REGPARM_MAX.
(SSE_REGPARM_MAX): Use X86_64_MS_SSE_REGPARM_MAX.
* config/i386/i386.c: Use X86_64_MS_REGPARM_MAX instead of
X64_REGPARM_MAX. Use X86_64_MS_SSE_REGPARM_MAX instead of
X64_SSE_REGPARM_MAX.
* config/i386/i386.md: Use X86_64_MS_SSE_REGPARM_MAX instead of
X64_SSE_REGPARM_MAX.
2009-06-04 Alexandre Oliva <aoliva@redhat.com>
* gcc.c (report_times_to_file): New.

29
gcc/config/i386/i386.c
View File

@ -4407,7 +4407,7 @@ ix86_function_regparm (const_tree type, const_tree decl)
if (TARGET_64BIT)
return (ix86_function_type_abi (type) == SYSV_ABI
? X86_64_REGPARM_MAX : X64_REGPARM_MAX);
? X86_64_REGPARM_MAX : X86_64_MS_REGPARM_MAX);
regparm = ix86_regparm;
attr = lookup_attribute ("regparm", TYPE_ATTRIBUTES (type));
@ -4650,8 +4650,8 @@ ix86_function_arg_regno_p (int regno)
parm_regs = x86_64_ms_abi_int_parameter_registers;
else
parm_regs = x86_64_int_parameter_registers;
for (i = 0; i < (ix86_abi == MS_ABI ? X64_REGPARM_MAX
: X86_64_REGPARM_MAX); i++)
for (i = 0; i < (ix86_abi == MS_ABI
? X86_64_MS_REGPARM_MAX : X86_64_REGPARM_MAX); i++)
if (regno == parm_regs[i])
return true;
return false;
@ -4777,8 +4777,8 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, /* Argument info to initialize */
if (TARGET_64BIT)
{
if (cum->call_abi != ix86_abi)
cum->nregs = ix86_abi != SYSV_ABI ? X86_64_REGPARM_MAX
: X64_REGPARM_MAX;
cum->nregs = (ix86_abi != SYSV_ABI
? X86_64_REGPARM_MAX : X86_64_MS_REGPARM_MAX);
}
if (TARGET_SSE)
{
@ -4786,8 +4786,9 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, /* Argument info to initialize */
if (TARGET_64BIT)
{
if (cum->call_abi != ix86_abi)
cum->sse_nregs = ix86_abi != SYSV_ABI ? X86_64_SSE_REGPARM_MAX
: X64_SSE_REGPARM_MAX;
cum->sse_nregs = (ix86_abi != SYSV_ABI
? X86_64_SSE_REGPARM_MAX
: X86_64_MS_SSE_REGPARM_MAX);
}
}
if (TARGET_MMX)
@ -5898,10 +5899,11 @@ function_arg_64 (CUMULATIVE_ARGS *cum, enum machine_mode mode,
return GEN_INT (cum->maybe_vaarg
? (cum->sse_nregs < 0
? (cum->call_abi == ix86_abi
? SSE_REGPARM_MAX
: (ix86_abi != SYSV_ABI ? X86_64_SSE_REGPARM_MAX
: X64_SSE_REGPARM_MAX))
: cum->sse_regno)
? SSE_REGPARM_MAX
: (ix86_abi != SYSV_ABI
? X86_64_SSE_REGPARM_MAX
: X86_64_MS_SSE_REGPARM_MAX))
: cum->sse_regno)
: -1);
switch (mode)
@ -6603,7 +6605,8 @@ setup_incoming_varargs_64 (CUMULATIVE_ARGS *cum)
int regparm = ix86_regparm;
if (cum->call_abi != ix86_abi)
regparm = ix86_abi != SYSV_ABI ? X86_64_REGPARM_MAX : X64_REGPARM_MAX;
regparm = (ix86_abi != SYSV_ABI
? X86_64_REGPARM_MAX : X86_64_MS_REGPARM_MAX);
/* GPR size of varargs save area. */
if (cfun->va_list_gpr_size)
@ -6700,7 +6703,7 @@ setup_incoming_varargs_ms_64 (CUMULATIVE_ARGS *cum)
alias_set_type set = get_varargs_alias_set ();
int i;
for (i = cum->regno; i < X64_REGPARM_MAX; i++)
for (i = cum->regno; i < X86_64_MS_REGPARM_MAX; i++)
{
rtx reg, mem;

16
gcc/config/i386/i386.h
View File

@ -1853,20 +1853,22 @@ typedef struct ix86_args {
/* Abi specific values for REGPARM_MAX and SSE_REGPARM_MAX */
#define X86_64_REGPARM_MAX 6
#define X64_REGPARM_MAX 4
#define X86_64_MS_REGPARM_MAX 4
#define X86_32_REGPARM_MAX 3
#define X86_64_SSE_REGPARM_MAX 8
#define X64_SSE_REGPARM_MAX 4
#define X86_32_SSE_REGPARM_MAX (TARGET_SSE ? 3 : 0)
#define REGPARM_MAX \
(TARGET_64BIT ? (TARGET_64BIT_MS_ABI ? X64_REGPARM_MAX \
(TARGET_64BIT ? (TARGET_64BIT_MS_ABI ? X86_64_MS_REGPARM_MAX \
: X86_64_REGPARM_MAX) \
: X86_32_REGPARM_MAX)
#define X86_64_SSE_REGPARM_MAX 8
#define X86_64_MS_SSE_REGPARM_MAX 4
#define X86_32_SSE_REGPARM_MAX (TARGET_SSE ? 3 : 0)
#define SSE_REGPARM_MAX \
(TARGET_64BIT ? (TARGET_64BIT_MS_ABI ? X64_SSE_REGPARM_MAX \
(TARGET_64BIT ? (TARGET_64BIT_MS_ABI ? X86_64_MS_SSE_REGPARM_MAX \
: X86_64_SSE_REGPARM_MAX) \
: X86_32_SSE_REGPARM_MAX)

2
gcc/config/i386/i386.md
View File

@ -15761,7 +15761,7 @@
GEN_INT ((TARGET_64BIT
? (ix86_abi == SYSV_ABI
? X86_64_SSE_REGPARM_MAX
: X64_SSE_REGPARM_MAX)
: X86_64_MS_SSE_REGPARM_MAX)
: X86_32_SSE_REGPARM_MAX)
- 1),
NULL, 0);