Help stupid cvs fixing basic conflicts.

1 files changed, 231 insertions, 65 deletions

diff --git a/gnu/usr.bin/binutils/opcodes/m68k-dis.c b/gnu/usr.bin/binutils/opcodes/m68k-dis.c
index a0ecf2c5654..10c461dae59 100644
--- a/gnu/usr.bin/binutils/opcodes/m68k-dis.c
+++ b/gnu/usr.bin/binutils/opcodes/m68k-dis.c
@@ -1,5 +1,6 @@
 /* Print Motorola 68k instructions.
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1986, 87, 89, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   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
@@ -15,14 +16,23 @@ 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 "dis-asm.h"
 #include "floatformat.h"
+#include <libiberty.h>
+#include "opintl.h"
 
 #include "opcode/m68k.h"
 
 /* Local function prototypes */
 
 static int
+fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+
+static void
+dummy_print_address PARAMS ((bfd_vma, struct disassemble_info *));
+
+static int
 fetch_arg PARAMS ((unsigned char *, int, int, disassemble_info *));
 
 static void
@@ -61,35 +71,30 @@ static char *const reg_names[] = {
    COERCE16 ((p[-2] << 8) + p[-1]))
 
 /* Get a 4 byte signed integer.  */
-#define COERCE32(x) ((int) (((x) ^ 0x80000000) - 0x80000000))
+#define COERCE32(x) ((bfd_signed_vma) ((x) ^ 0x80000000) - 0x80000000)
 #define NEXTLONG(p)  \
   (p += 4, FETCH_DATA (info, p), \
    (COERCE32 ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1])))
 
-/* NEXTSINGLE and NEXTDOUBLE handle alignment problems, but not
- * byte-swapping or other float format differences.  FIXME! */
-
-union number {
-    double d;
-    float f;
-    char c[10];
-};
+/* Get a 4 byte unsigned integer.  */
+#define NEXTULONG(p)  \
+  (p += 4, FETCH_DATA (info, p), \
+   (unsigned int) ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]))
 
+/* Get a single precision float.  */
 #define NEXTSINGLE(val, p) \
-  { unsigned int i; union number u;\
-    FETCH_DATA (info, p + sizeof (float));\
-    for (i = 0; i < sizeof(float); i++) u.c[i] = *p++; \
-    val = u.f; }
+  (p += 4, FETCH_DATA (info, p), \
+   floatformat_to_double (&floatformat_ieee_single_big, (char *) p - 4, &val))
 
+/* Get a double precision float.  */
 #define NEXTDOUBLE(val, p) \
-  { unsigned int i; union number u;\
-    FETCH_DATA (info, p + sizeof (double));\
-    for (i = 0; i < sizeof(double); i++) u.c[i] = *p++; \
-    val = u.d; }
+  (p += 8, FETCH_DATA (info, p), \
+   floatformat_to_double (&floatformat_ieee_double_big, (char *) p - 8, &val))
 
-/* Need a function to convert from extended to double precision... */
-#define NEXTEXTEND(p) \
-  (p += 12, FETCH_DATA (info, p), 0.0)
+/* Get an extended precision float.  */
+#define NEXTEXTEND(val, p) \
+  (p += 12, FETCH_DATA (info, p), \
+   floatformat_to_double (&floatformat_m68881_ext, (char *) p - 12, &val))
 
 /* Need a function to convert from packed to double
    precision.   Actually, it's easier to print a
@@ -152,7 +157,7 @@ dummy_printer (file) FILE *file;
 #endif
  { return 0; }
 
-void
+static void
 dummy_print_address (vma, info)
      bfd_vma vma;
      struct disassemble_info *info;
@@ -173,24 +178,92 @@ print_insn_m68k (memaddr, info)
   register const char *d;
   register unsigned long bestmask;
   const struct m68k_opcode *best = 0;
+  unsigned int arch_mask;
   struct private priv;
   bfd_byte *buffer = priv.the_buffer;
   fprintf_ftype save_printer = info->fprintf_func;
   void (*save_print_address) PARAMS((bfd_vma, struct disassemble_info*))
     = info->print_address_func;
+  int major_opcode;
+  static int numopcodes[16];
+  static const struct m68k_opcode **opcodes[16];
+
+  if (!opcodes[0])
+    {
+      /* Speed up the matching by sorting the opcode table on the upper
+	 four bits of the opcode.  */
+      const struct m68k_opcode **opc_pointer[16];
+
+      /* First count how many opcodes are in each of the sixteen buckets.  */
+      for (i = 0; i < m68k_numopcodes; i++)
+	numopcodes[(m68k_opcodes[i].opcode >> 28) & 15]++;
+
+      /* Then create a sorted table of pointers that point into the
+	 unsorted table.  */
+      opc_pointer[0] = ((const struct m68k_opcode **)
+			xmalloc (sizeof (struct m68k_opcode *)
+				 * m68k_numopcodes));
+      opcodes[0] = opc_pointer[0];
+      for (i = 1; i < 16; i++)
+	{
+	  opc_pointer[i] = opc_pointer[i - 1] + numopcodes[i - 1];
+	  opcodes[i] = opc_pointer[i];
+	}
+
+      for (i = 0; i < m68k_numopcodes; i++)
+	*opc_pointer[(m68k_opcodes[i].opcode >> 28) & 15]++ = &m68k_opcodes[i];
+
+    }
 
   info->private_data = (PTR) &priv;
