From 8fdffbc4b33c081fad2b32f831812a4955b5a9fe Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Sun, 19 Jan 1997 18:33:10 +0000
Subject: [PATCH]         * tic80-dis.c (print_insn_tic80): Broke excessively
 long         function up into several smaller ones and arranged for        
 the instruction printing function to be callable recursively         to print
 vector instructions that have both a load and a         math instruction
 packed into a single opcode.         * tic80-opc.c (tic80_opcodes): Expand
 comment for vld opcode         to explain why it comes after the other vector
 opcodes.

---
 opcodes/ChangeLog   |  12 +
 opcodes/tic80-dis.c | 654 +++++++++++++++++++++++++++-----------------
 opcodes/tic80-opc.c |   7 +-
 3 files changed, 419 insertions(+), 254 deletions(-)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 50e537ea760..c28545e20fc 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,15 @@
+start-sanitize-tic80
+Fri Jan 17 18:24:31 1997  Fred Fish  <fnf@cygnus.com>
+
+	* tic80-dis.c (print_insn_tic80): Broke excessively long
+	function up into several smaller ones and arranged for
+	the instruction printing function to be callable recursively
+	to print vector instructions that have both a load and a
+	math instruction packed into a single opcode.
+	* tic80-opc.c (tic80_opcodes): Expand comment for vld opcode
+	to explain why it comes after the other vector opcodes.
+	
+end-sanitize-tic80
 Fri Jan 17 16:19:15 1997  J.T. Conklin  <jtc@beauty.cygnus.com>
 
 	* m68k-opc.c (m68k_opcodes): add b, w, or l specifier to coldfire 
diff --git a/opcodes/tic80-dis.c b/opcodes/tic80-dis.c
index 02a4110f810..e698437268d 100644
--- a/opcodes/tic80-dis.c
+++ b/opcodes/tic80-dis.c
@@ -1,5 +1,5 @@
 /* Print TI TMS320C80 (MVP) instructions
-   Copyright 1996 Free Software Foundation, Inc.
+   Copyright 1996, 1997 Free Software Foundation, Inc.
 
 This file is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,302 +21,452 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "opcode/tic80.h"
 #include "dis-asm.h"
 
-#define M_SI(insn,op) ((((op) -> flags & TIC80_OPERAND_M_SI) != 0) && ((insn) & (1 << 17)))
-#define M_LI(insn,op) ((((op) -> flags & TIC80_OPERAND_M_LI) != 0) && ((insn) & (1 << 15)))
-#define R_SCALED(insn,op) ((((op) -> flags & TIC80_OPERAND_SCALED) != 0) && ((insn) & (1 << 11)))
+static int length;
 
-int 
-print_insn_tic80 (memaddr, info)
-     bfd_vma memaddr;
+static void print_operand_bitnum PARAMS ((struct disassemble_info *, long));
+static void print_operand_condition_code PARAMS ((struct disassemble_info *, long));
+static void print_operand_control_register PARAMS ((struct disassemble_info *, long));
+static void print_operand_float PARAMS ((struct disassemble_info *, long));
+static void print_operand_integer PARAMS ((struct disassemble_info *, long));
+static void print_operand PARAMS ((struct disassemble_info *, long, unsigned long,
+				   const struct tic80_operand *, bfd_vma));
+static int print_one_instruction PARAMS ((struct disassemble_info *, bfd_vma,
+				      unsigned long, const struct tic80_opcode *));
+static int print_instruction PARAMS ((struct disassemble_info *, bfd_vma, unsigned long,
+				      const struct tic80_opcode *));
+static int fill_instruction PARAMS ((struct disassemble_info *, bfd_vma,
+				     unsigned long *));
+
+
+/* Print an integer operand.  Try to be somewhat smart about the
+   format by assuming that small positive or negative integers are
+   probably loop increment values, structure offsets, or similar
+   values that are more meaningful printed as signed decimal values.
+   Larger numbers are probably better printed as hex values. */
+
+static void
+print_operand_integer (info, value)
      struct disassemble_info *info;
