From a2fef3a4f27336be71d27d73fbf037173c6b0b9e Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 24 Jan 2004 22:27:20 +0000 Subject: cris.c (TARGET_PROMOTE_FUNCTION_ARGS): New. * config/cris/cris.c (TARGET_PROMOTE_FUNCTION_ARGS): New. (TARGET_STRUCT_VALUE_RTX): Likewise. (cris_struct_value_rtx): Likewise. * config/cris/cris.h (PROMOTE_FUNCTION_ARGS): Remove. (CRIS_STACKADJ_REG): Use CRIS_STRUCT_VALUE_REGNUM instead of STRUCT_VALUE_REGNUM. (STRUCT_VALUE_REGNUM): Rename to CRIS_STRUCT_VALUE_REGNUM. From-SVN: r76525 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/cris/cris.c | 17 +++++++++++++++++ gcc/config/cris/cris.h | 19 ++++++++++--------- 3 files changed, 37 insertions(+), 9 deletions(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6aad8de2..aebf323 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2004-01-24 Kazu Hirata + + * config/cris/cris.c (TARGET_PROMOTE_FUNCTION_ARGS): New. + (TARGET_STRUCT_VALUE_RTX): Likewise. + (cris_struct_value_rtx): Likewise. + * config/cris/cris.h (PROMOTE_FUNCTION_ARGS): Remove. + (CRIS_STACKADJ_REG): Use CRIS_STRUCT_VALUE_REGNUM instead of + STRUCT_VALUE_REGNUM. + (STRUCT_VALUE_REGNUM): Rename to CRIS_STRUCT_VALUE_REGNUM. + 2004-01-24 Ian Lance Taylor PR bootstrap/13848 diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index f7e3d29..77d421d 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -92,6 +92,8 @@ static void cris_print_index (rtx, FILE *); static struct machine_function * cris_init_machine_status (void); +static rtx cris_struct_value_rtx (tree, int); + static int cris_initial_frame_pointer_offset (void); static int saved_regs_mentioned (rtx); @@ -176,6 +178,12 @@ int cris_cpu_version = CRIS_DEFAULT_CPU_VERSION; #undef TARGET_ADDRESS_COST #define TARGET_ADDRESS_COST cris_address_cost +#undef TARGET_PROMOTE_FUNCTION_ARGS +#define TARGET_PROMOTE_FUNCTION_ARGS hook_bool_tree_true + +#undef TARGET_STRUCT_VALUE_RTX +#define TARGET_STRUCT_VALUE_RTX cris_struct_value_rtx + struct gcc_target targetm = TARGET_INITIALIZER; /* Predicate functions. */ @@ -3177,6 +3185,15 @@ restart: } } +/* Worker function for TARGET_STRUCT_VALUE_RTX. */ + +static rtx +cris_struct_value_rtx (tree fntype ATTRIBUTE_UNUSED, + int incoming ATTRIBUTE_UNUSED) +{ + return gen_rtx_REG (Pmode, CRIS_STRUCT_VALUE_REGNUM); +} + #if 0 /* Various small functions to replace macros. Only called from a debugger. They might collide with gcc functions or system functions, diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index 69483fa..be529a9 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -1,5 +1,6 @@ /* Definitions for GCC. Part of the machine description for CRIS. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. Contributed by Axis Communications. Written by Hans-Peter Nilsson. This file is part of GCC. @@ -476,7 +477,8 @@ extern int target_flags; #define UNITS_PER_WORD 4 -/* A combination of defining PROMOTE_MODE, PROMOTE_FUNCTION_ARGS, +/* A combination of defining PROMOTE_MODE, + TARGET_PROMOTE_FUNCTION_ARGS that always returns true, PROMOTE_FOR_CALL_ONLY and *not* defining PROMOTE_PROTOTYPES gives the best code size and speed for gcc, ipps and products in gcc-2.7.2. */ #define CRIS_PROMOTED_MODE(MODE, UNSIGNEDP, TYPE) \ @@ -486,14 +488,12 @@ extern int target_flags; #define PROMOTE_MODE(MODE, UNSIGNEDP, TYPE) \ (MODE) = CRIS_PROMOTED_MODE (MODE, UNSIGNEDP, TYPE) -#define PROMOTE_FUNCTION_ARGS - /* Defining PROMOTE_FUNCTION_RETURN in gcc-2.7.2 uncovers bug 981110 (even if defining FUNCTION_VALUE with MODE as PROMOTED_MODE ;-) FIXME: Report this when cris.h is part of GCC, so others can easily see the problem. Maybe check other systems that define - PROMOTE_FUNCTION_RETURN. */ + TARGET_PROMOTE_FUNCTION_RETURN that always returns true. */ #define PROMOTE_FOR_CALL_ONLY /* We will be using prototype promotion, so they will be 32 bit. */ @@ -832,7 +832,7 @@ enum reg_class {NO_REGS, ALL_REGS, LIM_REG_CLASSES}; (IN_RANGE ((N), 0, 3) ? (CRIS_FIRST_ARG_REG + 3 - (N)) : INVALID_REGNUM) /* Store the stack adjustment in the structure-return-address register. */ -#define CRIS_STACKADJ_REG STRUCT_VALUE_REGNUM +#define CRIS_STACKADJ_REG CRIS_STRUCT_VALUE_REGNUM #define EH_RETURN_STACKADJ_RTX gen_rtx_REG (SImode, CRIS_STACKADJ_REG) #define EH_RETURN_HANDLER_RTX \ @@ -897,8 +897,9 @@ enum reg_class {NO_REGS, ALL_REGS, LIM_REG_CLASSES}; /* Node: Stack Arguments */ /* Since many parameters take up one register each in any case, - PROMOTE_PROTOTYPES would seem like a good idea, but measurements - indicate that a combination using PROMOTE_MODE is better. */ + defining TARGET_PROMOTE_PROTOTYPES that always returns true would + seem like a good idea, but measurements indicate that a combination + using PROMOTE_MODE is better. */ #define ACCUMULATE_OUTGOING_ARGS 1 @@ -992,7 +993,7 @@ struct cum_args {int regs;}; ((unsigned) int_size_in_bytes (TYPE) > CRIS_MAX_ARGS_IN_REGS * UNITS_PER_WORD) #endif -#define STRUCT_VALUE_REGNUM ((CRIS_FIRST_ARG_REG) - 1) +#define CRIS_STRUCT_VALUE_REGNUM ((CRIS_FIRST_ARG_REG) - 1) /* Node: Caller Saves */ -- cgit v1.1