From f2f543a372584d4890fa89b988b4f753ddb3f811 Mon Sep 17 00:00:00 2001 From: zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Thu, 2 Oct 2003 00:44:29 +0000 Subject: * target.h (init_libfuncs): New hook. * target-def.h: Default TARGET_INIT_BUILTINS and TARGET_INIT_LIBFUNCS to hook_void_void. Add TARGET_INIT_LIBFUNCS to TARGET_INITIALIZER. * builtins.c (default_init_builtins): Delete. * expr.h (default_init_builtins): Delete prototype. * doc/tm.texi: Document TARGET_INIT_LIBFUNCS and US_SOFTWARE_GOFAST. Tweak documentation of TARGET_FLOAT_LIB_COMPARE_RETURNS_BOOL. Remove documentation of INIT_TARGET_OPTABS, MULSI3_LIBCALL, DIVSI3_LIBCALL, UDIVSI3_LIBCALL, MODSI3_LIBCALL, UMODSI3_LIBCALL, MULDI3_LIBCALL, DIVDI3_LIBCALL, UDIVDI3_LIBCALL, MODDI3_LIBCALL, and UMODDI3_LIBCALL, * Makefile.in (optabs.o): Depends on target.h. * defaults.h: Provide default for FLOAT_LIB_COMPARE_RETURNS_BOOL. * optabs.c: Include target.h. (prepare_float_lib_cmp): No need for #ifdef around use of FLOAT_LIB_COMPARE_RETURNS_BOOL. (set_optab_libfunc): New function. (init_optabs): Delete use of all *_LIBCALL defines. Call targetm.init_libfuncs not INIT_TARGET_OPTABS. * optabs.h: Prototype set_optab_libfunc. * config.gcc: Remove all references to pa/long_double.h, ia64/hpux_longdouble.h, and gofast.h. (mips-*-*): When --enable-gofast, just add US_SOFTWARE_GOFAST to tm_defines; don't set INIT_SUBTARGET_OPTABS or change tm_file. * config/alpha/alpha.c, config/c4x/c4x.c, config/cris/cris.c * config/frv/frv.c, config/h8300/h8300.c, config/i860/i860.c * config/ia64/ia64.c, config/ip2k/ip2k.c, config/m68hc11/m68hc11.c * config/mips/mips.c, config/pa/pa.c, config/rs6000/rs6000.c * config/sparc/sparc.c, config/vax/vax.c: Provide a definition for TARGET_INIT_LIBFUNCS. Where necessary, include optabs.h, libfuncs.h, and/or config/gofast.h. * config/alpha/unicosmk.h, config/alpha/vms.h, config/c4x/c4x.h * config/avr/avr.h, config/cris/cris.h, config/frv/frv.h * config/h8300/h8300.h, config/i860/i860.h, config/ip2k/ip2k.h * config/iq2000/iq2000.h, config/m68hc11/m68hc11.h, config/mips/mips.h * config/rs6000/aix.h, config/rs6000/sysv4.h, config/sparc/elf.h * config/sparc/lite.h, config/sparc/netbsd-elf.h, config/sparc/sol2.h * config/sparc/sparc.h, config/v850/v850.h, config/vax/vax.h * config/vax/elf.h: Don't define or use INIT_TARGET_OPTABS, INIT_SUBTARGET_OPTABS, or any *_LIBCALL macros. * config/ia64/hpux.h: Redefine INTEL_EXTENDED_IEEE_FORMAT to 0. Set TARGET_INIT_LIBFUNCS and FLOAT_LIB_COMPARE_RETURNS_BOOL here. * config/pa/pa-hpux.h: Define LONG_DOUBLE_TYPE_SIZE, HPUX_LONG_DOUBLE_LIBRARY, and FLOAT_LIB_COMPARE_RETURNS_BOOL here. * config/ia64/hpux_longdouble.h, config/pa/long_double.h: Delete. * config/rs6000/xcoff.h: Don't define RS6000_ITRUNC nor RS6000_UITRUNC. * config/sparc/sparc.h: Default SUN_CONVERSION_LIBFUNCS and SUN_INTEGER_MULTIPLY_64 to 0. * config/sparc/sol2.h: Redefine SUN_CONVERSION_LIBFUNCS and SUN_INTEGER_MULTIPLY_64 to 1. * config/sparc/elf.h: Redefine SUN_CONVERSION_LIBFUNCS and SUN_INTEGER_MULTIPLY_64 to 0. * config/sparc/lite.h, config/sparc/liteelf.h, config/sparc/sp86x-elf.h: Define US_SOFTWARE_GOFAST. * config/vax/vax.h: Default TARGET_ELF to 0. * config/vax/elf.h: Redefine TARGET_ELF to 1. * config/gofast.h: Don't define any macros here. Provide one static function, gofast_maybe_init_libfuncs, which does what INIT_GOFAST_LIBFUNCS used to do but only if US_SOFTWARE_GOFAST is already defined. Do not clear negation libfuncs. Do not mess with HFmode, XFmode, or TFmode libfuncs. * config/avr/avr.c (avr_init_once): #if 0 out; mark FIXME. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72009 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/optabs.c | 68 ++++++++++++++---------------------------------------------- 1 file changed, 15 insertions(+), 53 deletions(-) (limited to 'gcc/optabs.c') diff --git a/gcc/optabs.c b/gcc/optabs.c index e413d86d18e..bd1b42a68ee 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -43,6 +43,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ggc.h" #include "real.h" #include "basic-block.h" +#include "target.h" /* Each optab contains info on how this target machine can perform a particular operation @@ -4198,12 +4199,9 @@ prepare_float_lib_cmp (rtx *px, rtx *py, enum rtx_code *pcomparison, *px = result; *py = const0_rtx; *pmode = word_mode; - if (comparison == UNORDERED) + if (comparison == UNORDERED + || FLOAT_LIB_COMPARE_RETURNS_BOOL (mode, comparison)) *pcomparison = NE; -#ifdef FLOAT_LIB_COMPARE_RETURNS_BOOL - else if (FLOAT_LIB_COMPARE_RETURNS_BOOL (mode, comparison)) - *pcomparison = NE; -#endif *punsignedp = 0; } @@ -5342,6 +5340,17 @@ init_one_libfunc (const char *name) return symbol; } +/* Call this to reset the function entry for one optab (OPTABLE) in mode + MODE to NAME, which should be either 0 or a string constant. */ +void +set_optab_libfunc (optab optable, enum machine_mode mode, const char *name) +{ + if (name) + optable->handlers[mode].libfunc = init_one_libfunc (name); + else + optable->handlers[mode].libfunc = 0; +} + /* Call this once to initialize the contents of the optabs appropriately for the current target machine. */ @@ -5521,51 +5530,6 @@ init_optabs (void) init_integral_libfuncs (ucmp_optab, "ucmp", '2'); init_floating_libfuncs (cmp_optab, "cmp", '2'); -#ifdef MULSI3_LIBCALL - smul_optab->handlers[(int) SImode].libfunc - = init_one_libfunc (MULSI3_LIBCALL); -#endif -#ifdef MULDI3_LIBCALL - smul_optab->handlers[(int) DImode].libfunc - = init_one_libfunc (MULDI3_LIBCALL); -#endif - -#ifdef DIVSI3_LIBCALL - sdiv_optab->handlers[(int) SImode].libfunc - = init_one_libfunc (DIVSI3_LIBCALL); -#endif -#ifdef DIVDI3_LIBCALL - sdiv_optab->handlers[(int) DImode].libfunc - = init_one_libfunc (DIVDI3_LIBCALL); -#endif - -#ifdef UDIVSI3_LIBCALL - udiv_optab->handlers[(int) SImode].libfunc - = init_one_libfunc (UDIVSI3_LIBCALL); -#endif -#ifdef UDIVDI3_LIBCALL - udiv_optab->handlers[(int) DImode].libfunc - = init_one_libfunc (UDIVDI3_LIBCALL); -#endif - -#ifdef MODSI3_LIBCALL - smod_optab->handlers[(int) SImode].libfunc - = init_one_libfunc (MODSI3_LIBCALL); -#endif -#ifdef MODDI3_LIBCALL - smod_optab->handlers[(int) DImode].libfunc - = init_one_libfunc (MODDI3_LIBCALL); -#endif - -#ifdef UMODSI3_LIBCALL - umod_optab->handlers[(int) SImode].libfunc - = init_one_libfunc (UMODSI3_LIBCALL); -#endif -#ifdef UMODDI3_LIBCALL - umod_optab->handlers[(int) DImode].libfunc - = init_one_libfunc (UMODDI3_LIBCALL); -#endif - /* Use cabs for DC complex abs, since systems generally have cabs. Don't define any libcall for SCmode, so that cabs will be used. */ abs_optab->handlers[(int) DCmode].libfunc @@ -5711,10 +5675,8 @@ init_optabs (void) if (HAVE_conditional_trap) trap_rtx = gen_rtx_fmt_ee (EQ, VOIDmode, NULL_RTX, NULL_RTX); -#ifdef INIT_TARGET_OPTABS /* Allow the target to add more libcalls or rename some, etc. */ - INIT_TARGET_OPTABS; -#endif + targetm.init_libfuncs (); } /* Generate insns to trap with code TCODE if OP1 and OP2 satisfy condition -- cgit v1.2.1