* tic80-opc.c (tic80_predefined_symbols): Table of name/value
authorFred Fish <fnf@specifix.com>
Thu, 30 Jan 1997 21:16:46 +0000 (21:16 +0000)
committerFred Fish <fnf@specifix.com>
Thu, 30 Jan 1997 21:16:46 +0000 (21:16 +0000)
pairs for all predefined symbols recognized by the assembler.
Also used by the disassembling routines.
(tic80_symbol_to_value): New function.
(tic80_value_to_symbol): New function.
* tic80-dis.c (print_operand_control_register,
  print_operand_condition_code, print_operand_bitnum):
Remove private tables and use tic80_value_to_symbol function.

opcodes/ChangeLog
opcodes/tic80-dis.c
opcodes/tic80-opc.c

index 95e930de80e081d09e66328023c8327a84f73587..e48d40dc442df3eb7fe63076787817f781cac2c7 100644 (file)
@@ -1,3 +1,16 @@
+start-sanitize-tic80
+Thu Jan 30 14:09:03 1997  Fred Fish  <fnf@cygnus.com>
+
+       * tic80-opc.c (tic80_predefined_symbols): Table of name/value
+       pairs for all predefined symbols recognized by the assembler.
+       Also used by the disassembling routines.
+       (tic80_symbol_to_value): New function.
+       (tic80_value_to_symbol): New function.
+       * tic80-dis.c (print_operand_control_register,
+       print_operand_condition_code, print_operand_bitnum):
+       Remove private tables and use tic80_value_to_symbol function.
+
+end-sanitize-tic80
 start-sanitize-d10v
 Thu Jan 30 11:30:45 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
 