+  /* Tell objdump to use two bytes per chunk and six bytes per line for
+     displaying raw data.  */
+  info->bytes_per_chunk = 2;
+  info->bytes_per_line = 6;
+  info->display_endian = BFD_ENDIAN_BIG;
   priv.max_fetched = priv.the_buffer;
   priv.insn_start = memaddr;
   if (setjmp (priv.bailout) != 0)
     /* Error return.  */
     return -1;
 
+  switch (info->mach)
+    {
+    default:
+    case 0:
+      arch_mask = (unsigned int) -1;
+      break;
+    case bfd_mach_m68000:
+      arch_mask = m68000;
+      break;
+    case bfd_mach_m68008:
+      arch_mask = m68008;
+      break;
+    case bfd_mach_m68010:
+      arch_mask = m68010;
+      break;
+    case bfd_mach_m68020:
+      arch_mask = m68020;
+      break;
+    case bfd_mach_m68030:
+      arch_mask = m68030;
+      break;
+    case bfd_mach_m68040:
+      arch_mask = m68040;
+      break;
+    case bfd_mach_m68060:
+      arch_mask = m68060;
+      break;
+    }
+
+  arch_mask |= m68881 | m68851;
+
   bestmask = 0;
   FETCH_DATA (info, buffer + 2);