+     long value;
 {
-  bfd_byte buffer[4];
-  int status;
-  unsigned long insn[2];
-  const struct tic80_opcode *opcode;
-  const struct tic80_opcode *opcode_end;
-  const unsigned char *opindex;
-  const struct tic80_operand *operand;
-  int close_paren;
-  int length = 4;
+  if ((value > 9999 || value < -9999))
+    {
+      (*info -> fprintf_func) (info -> stream, "%#lx", value);
+    }
+  else
+    {
+      (*info -> fprintf_func) (info -> stream, "%ld", value);
+    }
+}
 
-  status = (*info->read_memory_func) (memaddr, buffer, 4, info);
-  if (status != 0)
+
+/* FIXME: depends upon sizeof (long) == sizeof (float) and
+   also upon host floating point format matching target
+   floating point format. */
+
+static void
+print_operand_float (info, value)
+     struct disassemble_info *info;
+     long value;
+{
+  union { float f; long l; } fval;
+
+  fval.l = value;
+  (*info -> fprintf_func) (info -> stream, "%g", fval.f);
+}
+
+
+static void
+print_operand_control_register (info, value)
+     struct disassemble_info *info;
+     long value;
+{
+  char *tmp;
+
+  switch (value)
     {
-      (*info->memory_error_func) (status, memaddr, info);
-      return -1;
+    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;
     }
+  if (tmp != NULL)
+    {
+      (*info -> fprintf_func) (info -> stream, "%s", tmp);
+    }
+  else
+    {
+      (*info -> fprintf_func) (info -> stream, "%#lx", value);
+    }
+}
 
-  if (info -> endian == BFD_ENDIAN_LITTLE)
+
+static void
+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"
+  };
+
+  if (value < (sizeof (syms) / sizeof (syms[0])))
     {
-      insn[0] = bfd_getl32 (buffer);
+      /* Found a value within range */
+      (*info -> fprintf_func) (info -> stream, "%s", syms[value]);
     }
-  else if (info -> endian == BFD_ENDIAN_BIG)
+  else
+    {
+      /* Not in range, just print as decimal digit. */
+      (*info -> fprintf_func) (info -> stream, "%ld", value);
+    }
+}
+
+
+static void
+print_operand_bitnum (info, value)
+     struct disassemble_info *info;
+     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"
+  };
+
+  bitnum = ~value & 0x1F;
+  if (bitnum < (sizeof (syms) / sizeof (syms[0])))
     {
-      insn[0] = bfd_getb32 (buffer);
+      /* Found a value within range */
+      (*info -> fprintf_func) (info -> stream, "%s", syms[bitnum]);
     }
   else
     {
-      /* FIXME: Should probably just default to one or the other */
-      abort ();
+      /* Not in range, just print as bit number */
+      (*info -> fprintf_func) (info -> stream, "%ld", bitnum);
     }
+}
 
-  /* Find the first opcode match in the opcodes table.  FIXME: there should
-     be faster ways to find one (hash table or binary search), but don't
-     worry too much about it until other TIc80 support is finished. */
+
+/* Print the operand as directed by the flags.  */
 
