Replace object.scm with cos.scm

[deliverable/binutils-gdb.git] / opcodes / cgen-opc.in

diff --git a/opcodes/cgen-opc.in b/opcodes/cgen-opc.in
index d88df31834f2f3aaee26ff6045a1128ca33e03f2..2205f510a352dd515937eba723835bd3eb29e203 100644 (file)
--- a/opcodes/cgen-opc.in
+++ b/opcodes/cgen-opc.in
@@ -28,22 +28,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "symcat.h"
 #include "@arch@-opc.h"
+#include "opintl.h"
 
 /* Look up instruction INSN_VALUE and extract its fields.
-   If non-null INSN is the insn table entry.
+   INSN, if non-null, is the insn table entry.
    Otherwise INSN_VALUE is examined to compute it.
    LENGTH is the bit length of INSN_VALUE if known, otherwise 0.
+   0 is only valid if `insn == NULL && ! defined (CGEN_INT_INSN)'.
+   If INSN != NULL, LENGTH must be valid.
+   ALIAS_P is non-zero if alias insns are to be included in the search.
+
    The result a pointer to the insn table entry, or NULL if the instruction
    wasn't recognized.  */
 
 const CGEN_INSN *
-@arch@_cgen_lookup_insn (insn, insn_value, length, fields)
+@arch@_cgen_lookup_insn (insn, insn_value, length, fields, alias_p)
      const CGEN_INSN *insn;
      cgen_insn_t insn_value;
      int length;
      CGEN_FIELDS *fields;
+     int alias_p;
 {
-  char buf[4];
+  char buf[16];
 
   if (!insn)
     {
@@ -82,14 +88,24 @@ const CGEN_INSN *
        {
          insn = insn_list->insn;
 
-         /* Basic bit mask must be correct.  */
-         /* ??? May wish to allow target to defer this check until the extract
-            handler.  */
-         if ((insn_value & CGEN_INSN_MASK (insn)) == CGEN_INSN_VALUE (insn))
+         if (alias_p
+             || ! CGEN_INSN_ATTR (insn, CGEN_INSN_ALIAS))
            {
-             length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, fields);
-             if (length > 0)
-               return insn;
+             /* Basic bit mask must be correct.  */
+             /* ??? May wish to allow target to defer this check until the
+                extract handler.  */
+             if ((insn_value & CGEN_INSN_MASK (insn)) == CGEN_INSN_VALUE (insn))
+               {
+                 int elength = (*CGEN_EXTRACT_FN (insn)) (insn, NULL,
+                                                          insn_value, fields);
+                 if (elength > 0)
+                   {
+                     /* sanity check */
+                     if (length != 0 && length != elength)
+                       abort ();
+                     return insn;
+                   }
+               }
            }
 
          insn_list = CGEN_DIS_NEXT_INSN (insn_list);
@@ -97,47 +113,75 @@ const CGEN_INSN *
     }
   else
     {
+      /* Sanity check: can't pass an alias insn if ! alias_p.  */
+      if (! alias_p
+         && CGEN_INSN_ATTR (insn, CGEN_INSN_ALIAS))
+       abort ();
+      /* Sanity check: length must be correct.  */
+      if (length != CGEN_INSN_BITSIZE (insn))
+       abort ();
+
       length = (*CGEN_EXTRACT_FN (insn)) (insn, NULL, insn_value, fields);
-      if (length > 0)
-       return insn;
+      /* Sanity check: must succeed.
+        Could relax this later if it ever proves useful.  */
+      if (length == 0)
+       abort ();
+      return insn;
     }
 
   return NULL;
 }
 
-/* Fill in the operand instances used by insn INSN_VALUE.
-   If non-null INS is the insn table entry.
-   Otherwise INSN_VALUE is examined to compute it.
-   LENGTH is the number of bits in INSN_VALUE if known, otherwise 0.
-   INDICES is a pointer to a buffer of MAX_OPERANDS ints to be filled in.
-   The result a pointer to the insn table entry, or NULL if the instruction
-   wasn't recognized.  */
+/* Fill in the operand instances used by INSN whose operands are FIELDS.
+   INDICES is a pointer to a buffer of MAX_OPERAND_INSTANCES ints to be filled
+   in.  */
 
-const CGEN_INSN *
-@arch@_cgen_get_insn_operands (insn, insn_value, length, indices)
-     const CGEN_INSN *insn;
-     cgen_insn_t insn_value;
-     int length;
+void
+@arch@_cgen_get_insn_operands (insn, fields, indices)
+     const CGEN_INSN * insn;
+     const CGEN_FIELDS * fields;
      int *indices;
 {
-  CGEN_FIELDS fields;
   const CGEN_OPERAND_INSTANCE *opinst;
   int i;
 
-  insn = @arch@_cgen_lookup_insn (insn, insn_value, length, &fields);
-  if (! insn)
-    return NULL;
-
   for (i = 0, opinst = CGEN_INSN_OPERANDS (insn);
-       CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
+       opinst != NULL
+        && CGEN_OPERAND_INSTANCE_TYPE (opinst) != CGEN_OPERAND_INSTANCE_END;
        ++i, ++opinst)
     {
       const CGEN_OPERAND *op = CGEN_OPERAND_INSTANCE_OPERAND (opinst);
       if (op == NULL)
        indices[i] = CGEN_OPERAND_INSTANCE_INDEX (opinst);
       else
-       indices[i] = @arch@_cgen_get_operand (CGEN_OPERAND_INDEX (op), &fields);
+       indices[i] = @arch@_cgen_get_operand (CGEN_OPERAND_INDEX (op), fields);
     }
+}
+
+/* Cover function to @arch@_cgen_get_insn_operands when either INSN or FIELDS
+   isn't known.
+   The INSN, INSN_VALUE, and LENGTH arguments are passed to
+   @arch@_cgen_lookup_insn unchanged.
+
+   The result is the insn table entry or NULL if the instruction wasn't
+   recognized.  */
+
+const CGEN_INSN *
+@arch@_cgen_lookup_get_insn_operands (insn, insn_value, length, indices)
+     const CGEN_INSN *insn;
+     cgen_insn_t insn_value;
+     int length;
+     int *indices;
+{
+  CGEN_FIELDS fields;
+
+  /* Pass non-zero for ALIAS_P only if INSN != NULL.
+     If INSN == NULL, we want a real insn.  */
+  insn = @arch@_cgen_lookup_insn (insn, insn_value, length, &fields,
+                                 insn != NULL);
+  if (! insn)
+    return NULL;
 
+  @arch@_cgen_get_insn_operands (insn, &fields, indices);
   return insn;
 }