optabs.h (OTI_flodiv, [...]): Kill.

	* optabs.h (OTI_flodiv, flodiv_optab): Kill.
	* genopinit.c: Put floating point divide insns in sdiv_optab.
	* expr.c (expand_expr): Use sdiv_optab, not flodiv_optab.
	* config/gofast.h, config/c4x/c4x.h,
	config/ia64/hpux_longdouble.h, config/mips/mips.h,
	config/pa/long_double.h, config/rs6000/sysv4.h,
	config/sparc/sparc.h: Put floating point divide libcalls in sdiv_optab.
	* optabs.c (init_optab): Break into new_optab, init_optab, init_optabv.
	(init_optabs): Use init_optabv for overflow-trapping optabs.
	Don't init flodiv_optab.  Give mov_optab, movstrict_optab, and
	cmp_optab RTX codes so have_insn_for can find them.

	* optabs.c (expand_simple_binop, expand_simple_unop,
	have_insn_for, gen_sub3_insn): New interfaces.
	* expr.h: Prototype new functions.
	(enum optab_methods): Move here from optabs.h.

	* builtins.c, combine.c, doloop.c, function.c, ifcvt.c,
	loop.c, profile.c, simplify-rtx.c, stmt.c, unroll.c:
	Use new	functions instead of working directly with optabs.
	* doloop.c, ifcvt.c, loop.c, profile.c, simplify-rtx.c,
	unroll.c: Don't include optabs.h.
	* caller-save.c, combine.c, function.c, stmt.c: Just include
	insn-codes.h, not optabs.h.
	* Makefile.in: Update dependencies.

	* combine.c (make_compound_operation, simplify_comparison):
	Fix typos testing for this or that instruction.

From-SVN: r45008

7 files changed, 10 insertions, 10 deletions

diff --git a/gcc/config/c4x/c4x.h b/gcc/config/c4x/c4x.h
index 607bc48..e2c483d 100644
--- a/gcc/config/c4x/c4x.h
+++ b/gcc/config/c4x/c4x.h
@@ -1502,11 +1502,11 @@ CUMULATIVE_ARGS;
       = init_one_libfunc (MODQI3_LIBCALL);		\
     umod_optab->handlers[(int) QImode].libfunc		\
       = init_one_libfunc (UMODQI3_LIBCALL);		\
-    flodiv_optab->handlers[(int) QFmode].libfunc	\
+    sdiv_optab->handlers[(int) QFmode].libfunc		\
       = init_one_libfunc (DIVQF3_LIBCALL);		\
     smul_optab->handlers[(int) HFmode].libfunc		\
       = init_one_libfunc (MULHF3_LIBCALL);		\
-    flodiv_optab->handlers[(int) HFmode].libfunc	\
+    sdiv_optab->handlers[(int) HFmode].libfunc		\
       = init_one_libfunc (DIVHF3_LIBCALL);		\
     smul_optab->handlers[(int) HImode].libfunc		\
       = init_one_libfunc (MULHI3_LIBCALL);		\
diff --git a/gcc/config/gofast.h b/gcc/config/gofast.h
index dd09ea1..4c3c0ea 100644
--- a/gcc/config/gofast.h
+++ b/gcc/config/gofast.h
@@ -50,8 +50,8 @@ Boston, MA 02111-1307, USA.  */
   sub_optab->handlers[(int) DFmode].libfunc = init_one_libfunc ("dpsub"); \
   smul_optab->handlers[(int) SFmode].libfunc = init_one_libfunc ("fpmul"); \
   smul_optab->handlers[(int) DFmode].libfunc = init_one_libfunc ("dpmul"); \
-  flodiv_optab->handlers[(int) SFmode].libfunc = init_one_libfunc ("fpdiv"); \
-  flodiv_optab->handlers[(int) DFmode].libfunc = init_one_libfunc ("dpdiv"); \
+  sdiv_optab->handlers[(int) SFmode].libfunc = init_one_libfunc ("fpdiv"); \
+  sdiv_optab->handlers[(int) DFmode].libfunc = init_one_libfunc ("dpdiv"); \
   cmp_optab->handlers[(int) SFmode].libfunc = init_one_libfunc ("fpcmp"); \
   cmp_optab->handlers[(int) DFmode].libfunc = init_one_libfunc ("dpcmp"); \
 \