-  opcode_end = tic80_opcodes + tic80_num_opcodes;
-  for (opcode = tic80_opcodes; opcode < opcode_end; opcode++)
+#define M_SI(insn,op) ((((op) -> flags & TIC80_OPERAND_M_SI) != 0) && ((insn) & (1 << 17)))
+#define M_LI(insn,op) ((((op) -> flags & TIC80_OPERAND_M_LI) != 0) && ((insn) & (1 << 15)))
+#define R_SCALED(insn,op) ((((op) -> flags & TIC80_OPERAND_SCALED) != 0) && ((insn) & (1 << 11)))
+
+static void
+print_operand (info, value, insn, operand, memaddr)
+     struct disassemble_info *info;
+     long value;
+     unsigned long insn;
+     const struct tic80_operand *operand;
+     bfd_vma memaddr;
+{
+  if ((operand -> flags & TIC80_OPERAND_GPR) != 0)
     {
-      if ((insn[0] & opcode -> mask) == opcode -> opcode)
+      (*info -> fprintf_func) (info -> stream, "r%ld", value);
+      if (M_SI (insn, operand) || M_LI (insn, operand))
 	{
-	  break;
+	  (*info -> fprintf_func) (info -> stream, ":m");
 	}
     }
-
-  if (opcode == opcode_end)
+  else if ((operand -> flags & TIC80_OPERAND_FPA) != 0)
     {
-      /* No match found, just print the bits as a .word directive */
-      (*info -> fprintf_func) (info -> stream, ".word %#08lx", insn[0]);
+      (*info -> fprintf_func) (info -> stream, "a%ld", value);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_PCREL) != 0)
+    {
+      (*info -> print_address_func) (memaddr + 4 * value, info);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_BASEREL) != 0)
+    {
+      (*info -> print_address_func) (value, info);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_BITNUM) != 0)
+    {
+      print_operand_bitnum (info, value);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_CC) != 0)
+    {
+      print_operand_condition_code (info, value);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_CR) != 0)
+    {
+      print_operand_control_register (info, value);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_FLOAT) != 0)
+    {
+      print_operand_float (info, value);
+    }
+  else if ((operand -> flags & TIC80_OPERAND_BITFIELD))
+    {
+      (*info -> fprintf_func) (info -> stream, "%#lx", value);
     }
   else
     {
-      /* Match found, decode the instruction.  */
-      (*info -> fprintf_func) (info -> stream, "%s", opcode -> name);
+      print_operand_integer (info, value);
+    }
+
+  /* If this is a scaled operand, then print the modifier */
+
+  if (R_SCALED (insn, operand))
+    {
+      (*info -> fprintf_func) (info -> stream, ":s");
+    }
+}
+
+
+/* We have chosen an opcode table entry */
+
+static int
+print_one_instruction (info, memaddr, insn, opcode)
+     struct disassemble_info *info;
+     bfd_vma memaddr;
+     unsigned long insn;
+     const struct tic80_opcode *opcode;
+{
+  const struct tic80_operand *operand;
+  long value;
+  int status;
+  const unsigned char *opindex;
+  bfd_byte buffer[4];
+  int close_paren;
+
+  (*info -> fprintf_func) (info -> stream, "%-10s", opcode -> name);
 
-      /* Now extract and print the operands. */
-      if (opcode -> operands[0] != 0)
+  for (opindex = opcode -> operands; *opindex != 0; opindex++)
+    {
+      operand = tic80_operands + *opindex;
+
+      /* Extract the value from the instruction.  */
+      if (operand -> extract)
 	{
-	  (*info -> fprintf_func) (info -> stream, "\t");
+	  value = (*operand -> extract) (insn, (int *) NULL);
 	}
-      for (opindex = opcode -> operands; *opindex != 0; opindex++)
+      else if (operand -> bits == 32)
 	{
-	  long value;
-
-	  operand = tic80_operands + *opindex;
-
-	  /* Extract the value from the instruction.  */
-	  if (operand -> extract)
+	  status = fill_instruction (info, memaddr, (unsigned long *) &value);
+	  if (status == -1)
 	    {
-	      value = (*operand -> extract) (insn[0], (int *) NULL);
+	      return (status);
 	    }
-	  else if (operand -> bits == 32)
-	    {
-	      status = (*info->read_memory_func) (memaddr + 4, buffer, 4, info);
-	      if (status != 0)
-		{
-		  (*info->memory_error_func) (status, memaddr, info);
-		  return -1;
-		}
-
-	      if (info -> endian == BFD_ENDIAN_LITTLE)
-		{
-		  insn[1] = bfd_getl32 (buffer);
-		}
-	      else if (info -> endian == BFD_ENDIAN_BIG)
-		{
-		  insn[1] = bfd_getb32 (buffer);
-		}
-	      value = (long) insn[1];
-	      length += 4;
-	    }
-	  else
+	}
+      else
+	{
+	  value = (insn >> operand -> shift) & ((1 << operand -> bits) - 1);
+	  if ((operand -> flags & TIC80_OPERAND_SIGNED) != 0
+	      && (value & (1 << (operand -> bits - 1))) != 0)
 	    {
-	      value = (insn[0] >> operand -> shift) & ((1 << operand -> bits) - 1);
-	      if ((operand -> flags & TIC80_OPERAND_SIGNED) != 0
-		  && (value & (1 << (operand -> bits - 1))) != 0)
-		value -= 1 << operand -> bits;
+	      value -= 1 << operand -> bits;
 	    }
+	}
 
-	  /* If this operand is enclosed in parenthesis, then print
-	     the open paren, otherwise just print the regular comma
-	     separator, except for the first operand. */
+      /* If this operand is enclosed in parenthesis, then print
+	 the open paren, otherwise just print the regular comma
+	 separator, except for the first operand. */
 
-	  if ((operand -> flags & TIC80_OPERAND_PARENS) == 0)
-	    {
-	      close_paren = 0;
-	      if (opindex != opcode -> operands)
-		{
-		  (*info -> fprintf_func) (info -> stream, ",");
-		}
-	    }
-	  else
+      if ((operand -> flags & TIC80_OPERAND_PARENS) == 0)
+	{
+	  close_paren = 0;
+	  if (opindex != opcode -> operands)
 	    {
-	      close_paren = 1;
-	      (*info -> fprintf_func) (info -> stream, "(");
+	      (*info -> fprintf_func) (info -> stream, ",");
 	    }
+	}
+      else
+	{
+	  close_paren = 1;
+	  (*info -> fprintf_func) (info -> stream, "(");
+	}
 
-	  /* Print the operand as directed by the flags.  */
+      print_operand (info, value, insn, operand, memaddr);
 
-	  if ((operand -> flags & TIC80_OPERAND_GPR) != 0)
-	    {
-	      (*info -> fprintf_func) (info -> stream, "r%ld", value);
-	      if (M_SI (insn[0], operand) || M_LI (insn[0], operand))
-		{
-		  (*info -> fprintf_func) (info -> stream, ":m");
-		}
-	    }
-	  else if ((operand -> flags & TIC80_OPERAND_FPA) != 0)
-	    {
-	      (*info -> fprintf_func) (info -> stream, "a%ld", value);
-	    }
-	  else if ((operand -> flags & TIC80_OPERAND_RELATIVE) != 0)
-	    {
-	      (*info -> print_address_func) (memaddr + 4 * value, info);
-	    }
-	  else if ((operand -> flags & TIC80_OPERAND_BITNUM) != 0)
-	    {
-	      char *syms[30] = {
-		"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"
-	      };
-	      int bitnum = ~value & 0x1F;
-
-	      if (bitnum < 30)
-		{
-		  /* Found a value within range */
-		  (*info -> fprintf_func) (info -> stream, "%s", syms[bitnum]);
-		}
-	      else
-		{
-		  /* Not in range, just print as bit number */
-		  (*info -> fprintf_func) (info -> stream, "%ld", bitnum);
-		}
-	    }
-	  else if ((operand -> flags & TIC80_OPERAND_CC) != 0)
-	    {
-	      char *syms[24] = {
-		"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"
-	      };
-	      if (value < 24)
-		{
-		  /* Found a value within range */
-		  (*info -> fprintf_func) (info -> stream, "%s", syms[value]);
-		}
-	      else
-		{
-		  /* Not in range, just print as decimal digit. */
-		  (*info -> fprintf_func) (info -> stream, "%ld", value);
-		}
-	    }
-	  else if ((operand -> flags & TIC80_OPERAND_CR) != 0)
-	    {
-	      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;
-		}
-	      if (tmp != NULL)
-		{
-		  (*info -> fprintf_func) (info -> stream, "%s", tmp);
-		}
-	      else
-		{
-		  (*info -> fprintf_func) (info -> stream, "%#lx", value);
-		}
-	    }
-	  else if ((operand -> flags & TIC80_OPERAND_FLOAT) != 0)
-	    {
-	      /* FIXME: depends upon sizeof (long) == sizeof (float) */
-	      union { float f; long l; } fval;
+      /* If we printed an open paren before printing this operand, close
+	 it now. The flag gets reset on each loop. */
 
-	      fval.l = value;
-	      (*info -> fprintf_func) (info -> stream, "%g", fval.f);
-	    }
-	  else
-	    {
-	      if ((value > 999 || value < -999)
-		  || operand -> flags & TIC80_OPERAND_BITFIELD)
-		{
-		  (*info -> fprintf_func) (info -> stream, "%#lx", value);
-		}
-	      else
-		{
-		  (*info -> fprintf_func) (info -> stream, "%ld", value);
-		}
-	    }
+      if (close_paren)
+	{
+	  (*info -> fprintf_func) (info -> stream, ")");
+	}
+    }
+  return (length);
+}
 
