Check for invalid FAILs

This patch makes it a compile-time error for an internal-fn optab
to FAIL.  There are certainly other optabs and patterns besides these
that aren't allowed to fail, but this at least deals with the immediate
point of controversy.

Tested normally on x86_64-linux-gnu.  Also tested by building one
configuration per cpu directory.  arc-elf and pdp11 didn't build
for unrelated reasons, but I checked that insn-emit.o built for
both without error.

gcc/
	* Makefile.in (GENSUPPORT_H): New macro.
	(build/gensupport.o, build/read-rtl.o, build/genattr.o)
	(build/genattr-common.o, build/genattrtab.o, build/genautomata.o)
	(build/gencodes.o, build/genconditions.o, build/genconfig.o)
	(build/genconstants.o, build/genextract.o, build/genflags.o)
	(build/gentarget-def.o): Use it.
	(build/genemit.o): Likewise.  Depend on internal-fn.def.
	* genopinit.c: Move block comment to optabs.def.
	(optab_tag, optab_def): Move to gensupport.h
	(pattern): Likewise, renaming to optab_pattern.
	(match_pattern): Move to gensupport.c
	(gen_insn): Use find_optab.
	(patterns, pattern_cmp): Replace pattern with optab_pattern.
	(main): Likewise.  Use num_optabs.
	* optabs.def: Add comment that was previously in genopinit.c.
	* gensupport.h (optab_tag): Moved from genopinit.c
	(optab_def): Likewise, expanding commentary.
	(optab_pattern): Likewise, after renaming from pattern.
	(optabs, num_optabs, find_optab): Declare.
	* gensupport.c (optabs): Moved from genopinit.c.
	(num_optabs): New variable.
	(match_pattern): Moved from genopinit.c.
	(find_optab): New function, extracted from genopinit.c:gen_insn.
	* genemit.c (nofail_optabs): New variable.
	(emit_c_code): New function.
	(gen_expand): Check whether the instruction is an optab that isn't
	allowed to fail.  Call emit_c_code.
	(gen_split): Call emit_c_code here too.
	(main): Initialize nofail_optabs.  Don't emit FAIL and DONE here.

From-SVN: r231160

1 files changed, 8 insertions, 232 deletions

