* Fix for PR 18665, from sky branch.

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

diff --git a/opcodes/cgen-opc.in b/opcodes/cgen-opc.in
index 197daedd7070d91361f9c06e0a812796bb7ddaa0..44a187dd80fa5331d72d6cffbeb553e02010b6cf 100644 (file)
--- a/opcodes/cgen-opc.in
+++ b/opcodes/cgen-opc.in
@@ -30,69 +30,67 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 #include "@prefix@-opc.h"
 #include "opintl.h"
 
+/* Used by the ifield rtx function.  */
+#define FLD(f) (fields->f)
+
 /* The hash functions are recorded here to help keep assembler code out of
    the disassembler and vice versa.  */
 
 static int asm_hash_insn_p PARAMS ((const CGEN_INSN *));
 static unsigned int asm_hash_insn PARAMS ((const char *));
 static int dis_hash_insn_p PARAMS ((const CGEN_INSN *));
-static unsigned int dis_hash_insn PARAMS ((const char *, unsigned long));
+static unsigned int dis_hash_insn PARAMS ((const char *, CGEN_INSN_INT));
 
 /* Look up instruction INSN_VALUE and extract its fields.
    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)'.
+   0 is only valid if `insn == NULL && ! CGEN_INT_INSN_P'.
    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
+   The result is a pointer to the insn table entry, or NULL if the instruction
    wasn't recognized.  */
 
 const CGEN_INSN *
 @arch@_cgen_lookup_insn (od, insn, insn_value, length, fields, alias_p)
      CGEN_OPCODE_DESC od;
      const CGEN_INSN *insn;
-     cgen_insn_t insn_value;
+     CGEN_INSN_BYTES insn_value;
      int length;
      CGEN_FIELDS *fields;
      int alias_p;
 {
-  char buf[16];
+  unsigned char buf[CGEN_MAX_INSN_SIZE];
+  unsigned char *bufp;
+  CGEN_INSN_INT base_insn;
+#if CGEN_INT_INSN_P
+  CGEN_EXTRACT_INFO *info = NULL;
+#else
+  CGEN_EXTRACT_INFO ex_info;
+  CGEN_EXTRACT_INFO *info = &ex_info;
+#endif
+
+#if CGEN_INT_INSN_P
+  cgen_put_insn_value (od, buf, length, insn_value);
+  bufp = buf;
+  base_insn = insn_value; /*???*/
+#else
+  ex_info.dis_info = NULL;
+  ex_info.insn_bytes = insn_value;
+  ex_info.valid = -1;
+  base_insn = cgen_get_insn_value (od, buf, length);
+  bufp = insn_value;
+#endif
 
   if (!insn)
     {
       const CGEN_INSN_LIST *insn_list;
 
-#ifdef CGEN_INT_INSN
-      switch (length)
-       {
-       case 8:
-         buf[0] = insn_value;
-         break;
-       case 16:
-         if (CGEN_OPCODE_ENDIAN (od) == CGEN_ENDIAN_BIG)
-           bfd_putb16 (insn_value, buf);
-         else
-           bfd_putl16 (insn_value, buf);
-         break;
-       case 32:
-         if (CGEN_OPCODE_ENDIAN (od) == CGEN_ENDIAN_BIG)
-           bfd_putb32 (insn_value, buf);
-         else
-           bfd_putl32 (insn_value, buf);
-         break;
-       default:
-         abort ();
-       }
-#else
-      abort (); /* FIXME: unfinished */
-#endif
-
       /* The instructions are stored in hash lists.
         Pick the first one and keep trying until we find the right one.  */
 
-      insn_list = CGEN_DIS_LOOKUP_INSN (od, buf, insn_value);
+      insn_list = CGEN_DIS_LOOKUP_INSN (od, bufp, base_insn);
       while (insn_list != NULL)
        {
          insn = insn_list->insn;
@@ -103,11 +101,12 @@ const CGEN_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 ((base_insn & CGEN_INSN_BASE_MASK (insn))
+                 == CGEN_INSN_BASE_VALUE (insn))
                {
                  /* ??? 0 is passed for `pc' */
-                 int elength = (*CGEN_EXTRACT_FN (insn)) (od, insn, NULL,
-                                                          insn_value, fields,
+                 int elength = (*CGEN_EXTRACT_FN (insn)) (od, insn, info,
+                                                          base_insn, fields,
                                                           (bfd_vma) 0);
                  if (elength > 0)
                    {
@@ -133,7 +132,7 @@ const CGEN_INSN *
        abort ();
 
       /* ??? 0 is passed for `pc' */
-      length = (*CGEN_EXTRACT_FN (insn)) (od, insn, NULL, insn_value, fields,
+      length = (*CGEN_EXTRACT_FN (insn)) (od, insn, info, base_insn, fields,
                                          (bfd_vma) 0);
       /* Sanity check: must succeed.
         Could relax this later if it ever proves useful.  */
@@ -185,7 +184,7 @@ const CGEN_INSN *
 @arch@_cgen_lookup_get_insn_operands (od, insn, insn_value, length, indices)
      CGEN_OPCODE_DESC od;
      const CGEN_INSN *insn;
-     cgen_insn_t insn_value;
+     CGEN_INSN_BYTES insn_value;
      int length;
      int *indices;
 {