-	  /* If this is a scaled operand, then print the modifier */
+
 
-	  if (R_SCALED (insn[0], operand))
-	    {
-	      (*info -> fprintf_func) (info -> stream, ":s");
-	    }
+/* There are no specific bits that tell us for certain whether a vector
+   instruction opcode contains one or two instructions.  However since
+   a destination register of r0 is illegal, we can check for nonzero
+   values in both destination register fields.  Only opcodes that have
+   two valid instructions will have non-zero in both */
 
-	  /* If we printed an open paren before printing this operand, close
-	     it now. The flag gets reset on each loop. */
+#define TWO_INSN(insn) ((((insn) & (0x1F << 27)) != 0) && (((insn) & (0x1F << 22)) != 0))
 
-	  if (close_paren)
-	    {
-	      (*info -> fprintf_func) (info -> stream, ")");
-	    }
+static int
+print_instruction (info, memaddr, insn, vec_opcode)
+     struct disassemble_info *info;
+     bfd_vma memaddr;
+     unsigned long insn;
+     const struct tic80_opcode *vec_opcode;
+{
+  const struct tic80_opcode *opcode;
+  const struct tic80_opcode *opcode_end;
+
+  /* Find the first opcode match in the opcodes table.  For vector
+     opcodes (vec_opcode != NULL) find the first match that is not the
+     previously found match.  FIXME: there should be faster ways to
+     search (hash table or binary search), but don't worry too much
+     about it until other TIc80 support is finished. */
+
+  opcode_end = tic80_opcodes + tic80_num_opcodes;
+  for (opcode = tic80_opcodes; opcode < opcode_end; opcode++)
+    {
+      if ((insn & opcode -> mask) == opcode -> opcode &&
+	  opcode != vec_opcode)
+	{
+	  break;
 	}
     }
 
+  if (opcode == opcode_end)
+    {
+      /* No match found, just print the bits as a .word directive */
+      (*info -> fprintf_func) (info -> stream, ".word %#08lx", insn);
+    }
+  else
+    {
+      /* Match found, decode the instruction.  */
+      length = print_one_instruction (info, memaddr, insn, opcode);
+      if (opcode -> flags & TIC80_VECTOR && vec_opcode == NULL && TWO_INSN (insn))
+	{
+	  /* There is another instruction to print from the same opcode.
+	     Print the separator and then find and print the other
+	     instruction. */
+	  (*info -> fprintf_func) (info -> stream, "   ||   ");
+	  length = print_instruction (info, memaddr, insn, opcode);
+	}
+    }
   return (length);
 }