diff --git a/gcc/genopinit.c b/gcc/genopinit.c
index 167815d561d..3b91112e9ec 100644
--- a/gcc/genopinit.c
+++ b/gcc/genopinit.c
@@ -35,246 +35,22 @@ static const char * const rtx_upname[] = {
 
 #undef DEF_RTL_EXPR
 
-
-/* The entries in optabs.def are categorized:
-     C: A "conversion" optab, which uses two modes; has libcall data.
-     N: A "normal" optab, which uses one mode; has libcall data.
-     D: A "direct" optab, which uses one mode; does not have libcall data.
-     V: An "oVerflow" optab.  Like N, but does not record its code in
-        code_to_optab.
-
-     CX, NX, VX: An extra pattern entry for a conversion or normal optab.
-
-   These patterns may be present in the MD file with names that contain
-   the mode(s) used and the name of the operation.  This array contains
-   a list of optabs that need to be initialized.  Within each name,
-   $a and $b are used to match a short mode name (the part of the mode
-   name not including `mode' and converted to lower-case).
-
-   $I means that only full integer modes should be considered for the
-   next mode, and $F means that only float modes should be considered.
-   $P means that both full and partial integer modes should be considered.
-   $Q means that only fixed-point modes should be considered.
-
-   The pattern may be NULL if the optab exists only for the libcalls
-   that we plan to attach to it, and there are no named patterns in
-   the md files.  */
-
-#define OPTAB_CL(name, pat, c, b, l)		name,
-#define OPTAB_CX(name, pat)
-#define OPTAB_CD(name, pat)			name,
-#define OPTAB_NL(name, pat, c, b, s, l)		name,
-#define OPTAB_NC(name, pat, c)			name,
-#define OPTAB_NX(name, pat)
-#define OPTAB_VL(name, pat, c, b, s, l)		name,
-#define OPTAB_VC(name, pat, c)			name,
-#define OPTAB_VX(name, pat)
-#define OPTAB_DC(name, pat, c)			name,
-#define OPTAB_D(name, pat)			name,
-
-typedef enum optab_tag {
-  unknown_optab,
-#include "optabs.def"
-  NUM_OPTABS
-} optab;
-
-#undef OPTAB_CL
-#undef OPTAB_CX
-#undef OPTAB_CD
-#undef OPTAB_NL
-#undef OPTAB_NC
-#undef OPTAB_NX
-#undef OPTAB_VL
-#undef OPTAB_VC
-#undef OPTAB_VX
-#undef OPTAB_DC
-#undef OPTAB_D
-
-#define NS "NULL"
-#define ZS "'\\0'"
-#define OPTAB_CL(o, p, c, b, l)    { #o, p, #b, ZS, #l, o, c, UNKNOWN, 1 },
-#define OPTAB_CX(o, p) { #o, p, NULL, NULL, NULL, o, UNKNOWN, UNKNOWN, 1 },
-#define OPTAB_CD(o, p) { #o, p, NS, ZS, NS, o, UNKNOWN, UNKNOWN, 2 },
-#define OPTAB_NL(o, p, c, b, s, l) { #o, p, #b, #s, #l, o, c, c, 3 },
-#define OPTAB_NC(o, p, c)          { #o, p, NS, ZS, NS, o, c, c, 3 },
-#define OPTAB_NX(o, p) { #o, p, NULL, NULL, NULL, o, UNKNOWN, UNKNOWN, 3 },
-#define OPTAB_VL(o, p, c, b, s, l) { #o, p, #b, #s, #l, o, c, UNKNOWN, 3 },
-#define OPTAB_VC(o, p, c)          { #o, p, NS, ZS, NS, o, c, UNKNOWN, 3 },
-#define OPTAB_VX(o, p) { #o, p, NULL, NULL, NULL, o, UNKNOWN, UNKNOWN, 3 },
-#define OPTAB_DC(o, p, c)          { #o, p, NS, ZS, NS, o, c, c, 4 },
-#define OPTAB_D(o, p)  { #o, p, NS, ZS, NS, o, UNKNOWN, UNKNOWN, 4 },
-
-struct optab_def
-{
-  const char *name;
-  const char *pattern;
-  const char *base;
-  const char *suffix;
-  const char *libcall;
-  unsigned int op;
-  enum rtx_code fcode;
-  enum rtx_code rcode;
-  unsigned int kind;
-};
-
-static optab_def optabs[] = {
-  { "unknown_optab", NULL, NS, ZS, NS, unknown_optab, UNKNOWN, UNKNOWN, 0 },
-#include "optabs.def"
-};
-
-#undef OPTAB_CL
-#undef OPTAB_CX
-#undef OPTAB_CD
-#undef OPTAB_NL
-#undef OPTAB_NC
-#undef OPTAB_NX
-#undef OPTAB_VL
-#undef OPTAB_VC
-#undef OPTAB_VX
-#undef OPTAB_DC
-#undef OPTAB_D
-
 /* Vector in which to collect insns that match.  */
-
-struct pattern
-{
-  const char *name;
-  unsigned int op;
-  unsigned int m1, m2;
-  unsigned int sort_num;
-};
-
-
-static vec<pattern> patterns;
-
-static bool
-match_pattern (pattern *p, const char *name, const char *pat)
-{
-  bool force_float = false;
-  bool force_int = false;
-  bool force_partial_int = false;
-  bool force_fixed = false;
-
-  if (pat == NULL)
-    return false;
-  for (; ; ++pat)
-    {
-      if (*pat != '$')
-	{
-	  if (*pat != *name++)
-	    return false;
-	  if (*pat == '\0')
-	    return true;
-	  continue;
-	}
-      switch (*++pat)
-	{
-	case 'I':
-	  force_int = 1;
-	  break;
-	case 'P':
-	  force_partial_int = 1;
-	  break;
-	case 'F':
-	  force_float = 1;
-	  break;
-	case 'Q':
-	  force_fixed = 1;
-	  break;
-
-	case 'a':
-	case 'b':
-	  {
-	    int i;
-
-	    /* This loop will stop at the first prefix match, so
-	       look through the modes in reverse order, in case
-	       there are extra CC modes and CC is a prefix of the
-	       CC modes (as it should be).  */
-	    for (i = (MAX_MACHINE_MODE) - 1; i >= 0; i--)
-	      {
-		const char *p, *q;
-		for (p = GET_MODE_NAME (i), q = name; *p; p++, q++)
-		  if (TOLOWER (*p) != *q)
-		    break;
-		if (*p == 0
-		    && (! force_int || mode_class[i] == MODE_INT
-			|| mode_class[i] == MODE_VECTOR_INT)
-		    && (! force_partial_int
-			|| mode_class[i] == MODE_INT
-			|| mode_class[i] == MODE_PARTIAL_INT
-			|| mode_class[i] == MODE_VECTOR_INT)
-		    && (! force_float
-			|| mode_class[i] == MODE_FLOAT
-			|| mode_class[i] == MODE_DECIMAL_FLOAT
-			|| mode_class[i] == MODE_COMPLEX_FLOAT
-			|| mode_class[i] == MODE_VECTOR_FLOAT)
-		    && (! force_fixed
-			|| mode_class[i] == MODE_FRACT
-			|| mode_class[i] == MODE_UFRACT
-			|| mode_class[i] == MODE_ACCUM
-			|| mode_class[i] == MODE_UACCUM
-			|| mode_class[i] == MODE_VECTOR_FRACT
-			|| mode_class[i] == MODE_VECTOR_UFRACT
-			|| mode_class[i] == MODE_VECTOR_ACCUM
-			|| mode_class[i] == MODE_VECTOR_UACCUM))
-		  break;
-	      }
-
-	    if (i < 0)
-	      return false;
-	    name += strlen (GET_MODE_NAME (i));
-	    if (*pat == 'a')
-	      p->m1 = i;
-	    else
-	      p->m2 = i;
-
-	    force_int = false;
-	    force_partial_int = false;
-	    force_float = false;
-	    force_fixed = false;
-	  }
-	  break;
-
-	default:
-	  gcc_unreachable ();
-	}
-    }
-}
+static vec<optab_pattern> patterns;
 
 static void
 gen_insn (md_rtx_info *info)
 {
-  rtx insn = info->def;
-  const char *name = XSTR (insn, 0);
-  pattern p;
-  unsigned pindex;
-
-  /* Don't mention "unnamed" instructions.  */
-  if (*name == 0 || *name == '*')
-    return;
-  p.name = name;
-
-  /* See if NAME matches one of the patterns we have for the optabs
-     we know about.  */
-  for (pindex = 0; pindex < ARRAY_SIZE (optabs); pindex++)
-    {
-      p.m1 = p.m2 = 0;
-      if (match_pattern (&p, name, optabs[pindex].pattern))
-	{
-	  p.op = optabs[pindex].op;
-	  p.sort_num = (p.op << 16) | (p.m2 << 8) | p.m1;
-	  patterns.safe_push (p);
-	  return;
-	}
-    }
+  optab_pattern p;
+  if (find_optab (&p, XSTR (info->def, 0)))
+    patterns.safe_push (p);
 }
 
 static int
 pattern_cmp (const void *va, const void *vb)
 {
-  const pattern *a = (const pattern *)va;
-  const pattern *b = (const pattern *)vb;
+  const optab_pattern *a = (const optab_pattern *)va;
+  const optab_pattern *b = (const optab_pattern *)vb;
   return a->sort_num - b->sort_num;
 }
 
@@ -333,7 +109,7 @@ main (int argc, char **argv)
 {
   FILE *h_file, *s_file;
   unsigned int i, j, n, last_kind[5];
-  pattern *p;
+  optab_pattern *p;
 
   progname = "genopinit";
 
@@ -365,7 +141,7 @@ main (int argc, char **argv)
 
   /* Now that we've handled the "extra" patterns, eliminate them from
      the optabs array.  That way they don't get in the way below.  */
-  n = ARRAY_SIZE (optabs);
+  n = num_optabs;
   for (i = 0; i < n; )
     if (optabs[i].base == NULL)
       optabs[i] = optabs[--n];