-  for (i = 0; i < m68k_numopcodes; i++)
+  major_opcode = (buffer[0] >> 4) & 15;
+  for (i = 0; i < numopcodes[major_opcode]; i++)
     {
-      const struct m68k_opcode *opc = &m68k_opcodes[i];
+      const struct m68k_opcode *opc = opcodes[major_opcode][i];
       unsigned long opcode = opc->opcode;
       unsigned long match = opc->match;
 
@@ -202,7 +275,8 @@ print_insn_m68k (memaddr, info)
 	      (FETCH_DATA (info, buffer + 4)
 	       && ((0xff & buffer[2] & (match >> 8)) == (0xff & (opcode >> 8)))
 	       && ((0xff & buffer[3] & match) == (0xff & opcode)))
-	      ))
+	      )
+	  && (opc->arch & arch_mask) != 0)
 	{
 	  /* Don't use for printout the variants of divul and divsl
 	     that have the same register number in two places.
@@ -290,12 +364,29 @@ print_insn_m68k (memaddr, info)
 	  break;
 	}
     }
-  /* Some opcodes like pflusha and lpstop are exceptions; they take no
-     arguments but are two words long.  Recognize them by looking at
-     the lower 16 bits of the mask.  */
+
+  /* pflusha is an exceptions.  It takes no arguments but is two words
+     long.  Recognize it by looking at the lower 16 bits of the mask.  */
   if (p - buffer < 4 && (best->match & 0xFFFF) != 0)
     p = buffer + 4;
-  
+
+  /* lpstop is another exception.  It takes a one word argument but is
+     three words long.  */
+  if (p - buffer < 6
+      && (best->match & 0xffff) == 0xffff
+      && best->args[0] == '#'
+      && best->args[1] == 'w')
+    {
+      /* Copy the one word argument into the usual location for a one
+	 word argument, to simplify printing it.  We can get away with
+	 this because we know exactly what the second word is, and we
+	 aren't going to print anything based on it.  */
+      p = buffer + 6;
+      FETCH_DATA (info, p);
+      buffer[2] = buffer[4];
+      buffer[3] = buffer[5];
+    }
+
   FETCH_DATA (info, p);
   
   d = best->args;
@@ -308,7 +399,7 @@ print_insn_m68k (memaddr, info)
   info->fprintf_func = (fprintf_ftype)dummy_printer;
   for ( ; *d; d += 2)
     {
-      int eaten = print_insn_arg (d, buffer, p, memaddr + p - buffer, info);
+      int eaten = print_insn_arg (d, buffer, p, memaddr + (p - buffer), info);
       if (eaten >= 0)
 	p += eaten;
       else if (eaten == -1)
@@ -316,7 +407,8 @@ print_insn_m68k (memaddr, info)
       else
 	{
 	  (*info->fprintf_func)(info->stream,
-				"<internal error in opcode table: %s %s>\n",
+				/* xgettext:c-format */
+				_("<internal error in opcode table: %s %s>\n"),
 				best->name,
 				best->args);
 	  goto invalid;
@@ -336,7 +428,7 @@ print_insn_m68k (memaddr, info)
 
   while (*d)
     {
-      p += print_insn_arg (d, buffer, p, memaddr + p - buffer, info);
+      p += print_insn_arg (d, buffer, p, memaddr + (p - buffer), info);
       d += 2;
       if (*d && *(d - 2) != 'I' && *d != 'k')
 	(*info->fprintf_func) (info->stream, ",");
@@ -372,6 +464,8 @@ print_insn_arg (d, buffer, p0, addr, info)
   register unsigned char *p1;
   double flval;
   int flt_p;
+  bfd_signed_vma disp;
+  unsigned int uval;
 
   switch (*d)
     {
@@ -394,8 +488,8 @@ print_insn_arg (d, buffer, p0, addr, info)
 
     case '_':		/* 32-bit absolute address for move16. */
       {
-        val = NEXTLONG (p);
-	(*info->print_address_func) (val, info);
+        uval = NEXTULONG (p);
+	(*info->print_address_func) (uval, info);
         break;
       }
 
@@ -411,6 +505,18 @@ print_insn_arg (d, buffer, p0, addr, info)
       (*info->fprintf_func) (info->stream, "%%usp");
       break;
 
+    case 'E':
+      (*info->fprintf_func) (info->stream, "%%acc");
+      break;
+
+    case 'G':
+      (*info->fprintf_func) (info->stream, "%%macsr");
+      break;
+
+    case 'H':
+      (*info->fprintf_func) (info->stream, "%%mask");
+      break;
+
     case 'J':
       {
 	static const struct { char *name; int value; } names[]
@@ -418,7 +524,7 @@ print_insn_arg (d, buffer, p0, addr, info)
 	     {"%tc",  0x003}, {"%itt0",0x004}, {"%itt1", 0x005},
              {"%dtt0",0x006}, {"%dtt1",0x007}, {"%buscr",0x008},
 	     {"%usp", 0x800}, {"%vbr", 0x801}, {"%caar", 0x802},
-	     {"%msp", 0x803}, {"%ibsp", 0x804},
+	     {"%msp", 0x803}, {"%isp", 0x804},
 
 	     /* Should we be calling this psr like we do in case 'Y'?  */
 	     {"%mmusr",0x805},
@@ -446,10 +552,19 @@ print_insn_arg (d, buffer, p0, addr, info)
       break;
 
     case 'M':
-      val = fetch_arg (buffer, place, 8, info);
-      if (val & 0x80)
-	val = val - 0x100;
-      (*info->fprintf_func) (info->stream, "#%d", val);
+      if (place == 'h')
+	{
+	  static char *const scalefactor_name[] = { "<<", ">>" };
+	  val = fetch_arg (buffer, place, 1, info);
+	  (*info->fprintf_func) (info->stream, scalefactor_name[val]);
+	}
+      else
+	{
+	  val = fetch_arg (buffer, place, 8, info);
+	  if (val & 0x80)
+	    val = val - 0x100;
+	  (*info->fprintf_func) (info->stream, "#%d", val);
+	}
       break;
 
     case 'T':
@@ -548,39 +663,39 @@ print_insn_arg (d, buffer, p0, addr, info)
 
     case 'B':
       if (place == 'b')
-	val = NEXTBYTE (p);
+	disp = NEXTBYTE (p);
       else if (place == 'B')
-	val = COERCE_SIGNED_CHAR(buffer[1]);
+	disp = COERCE_SIGNED_CHAR(buffer[1]);
       else if (place == 'w' || place == 'W')
-	val = NEXTWORD (p);
+	disp = NEXTWORD (p);
       else if (place == 'l' || place == 'L' || place == 'C')
-	val = NEXTLONG (p);
+	disp = NEXTLONG (p);
       else if (place == 'g')
 	{
-	  val = NEXTBYTE (buffer);
-	  if (val == 0)
-	    val = NEXTWORD (p);
-	  else if (val == -1)
-	    val = NEXTLONG (p);
+	  disp = NEXTBYTE (buffer);
+	  if (disp == 0)
+	    disp = NEXTWORD (p);
+	  else if (disp == -1)
+	    disp = NEXTLONG (p);
 	}
       else if (place == 'c')
 	{
 	  if (buffer[1] & 0x40)		/* If bit six is one, long offset */
-	    val = NEXTLONG (p);
+	    disp = NEXTLONG (p);
 	  else
-	    val = NEXTWORD (p);
+	    disp = NEXTWORD (p);
 	}
       else
 	return -2;
 
-      (*info->print_address_func) (addr + val, info);
+      (*info->print_address_func) (addr + disp, info);
       break;
 
     case 'd':
       val = NEXTWORD (p);
       (*info->fprintf_func)
 	(info->stream, "%s@(%d)",
-	 reg_names[fetch_arg (buffer, place, 3, info)], val);
+	 reg_names[fetch_arg (buffer, place, 3, info) + 8], val);
       break;
 
     case 's':
@@ -606,8 +721,15 @@ print_insn_arg (d, buffer, p0, addr, info)
     case '?':
     case '/':
     case '&':
-    case '`':
     case '|':
+    case '<':
+    case '>':
+    case 'm':
+    case 'n':
+    case 'o':
+    case 'p':
+    case 'q':
+    case 'v':
 
       if (place == 'd')
 	{
@@ -660,13 +782,15 @@ print_insn_arg (d, buffer, p0, addr, info)
 	      break;
 
 	    case 1:
-	      val = NEXTLONG (p);
-	      (*info->print_address_func) (val, info);
+	      uval = NEXTULONG (p);
+	      (*info->print_address_func) (uval, info);
 	      break;
 
 	    case 2:
 	      val = NEXTWORD (p);
+	      (*info->fprintf_func) (info->stream, "%%pc@(");
 	      (*info->print_address_func) (addr + val, info);
+	      (*info->fprintf_func) (info->stream, ")");
 	      break;
 
 	    case 3:
@@ -701,10 +825,7 @@ print_insn_arg (d, buffer, p0, addr, info)
 		  break;
 
 		case 'x':
-		  FETCH_DATA (info, p + 12);
-		  floatformat_to_double (&floatformat_m68881_ext,
-					 (char *) p, &flval);
-		  p += 12;
+		  NEXTEXTEND(flval, p);
 		  break;
 
 		case 'p':
@@ -864,7 +985,8 @@ print_insn_arg (d, buffer, p0, addr, info)
 	else if (fc == 0)
 	  (*info->fprintf_func) (info->stream, "%%sfc");
 	else
-	  (*info->fprintf_func) (info->stream, "<function code %d>", fc);
+	  /* xgettext:c-format */
+	  (*info->fprintf_func) (info->stream, _("<function code %d>"), fc);
       }
       break;
 
@@ -879,6 +1001,22 @@ print_insn_arg (d, buffer, p0, addr, info)
       }
       break;
 
+    case 'u':
+      {
+	short is_upper = 0;
+	int reg = fetch_arg (buffer, place, 5, info);
+	
+	if (reg & 0x10)
+	  {
+	    is_upper = 1;
+	    reg &= 0xf;
+	  }
+	(*info->fprintf_func) (info->stream, "%s%s",
+			       reg_names[reg],
+			       is_upper ? "u" : "l");
+      }
+      break;
+	
     default:
       return -2;
     }
@@ -982,12 +1120,40 @@ fetch_arg (buffer, code, bits, info)
       val = (buffer[1] >> 6);
       break;
 
+    case 'm': 
+      val = (buffer[1] & 0x40 ? 0x8 : 0)
+	| ((buffer[0] >> 1) & 0x7)
+	| (buffer[3] & 0x80 ? 0x10 : 0);
+      break;
+
+    case 'n': 
+      val = (buffer[1] & 0x40 ? 0x8 : 0) | ((buffer[0] >> 1) & 0x7);
+      break;
+
+    case 'o':
+      val = (buffer[2] >> 4) | (buffer[3] & 0x80 ? 0x10 : 0);
+      break;
+
+    case 'M':
+      val = buffer[1] | (buffer[3] & 0x40 ? 0x10 : 0);
+      break;
+
+    case 'N':
+      val = buffer[3] | (buffer[3] & 0x40 ? 0x10 : 0);
+      break;
+
+    case 'h':
+      val = buffer[2] >> 2;
+      break;
+
     default:
       abort ();
     }
 
   switch (bits)
     {
+    case 1:
+      return val & 1;
     case 2:
       return val & 3;
     case 3:
@@ -1040,12 +1206,12 @@ print_indexed (basereg, p, addr, info)
 
   if ((word & 0x100) == 0)
     {
-      word &= 0xff;
-      if ((word & 0x80) != 0)
-	word -= 0x100;
+      base_disp = word & 0xff;
+      if ((base_disp & 0x80) != 0)
+	base_disp -= 0x100;
       if (basereg == -1)
-	word += addr;
-      print_base (basereg, word, info);
+	base_disp += addr;
+      print_base (basereg, base_disp, info);
       (*info->fprintf_func) (info->stream, ",%s)", buf);
       return p;
     }