+
+/* Get the next 32 bit word from the instruction stream and convert it
+   into internal format in the unsigned long INSN, for which we are
+   passed the address.  Return 0 on success, -1 on error. */
+
+static int
+fill_instruction (info, memaddr, insnp)
+     struct disassemble_info *info;
+     bfd_vma memaddr;
+     unsigned long *insnp;
+{
+  bfd_byte buffer[4];
+  int status;
+
+  /* Get the bits for the next 32 bit word and put in buffer */
+
+  status = (*info -> read_memory_func) (memaddr + length, buffer, 4, info);
+  if (status != 0)
+    {
+      (*info -> memory_error_func) (status, memaddr, info);
+      return (-1);
+    }
+
+  /* Read was successful, so increment count of bytes read and convert
+     the bits into internal format. */
+     
+  length += 4;
+  if (info -> endian == BFD_ENDIAN_LITTLE)
+    {
+      *insnp = bfd_getl32 (buffer);
+    }
+  else if (info -> endian == BFD_ENDIAN_BIG)
+    {
+      *insnp = bfd_getb32 (buffer);
+    }
+  else
+    {
+      /* FIXME: Should probably just default to one or the other */
+      abort ();
+    }
+  return (0);
+}
+
+
+int 
+print_insn_tic80 (memaddr, info)
+     bfd_vma memaddr;
+     struct disassemble_info *info;
+{
+  unsigned long insn;
+  int status;
+
+  length = 0;
+  status = fill_instruction (info, memaddr, &insn);
+  if (status != -1)
+    {
+      status = print_instruction (info, memaddr, insn, NULL);
+    }
+  return (status);
+}
diff --git a/opcodes/tic80-opc.c b/opcodes/tic80-opc.c
index 6e2e2604765..bf8dc4f68cc 100644
--- a/opcodes/tic80-opc.c
+++ b/opcodes/tic80-opc.c
@@ -831,14 +831,17 @@ const struct tic80_opcode tic80_opcodes[] = {
   {"vadd.ss",	OP_LI(0x3C1) | P2(0) | P1(0),	MASK_LI | V_a(1) | P2(1) | P1(1),	TIC80_VECTOR,	{SPFI, REG_22, REG_22}	},
   {"vadd.sd",	OP_LI(0x3C1) | P2(1) | P1(0),	MASK_LI | V_a(1) | P2(1) | P1(1),	TIC80_VECTOR,	{SPFI, REG_22, REG_22}	},
 
-  /* Vector Load Data Into Register */
+  /* Vector Floating-Point Multiply and Add to Accumulator */
+
+  /* Vector Load Data Into Register - Note that this comes after all the other
+   vector instructions so that the disassembler will always print the load instruction
+   second for vector instructions that have two instructions in the same opcode. */
 
   {"vld0.s",	OP_V(0x1E) | V_m(1) | V_S(0) | V_p(0),	MASK_V | V_m(1) | V_S(1) | V_p(1),	TIC80_VECTOR, {REG_DEST} },
   {"vld1.s",	OP_V(0x1E) | V_m(1) | V_S(0) | V_p(1),	MASK_V | V_m(1) | V_S(1) | V_p(1),	TIC80_VECTOR, {REG_DEST} },
   {"vld0.d",	OP_V(0x1E) | V_m(1) | V_S(1) | V_p(0),	MASK_V | V_m(1) | V_S(1) | V_p(1),	TIC80_VECTOR, {REG_DEST} },
   {"vld1.d",	OP_V(0x1E) | V_m(1) | V_S(1) | V_p(1),	MASK_V | V_m(1) | V_S(1) | V_p(1),	TIC80_VECTOR, {REG_DEST} },
 
-
   {"xnor",	OP_LI(0x333),	MASK_LI,	0,		FIXME},
   {"xnor",	OP_REG(0x332),	MASK_REG,	0,		FIXME},
   {"xnor",	OP_SI(0x19),	MASK_SI,	0,		FIXME},
-- 
2.30.2