diff --git a/gcc/config/ia64/hpux_longdouble.h b/gcc/config/ia64/hpux_longdouble.h
index 27717dd..bfc12d4 100644
--- a/gcc/config/ia64/hpux_longdouble.h
+++ b/gcc/config/ia64/hpux_longdouble.h
@@ -59,7 +59,7 @@ Boston, MA 02111-1307, USA.  */
       = gen_rtx_SYMBOL_REF (Pmode, SUBTF3_LIBCALL);			\
     smul_optab->handlers[(int) TFmode].libfunc				\
       = gen_rtx_SYMBOL_REF (Pmode, MULTF3_LIBCALL);			\
-    flodiv_optab->handlers[(int) TFmode].libfunc			\
+    sdiv_optab->handlers[(int) TFmode].libfunc				\
       = gen_rtx_SYMBOL_REF (Pmode, DIVTF3_LIBCALL);			\
     smin_optab->handlers[(int) TFmode].libfunc				\
       = gen_rtx_SYMBOL_REF (Pmode, SMINTF3_LIBCALL);			\
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index b3c4dd4..a3500ee 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -4572,7 +4572,7 @@ do									\
 	  init_one_libfunc ("__mips16_subsf3");				\
 	smul_optab->handlers[(int) SFmode].libfunc =			\
 	  init_one_libfunc ("__mips16_mulsf3");				\
-	flodiv_optab->handlers[(int) SFmode].libfunc =			\
+	sdiv_optab->handlers[(int) SFmode].libfunc =			\
 	  init_one_libfunc ("__mips16_divsf3");				\
 									\
 	eqsf2_libfunc = init_one_libfunc ("__mips16_eqsf2");		\
@@ -4595,7 +4595,7 @@ do									\
 	      init_one_libfunc ("__mips16_subdf3");			\
 	    smul_optab->handlers[(int) DFmode].libfunc =		\
 	      init_one_libfunc ("__mips16_muldf3");			\
-	    flodiv_optab->handlers[(int) DFmode].libfunc =		\
+	    sdiv_optab->handlers[(int) DFmode].libfunc =		\
 	      init_one_libfunc ("__mips16_divdf3");			\
 									\
 	    extendsfdf2_libfunc =					\
diff --git a/gcc/config/pa/long_double.h b/gcc/config/pa/long_double.h
index e65f15f..fa7a710 100644
--- a/gcc/config/pa/long_double.h
+++ b/gcc/config/pa/long_double.h
@@ -70,7 +70,7 @@ do { long value[4];                                                     \
       = gen_rtx_SYMBOL_REF (Pmode, SUBTF3_LIBCALL);			\
     smul_optab->handlers[(int) TFmode].libfunc				\
       = gen_rtx_SYMBOL_REF (Pmode, MULTF3_LIBCALL);			\
-    flodiv_optab->handlers[(int) TFmode].libfunc			\
+    sdiv_optab->handlers[(int) TFmode].libfunc				\
       = gen_rtx_SYMBOL_REF (Pmode, DIVTF3_LIBCALL);			\
     smin_optab->handlers[(int) TFmode].libfunc				\
       = gen_rtx_SYMBOL_REF (Pmode, SMINTF3_LIBCALL);			\
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index d916ad5..b8158cc 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -1518,7 +1518,7 @@ ncrtn.o%s"
 	  = init_one_libfunc (NEGTF2_LIBCALL);				\
 	smul_optab->handlers[(int) TFmode].libfunc			\
 	  = init_one_libfunc (MULTF3_LIBCALL);				\
-	flodiv_optab->handlers[(int) TFmode].libfunc			\
+	sdiv_optab->handlers[(int) TFmode].libfunc			\
 	  = init_one_libfunc (DIVTF3_LIBCALL);				\
 	eqtf2_libfunc = init_one_libfunc (EQTF2_LIBCALL);		\
 	netf2_libfunc = init_one_libfunc (NETF2_LIBCALL);		\
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index 6aa72d1..e24b0f9 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -2771,7 +2771,7 @@ do {                                                                    \
 	  = init_one_libfunc (NEGTF2_LIBCALL);				\
 	smul_optab->handlers[(int) TFmode].libfunc			\
 	  = init_one_libfunc (MULTF3_LIBCALL);				\
-	flodiv_optab->handlers[(int) TFmode].libfunc			\
+	sdiv_optab->handlers[(int) TFmode].libfunc			\
 	  = init_one_libfunc (DIVTF3_LIBCALL);				\
 	eqtf2_libfunc = init_one_libfunc (EQTF2_LIBCALL);		\
 	netf2_libfunc = init_one_libfunc (NETF2_LIBCALL);		\