index e698437268dc56e78e8d2ab8ff58899fea5bb13a..24fb9309eb27189c206b189e79bb0d7a1aac04d6 100644 (file)
@@ -81,72 +81,9 @@ print_operand_control_register (info, value)
      struct disassemble_info *info;
      long value;
 {
-  char *tmp;
+  const char *tmp;
 
-  switch (value)
-    {
-    case 0:            tmp = "EPC";            break;
-    case 1:            tmp = "EIP";            break;
-    case 2:            tmp = "CONFIG";         break;
-    case 4:            tmp = "INTPEN";         break;
-    case 6:            tmp = "IE";             break;
-    case 8:            tmp = "FPST";           break;
-    case 0xA:          tmp = "PPERROR";        break;
-    case 0xD:          tmp = "PKTREQ";         break;
-    case 0xE:          tmp = "TCOUNT";         break;
-    case 0xF:          tmp = "TSCALE";         break;
-    case 0x10:         tmp = "FLTOP";          break;
-    case 0x11:         tmp = "FLTADR";         break;
-    case 0x12:         tmp = "FLTTAG";         break;
-    case 0x13:         tmp = "FLTDTL";         break;
-    case 0x14:         tmp = "FLTDTH";         break;
-    case 0x20:         tmp = "SYSSTK";         break;
-    case 0x21:         tmp = "SYSTMP";         break;
-    case 0x30:         tmp = "MPC";            break;
-    case 0x31:         tmp = "MIP";            break;
-    case 0x33:         tmp = "ECOMCNTL";       break;
-    case 0x34:         tmp = "ANASTAT";        break;
-    case 0x39:         tmp = "BRK1";           break;
-    case 0x3A:         tmp = "BRK2";           break;
-    case 0x200:                tmp = "ITAG0";          break;
-    case 0x201:                tmp = "ITAG1";          break;
-    case 0x202:                tmp = "ITAG2";          break;
-    case 0x203:                tmp = "ITAG3";          break;
-    case 0x204:                tmp = "ITAG4";          break;
-    case 0x205:                tmp = "ITAG5";          break;
-    case 0x206:                tmp = "ITAG6";          break;
-    case 0x207:                tmp = "ITAG7";          break;
-    case 0x208:                tmp = "ITAG8";          break;
-    case 0x209:                tmp = "ITAG9";          break;
-    case 0x20A:                tmp = "ITAG10";         break;
-    case 0x20B:                tmp = "ITAG11";         break;
-    case 0x20C:                tmp = "ITAG12";         break;
-    case 0x20D:                tmp = "ITAG13";         break;
-    case 0x20E:                tmp = "ITAG14";         break;
-    case 0x20F:                tmp = "ITAG15";         break;
-    case 0x300:                tmp = "ILRU";           break;
-    case 0x400:                tmp = "DTAG0";          break;
-    case 0x401:                tmp = "DTAG1";          break;
-    case 0x402:                tmp = "DTAG2";          break;
-    case 0x403:                tmp = "DTAG3";          break;
-    case 0x404:                tmp = "DTAG4";          break;
-    case 0x405:                tmp = "DTAG5";          break;
-    case 0x406:                tmp = "DTAG6";          break;
-    case 0x407:                tmp = "DTAG7";          break;
-    case 0x408:                tmp = "DTAG8";          break;
-    case 0x409:                tmp = "DTAG9";          break;
-    case 0x40A:                tmp = "DTAG10";         break;
-    case 0x40B:                tmp = "DTAG11";         break;
-    case 0x40C:                tmp = "DTAG12";         break;
-    case 0x40D:                tmp = "DTAG13";         break;
-    case 0x40E:                tmp = "DTAG14";         break;
-    case 0x40F:                tmp = "DTAG15";         break;
-    case 0x500:                tmp = "DLRU";           break;
-    case 0x4000:       tmp = "IN0P";           break;
-    case 0x4001:       tmp = "IN1P";           break;
-    case 0x4002:       tmp = "OUTP";           break;
-    default:           tmp = NULL;             break;
-    }
+  tmp = tic80_value_to_symbol (value, TIC80_OPERAND_CR);
   if (tmp != NULL)
     {
       (*info -> fprintf_func) (info -> stream, "%s", tmp);
@@ -163,20 +100,15 @@ print_operand_condition_code (info, value)
      struct disassemble_info *info;
      long value;
 {
-  const char *syms[] = {
-    "nev.b", "gt0.b", "eq0.b", "ge0.b", "lt0.b", "ne0.b", "le0.b", "alw.b",
-    "nev.h", "gt0.h", "eq0.h", "ge0.h", "lt0.h", "ne0.h", "le0.h", "alw.h",
-    "nev.w", "gt0.w", "eq0.w", "ge0.w", "lt0.w", "ne0.w", "le0.w", "alw.w"
-  };
+  const char *tmp;
 
-  if (value < (sizeof (syms) / sizeof (syms[0])))
+  tmp = tic80_value_to_symbol (value, TIC80_OPERAND_CC);
+  if (tmp != NULL)
     {
-      /* Found a value within range */
-      (*info -> fprintf_func) (info -> stream, "%s", syms[value]);
+      (*info -> fprintf_func) (info -> stream, "%s", tmp);
     }
   else
     {
-      /* Not in range, just print as decimal digit. */
       (*info -> fprintf_func) (info -> stream, "%ld", value);
     }
 }
@@ -188,23 +120,16 @@ print_operand_bitnum (info, value)
      long value;
 {
   int bitnum;
-  const char *syms[] = {
-    "eq.b", "ne.b", "gt.b", "le.b", "lt.b", "ge.b",
-    "hi.b", "ls.b", "lo.b", "hs.b", "eq.h", "ne.h",
-    "gt.h", "le.h", "lt.h", "ge.h", "hi.h", "ls.h",
-    "lo.h", "hs.h", "eq.w", "ne.w", "gt.w", "le.w",
-    "lt.w", "ge.w", "hi.w", "ls.w", "lo.w", "hs.w"
-  };
+  const char *tmp;
 
   bitnum = ~value & 0x1F;
-  if (bitnum < (sizeof (syms) / sizeof (syms[0])))
+  tmp = tic80_value_to_symbol (bitnum, TIC80_OPERAND_BITNUM);
+  if (tmp != NULL)
     {
-      /* Found a value within range */
-      (*info -> fprintf_func) (info -> stream, "%s", syms[bitnum]);
+      (*info -> fprintf_func) (info -> stream, "%s", tmp);
     }
   else
     {
-      /* Not in range, just print as bit number */
       (*info -> fprintf_func) (info -> stream, "%ld", bitnum);
     }
 }
index cf3f2e4b0eaa68b623c953939cd7b6062513affa..abc70eb6090c0249c23b0267e5b98c9be3247e70 100644 (file)
@@ -21,13 +21,255 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  *
 #include "ansidecl.h"
 #include "opcode/tic80.h"
 
-/* This file holds the TMS320C80 (MVP) opcode table.  The table is
-   strictly constant data, so the compiler should be able to put it in
-   the .text section.
+/* This file holds various tables for the TMS320C80 (MVP).
+
+   The opcode table is strictly constant data, so the compiler should
+   be able to put it in the .text section.
 
    This file also holds the operand table.  All knowledge about
    inserting operands into instructions and vice-versa is kept in this
-   file.  */
+   file.
+
+   The predefined register table maps from register names to register
+   values.  */
+
+\f
+/* Table of predefined symbol names, such as general purpose registers,
+   floating point registers, condition codes, control registers, and bit
+   numbers.
+
+   The table is sorted case independently by name so that it is suitable for
+   searching via a binary search using a case independent comparison
+   function.
+
+   Note that the type of the symbol is stored in the upper bits of the value
+   field, which allows the value and type to be passed around as a unit in a
+   single int.  The types have to be masked off before using the numeric
+   value as a number.
+*/
+
+const struct predefined_symbol tic80_predefined_symbols[] =
+{
+  { "a0",      TIC80_OPERAND_FPA | 0 },
+  { "a1",      TIC80_OPERAND_FPA | 1 },
+  { "alw.b",   TIC80_OPERAND_CC | 7 },
+  { "alw.h",   TIC80_OPERAND_CC | 15 },
+  { "alw.w",   TIC80_OPERAND_CC | 23 },
+  { "ANASTAT", TIC80_OPERAND_CR | 0x34 },
+  { "BRK1",    TIC80_OPERAND_CR | 0x39 },
+  { "BRK2",    TIC80_OPERAND_CR | 0x3A },
+  { "CONFIG",  TIC80_OPERAND_CR | 2 },
+  { "DLRU",    TIC80_OPERAND_CR | 0x500 },
+  { "DTAG0",   TIC80_OPERAND_CR | 0x400 },
+  { "DTAG1",   TIC80_OPERAND_CR | 0x401 },
+  { "DTAG10",  TIC80_OPERAND_CR | 0x40A },
+  { "DTAG11",  TIC80_OPERAND_CR | 0x40B },
+  { "DTAG12",  TIC80_OPERAND_CR | 0x40C },
+  { "DTAG13",  TIC80_OPERAND_CR | 0x40D },
+  { "DTAG14",  TIC80_OPERAND_CR | 0x40E },
+  { "DTAG15",  TIC80_OPERAND_CR | 0x40F },
+  { "DTAG2",   TIC80_OPERAND_CR | 0x402 },
+  { "DTAG3",   TIC80_OPERAND_CR | 0x403 },
+  { "DTAG4",   TIC80_OPERAND_CR | 0x404 },
+  { "DTAG5",   TIC80_OPERAND_CR | 0x405 },
+  { "DTAG6",   TIC80_OPERAND_CR | 0x406 },
+  { "DTAG7",   TIC80_OPERAND_CR | 0x407 },
+  { "DTAG8",   TIC80_OPERAND_CR | 0x408 },
+  { "DTAG9",   TIC80_OPERAND_CR | 0x409 },
+  { "ECOMCNTL",        TIC80_OPERAND_CR | 0x33 },
+  { "EIP",     TIC80_OPERAND_CR | 1 },
+  { "EPC",     TIC80_OPERAND_CR | 0 },
+  { "eq.b",    TIC80_OPERAND_BITNUM  | 0 },
+  { "eq.h",    TIC80_OPERAND_BITNUM  | 10 },
+  { "eq.w",    TIC80_OPERAND_BITNUM  | 20 },
+  { "eq0.b",   TIC80_OPERAND_CC | 2 },
+  { "eq0.h",   TIC80_OPERAND_CC | 10 },
+  { "eq0.w",   TIC80_OPERAND_CC | 18 },
+  { "FLTADR",  TIC80_OPERAND_CR | 0x11 },
+  { "FLTDTH",  TIC80_OPERAND_CR | 0x14 },
+  { "FLTDTL",  TIC80_OPERAND_CR | 0x13 },
+  { "FLTOP",   TIC80_OPERAND_CR | 0x10 },
+  { "FLTTAG",  TIC80_OPERAND_CR | 0x12 },
+  { "FPST",    TIC80_OPERAND_CR | 8 },
+  { "ge.b",    TIC80_OPERAND_BITNUM  | 5 },
+  { "ge.h",    TIC80_OPERAND_BITNUM  | 15 },
+  { "ge.w",    TIC80_OPERAND_BITNUM  | 25 },
+  { "ge0.b",   TIC80_OPERAND_CC | 3 },
+  { "ge0.h",   TIC80_OPERAND_CC | 11 },
+  { "ge0.w",   TIC80_OPERAND_CC | 19 },
+  { "gt.b",    TIC80_OPERAND_BITNUM  | 2 },
+  { "gt.h",    TIC80_OPERAND_BITNUM  | 12 },
+  { "gt.w",    TIC80_OPERAND_BITNUM  | 22 },
+  { "gt0.b",   TIC80_OPERAND_CC | 1 },
+  { "gt0.h",   TIC80_OPERAND_CC | 9 },
+  { "gt0.w",   TIC80_OPERAND_CC | 17 },
+  { "hi.b",    TIC80_OPERAND_BITNUM  | 6 },
+  { "hi.h",    TIC80_OPERAND_BITNUM  | 16 },
+  { "hi.w",    TIC80_OPERAND_BITNUM  | 26 },
+  { "hs.b",    TIC80_OPERAND_BITNUM  | 9 },
+  { "hs.h",    TIC80_OPERAND_BITNUM  | 19 },
+  { "hs.w",    TIC80_OPERAND_BITNUM  | 29 },
+  { "IE",      TIC80_OPERAND_CR | 6 },
+  { "ILRU",    TIC80_OPERAND_CR | 0x300 },
+  { "IN0P",    TIC80_OPERAND_CR | 0x4000 },
+  { "IN1P",    TIC80_OPERAND_CR | 0x4001 },
+  { "INTPEN",  TIC80_OPERAND_CR | 4 },
+  { "ITAG0",   TIC80_OPERAND_CR | 0x200 },
+  { "ITAG1",   TIC80_OPERAND_CR | 0x201 },
+  { "ITAG10",  TIC80_OPERAND_CR | 0x20A },
+  { "ITAG11",  TIC80_OPERAND_CR | 0x20B },
+  { "ITAG12",  TIC80_OPERAND_CR | 0x20C },
+  { "ITAG13",  TIC80_OPERAND_CR | 0x20D },
+  { "ITAG14",  TIC80_OPERAND_CR | 0x20E },
+  { "ITAG15",  TIC80_OPERAND_CR | 0x20F },
+  { "ITAG2",   TIC80_OPERAND_CR | 0x202 },
+  { "ITAG3",   TIC80_OPERAND_CR | 0x203 },
+  { "ITAG4",   TIC80_OPERAND_CR | 0x204 },
+  { "ITAG5",   TIC80_OPERAND_CR | 0x205 },
+  { "ITAG6",   TIC80_OPERAND_CR | 0x206 },
+  { "ITAG7",   TIC80_OPERAND_CR | 0x207 },
+  { "ITAG8",   TIC80_OPERAND_CR | 0x208 },
+  { "ITAG9",   TIC80_OPERAND_CR | 0x209 },
+  { "le.b",    TIC80_OPERAND_BITNUM  | 3 },
+  { "le.h",    TIC80_OPERAND_BITNUM  | 13 },
+  { "le.w",    TIC80_OPERAND_BITNUM  | 23 },
+  { "le0.b",   TIC80_OPERAND_CC | 6 },
+  { "le0.h",   TIC80_OPERAND_CC | 14 },
+  { "le0.w",   TIC80_OPERAND_CC | 22 },
+  { "lo.b",    TIC80_OPERAND_BITNUM  | 8 },
+  { "lo.h",    TIC80_OPERAND_BITNUM  | 18 },
+  { "lo.w",    TIC80_OPERAND_BITNUM  | 28 },
+  { "ls.b",    TIC80_OPERAND_BITNUM  | 7 },
+  { "ls.h",    TIC80_OPERAND_BITNUM  | 17 },
+  { "ls.w",    TIC80_OPERAND_BITNUM  | 27 },
+  { "lt.b",    TIC80_OPERAND_BITNUM  | 4 },
+  { "lt.h",    TIC80_OPERAND_BITNUM  | 14 },
+  { "lt.w",    TIC80_OPERAND_BITNUM  | 24 },
+  { "lt0.b",   TIC80_OPERAND_CC | 4 },
+  { "lt0.h",   TIC80_OPERAND_CC | 12 },
+  { "lt0.w",   TIC80_OPERAND_CC | 20 },
+  { "MIP",     TIC80_OPERAND_CR | 0x31 },
+  { "MPC",     TIC80_OPERAND_CR | 0x30 },
+  { "ne.b",    TIC80_OPERAND_BITNUM  | 1 },
+  { "ne.h",    TIC80_OPERAND_BITNUM  | 11 },
+  { "ne.w",    TIC80_OPERAND_BITNUM  | 21 },
+  { "ne0.b",   TIC80_OPERAND_CC | 5 },
+  { "ne0.h",   TIC80_OPERAND_CC | 13 },
+  { "ne0.w",   TIC80_OPERAND_CC | 21 },
+  { "nev.b",   TIC80_OPERAND_CC | 0 },
+  { "nev.h",   TIC80_OPERAND_CC | 8 },
+  { "nev.w",   TIC80_OPERAND_CC | 16 },
+  { "OUTP",    TIC80_OPERAND_CR | 0x4002 },
+  { "PKTREQ",  TIC80_OPERAND_CR | 0xD },
+  { "PPERROR", TIC80_OPERAND_CR | 0xA },
+  { "r0",      TIC80_OPERAND_GPR | 0 },
+  { "r1",      TIC80_OPERAND_GPR | 1 },
+  { "r10",     TIC80_OPERAND_GPR | 10 },
+  { "r11",     TIC80_OPERAND_GPR | 11 },
+  { "r12",     TIC80_OPERAND_GPR | 12 },
+  { "r13",     TIC80_OPERAND_GPR | 13 },
+  { "r14",     TIC80_OPERAND_GPR | 14 },
+  { "r15",     TIC80_OPERAND_GPR | 15 },
+  { "r16",     TIC80_OPERAND_GPR | 16 },
+  { "r17",     TIC80_OPERAND_GPR | 17 },
+  { "r18",     TIC80_OPERAND_GPR | 18 },
+  { "r19",     TIC80_OPERAND_GPR | 19 },
+  { "r2",      TIC80_OPERAND_GPR | 2 },
+  { "r20",     TIC80_OPERAND_GPR | 20 },
+  { "r21",     TIC80_OPERAND_GPR | 21 },
+  { "r22",     TIC80_OPERAND_GPR | 22 },
+  { "r23",     TIC80_OPERAND_GPR | 23 },
+  { "r24",     TIC80_OPERAND_GPR | 24 },
+  { "r24",     TIC80_OPERAND_GPR | 24 },
+  { "r26",     TIC80_OPERAND_GPR | 26 },
+  { "r27",     TIC80_OPERAND_GPR | 27 },
+  { "r28",     TIC80_OPERAND_GPR | 28 },
+  { "r29",     TIC80_OPERAND_GPR | 29 },
+  { "r3",      TIC80_OPERAND_GPR | 3 },
+  { "r30",     TIC80_OPERAND_GPR | 30 },
+  { "r31",     TIC80_OPERAND_GPR | 31 },
+  { "r4",      TIC80_OPERAND_GPR | 4 },
+  { "r5",      TIC80_OPERAND_GPR | 5 },
+  { "r6",      TIC80_OPERAND_GPR | 6 },
+  { "r7",      TIC80_OPERAND_GPR | 7 },
+  { "r8",      TIC80_OPERAND_GPR | 8 },
+  { "r9",      TIC80_OPERAND_GPR | 9 },
+  { "SYSSTK",  TIC80_OPERAND_CR | 0x20 },
+  { "SYSTMP",  TIC80_OPERAND_CR | 0x21 },
+  { "TCOUNT",  TIC80_OPERAND_CR | 0xE },
+  { "TSCALE",  TIC80_OPERAND_CR | 0xF },
+};
+
+const int tic80_num_predefined_symbols = sizeof (tic80_predefined_symbols) / sizeof (struct predefined_symbol);
+
+/* This function takes a predefined symbol name in NAME and translates
+   it to a numeric value, which it returns.  If no translation is
+   possible, it returns -1, a value not used by any predefined
+   symbol. Note that the predefined symbol array is presorted case
+   independently by name. */
+
+int
+tic80_symbol_to_value (name)
+     char *name;
+{
+  int low = 0;
+  int middle;
+  int high = tic80_num_predefined_symbols - 1;
+  int cmp;
+  int rtnval = -1;
+
+  while (low <= high)
+    {
+      middle = (low + high) / 2;
+      cmp = strcasecmp (name, tic80_predefined_symbols[middle].name);
+      if (cmp < 0)
+       {
+         high = middle - 1;
+       }
+      else if (cmp > 0)
+       {
+         low = middle + 1;
+       }
+      else 
+       {
+         rtnval = tic80_predefined_symbols[middle].value;
+         break;
+       }
+    }
+  return (rtnval);
+}
+
+/* This function takes a value VAL and finds a matching predefined
+   symbol that is in the operand class specified by CLASS.  If CLASS
+   is zero, the first matching symbol is returned. */
+
+const char *
+tic80_value_to_symbol (val, class)
+     int val;
+     int class;
+{
+  const struct predefined_symbol *pdsp;
+  int ival;
+  char *name;
+
+  name = NULL;
+  for (pdsp = tic80_predefined_symbols;
+       pdsp < tic80_predefined_symbols + tic80_num_predefined_symbols;
+       pdsp++)
+    {
+      ival = pdsp -> value & ~TIC80_OPERAND_MASK;
+      if (ival == val)
+       {
+         if ((class == 0) || (class & pdsp -> value))
+           {
+             /* Found the desired match */
+             name = pdsp -> name;
+             break;
+           }
+       }
+    }
+  return (name);
+}
 
 \f
 /* The operands table.  The fields are:
@@ -885,4 +1127,3 @@ const struct tic80_opcode tic80_opcodes[] = {
 };
 
 const int tic80_num_opcodes = sizeof (tic80_opcodes) / sizeof (tic80_opcodes[0]);
-