1 files changed, 55 insertions, 50 deletions

diff --git a/contrib/binutils/opcodes/cgen-asm.c b/contrib/binutils/opcodes/cgen-asm.c
index 732ba57..6dd558b 100644
--- a/contrib/binutils/opcodes/cgen-asm.c
+++ b/contrib/binutils/opcodes/cgen-asm.c
@@ -1,28 +1,30 @@
 /* CGEN generic assembler support code.
 
-Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
 
-This file is part of the GNU Binutils and GDB, the GNU debugger.
+   This file is part of the GNU Binutils and GDB, the GNU debugger.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "sysdep.h"
 #include <stdio.h>
+#include <ctype.h>
 #include "ansidecl.h"
 #include "libiberty.h"
 #include "bfd.h"
+#include "symcat.h"
 #include "opcode/cgen.h"
 
 /* Operand parsing callback.  */
@@ -64,11 +66,11 @@ cgen_init_parse_operand ()
 static void
 build_asm_hash_table ()
 {
-  int i;
   unsigned int hash;
   int count = cgen_insn_count ();
   CGEN_OPCODE_DATA *data = cgen_current_opcode_data;
   CGEN_INSN_TABLE *insn_table = data->insn_table;
+  unsigned int entry_size = insn_table->entry_size;
   unsigned int hash_size = insn_table->asm_hash_table_size;
   const CGEN_INSN *insn;
   CGEN_INSN_LIST *insn_lists,*new_insns;
@@ -87,13 +89,18 @@ build_asm_hash_table ()
   /* Add compiled in insns.
      The table is scanned backwards as later additions are inserted in
      front of earlier ones and we want earlier ones to be prefered.
-     We stop at the first one as it is a reserved entry.  */
-
-  for (insn = insn_table->init_entries + insn_table->num_init_entries - 1;
+     We stop at the first one as it is a reserved entry.
+     This is a bit tricky as the attribute member of CGEN_INSN is variable
+     among architectures.  This code could be moved to cgen-asm.in, but
+     I prefer to keep it here for now.  */
+
+  for (insn = (CGEN_INSN *)
+       ((char *) insn_table->init_entries
+	+ entry_size * (insn_table->num_init_entries - 1));
        insn > insn_table->init_entries;
-       --insn, ++insn_lists)
+       insn = (CGEN_INSN *) ((char *) insn - entry_size), ++insn_lists)
     {
-      hash = (*insn_table->asm_hash) (insn->syntax.mnemonic);
+      hash = (*insn_table->asm_hash) CGEN_INSN_MNEMONIC (insn);
       insn_lists->next = asm_hash_table[hash];
       insn_lists->insn = insn;
       asm_hash_table[hash] = insn_lists;
@@ -106,7 +113,7 @@ build_asm_hash_table ()
        new_insns != NULL;
        new_insns = new_insns->next, ++insn_lists)
     {
-      hash = (*insn_table->asm_hash) (new_insns->insn->syntax.mnemonic);
+      hash = (*insn_table->asm_hash) CGEN_INSN_MNEMONIC (new_insns->insn);
       insn_lists->next = asm_hash_table[hash];
       insn_lists->insn = new_insns->insn;
       asm_hash_table[hash] = insn_lists;
@@ -139,35 +146,40 @@ cgen_asm_lookup_insn (insn)
 const char *
 cgen_parse_keyword (strp, keyword_table, valuep)
      const char **strp;
-     struct cgen_keyword *keyword_table;
+     CGEN_KEYWORD *keyword_table;
      long *valuep;
 {
-  const struct cgen_keyword_entry *ke;
+  const CGEN_KEYWORD_ENTRY *ke;
   char buf[256];
-  const char *p;
+  const char *p,*start;
 
-  p = *strp;
+  p = start = *strp;
 
-  /* Allow any first character.  */
+  /* Allow any first character.
+     Note that this allows recognizing ",a" for the annul flag in sparc
+     even though "," is subsequently not a valid keyword char.  */
   if (*p)
     ++p;
 
   /* Now allow letters, digits, and _.  */
-  while (isalnum (*p) || *p == '_')
+  while (((p - start) < (int) sizeof (buf))
+	 && (isalnum ((unsigned char) *p) || *p == '_'))
     ++p;
 
-  if (p - *strp > 255)
+  if (p - start >= (int) sizeof (buf))
     return "unrecognized keyword/register name";
 
-  memcpy (buf, *strp, p - *strp);
-  buf[p - *strp] = 0;
+  memcpy (buf, start, p - start);
+  buf[p - start] = 0;
 
   ke = cgen_keyword_lookup_name (keyword_table, buf);
 
   if (ke != NULL)
     {
       *valuep = ke->value;
-      *strp = p;
+      /* Don't advance pointer if we recognized the null keyword.  */
+      if (ke->name[0] != 0)
+	*strp = p;
       return NULL;
     }
 
@@ -177,13 +189,12 @@ cgen_parse_keyword (strp, keyword_table, valuep)
 /* Signed integer parser.  */
 
 const char *
-cgen_parse_signed_integer (strp, opindex, min, max, valuep)
+cgen_parse_signed_integer (strp, opindex, valuep)
      const char **strp;
      int opindex;
-     long min, max;
      long *valuep;
 {
-  long value;
+  bfd_vma value;
   enum cgen_parse_operand_result result;
   const char *errmsg;
 
@@ -192,24 +203,19 @@ cgen_parse_signed_integer (strp, opindex, min, max, valuep)
 				     &result, &value);
   /* FIXME: Examine `result'.  */
   if (!errmsg)
-    {
-      if (value < min || value > max)
-	return "integer operand out of range";
-      *valuep = value;
-    }
+    *valuep = value;
   return errmsg;
 }
 
 /* Unsigned integer parser.  */
 
 const char *
-cgen_parse_unsigned_integer (strp, opindex, min, max, valuep)
+cgen_parse_unsigned_integer (strp, opindex, valuep)
      const char **strp;
      int opindex;
-     unsigned long min, max;
      unsigned long *valuep;
 {
-  unsigned long value;
+  bfd_vma value;
   enum cgen_parse_operand_result result;
   const char *errmsg;
 
@@ -218,33 +224,32 @@ cgen_parse_unsigned_integer (strp, opindex, min, max, valuep)
 				     &result, &value);
   /* FIXME: Examine `result'.  */
   if (!errmsg)
-    {
-      if (value < min || value > max)
-	return "integer operand out of range";
-      *valuep = value;
-    }
+    *valuep = value;
   return errmsg;
 }
 
 /* Address parser.  */
 
 const char *
-cgen_parse_address (strp, opindex, opinfo, valuep)
+cgen_parse_address (strp, opindex, opinfo, resultp, valuep)
      const char **strp;
      int opindex;
      int opinfo;
+     enum cgen_parse_operand_result *resultp;
      long *valuep;
 {
-  long value;
-  enum cgen_parse_operand_result result;
+  bfd_vma value;
+  enum cgen_parse_operand_result result_type;
   const char *errmsg;
 
   errmsg = (*cgen_parse_operand_fn) (CGEN_PARSE_OPERAND_ADDRESS, strp,
 				     opindex, opinfo,
-				     &result, &value);
+				     &result_type, &value);
   /* FIXME: Examine `result'.  */
   if (!errmsg)
     {
+      if (resultp != NULL)
+	*resultp = result_type;
       *valuep = value;
     }
   return errmsg;