X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fvax-dis.c;h=a97d4cd25785de13b888164845f70897897eeb84;hb=2ee563b53258d390d7446e90a67f465d504ae44c;hp=54b59f30d404dcfdb286d78dec956f746449e433;hpb=dc9e099fc0eced486ae2b49455c9da113c11f4ff;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c
index 54b59f30d4..a97d4cd257 100644
--- a/opcodes/vax-dis.c
+++ b/opcodes/vax-dis.c
@@ -1,5 +1,5 @@
 /* Print VAX instructions.
-   Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+   Copyright 1995, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Pauline Middelink <middelin@polyware.iaf.nl>
 
 This program is free software; you can redistribute it and/or modify
@@ -16,16 +16,17 @@ 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 "opcode/vax.h"
 #include "dis-asm.h"
 
 /* Local function prototypes */
-static int
-print_insn_arg PARAMS ((const char *, unsigned char *, bfd_vma,
-			disassemble_info *));
+static int fetch_data PARAMS ((struct disassemble_info *, bfd_byte *));
+static int print_insn_arg
+  PARAMS ((const char *, unsigned char *, bfd_vma, disassemble_info *));
+static int print_insn_mode
+  PARAMS ((const char *, int, unsigned char *, bfd_vma, disassemble_info *));
 
-static int
-print_insn_mode PARAMS ((int, unsigned char *, bfd_vma, disassemble_info *));
 
 static char *reg_names[] =
 {
@@ -111,7 +112,7 @@ print_insn_vax (memaddr, info)
      disassemble_info *info;
 {
   const struct vot *votp;
-  const char *argp = NULL;
+  const char *argp;
   unsigned char *arg;
   struct private priv;
   bfd_byte *buffer = priv.the_buffer;
@@ -119,13 +120,26 @@ print_insn_vax (memaddr, info)
   info->private_data = (PTR) &priv;
   priv.max_fetched = priv.the_buffer;
   priv.insn_start = memaddr;
+
   if (setjmp (priv.bailout) != 0)
     {
       /* Error return.  */
       return -1;
     }
 
-  FETCH_DATA (info, buffer + 2);
+  argp = NULL;
+  /* Check if the info buffer has more than one byte left since
+     the last opcode might be a single byte with no argument data.  */
+  if (info->buffer_length - (memaddr - info->buffer_vma) > 1)
+    {
+      FETCH_DATA (info, buffer + 2);
+    }
+  else
+    {
+      FETCH_DATA (info, buffer + 1);
+      buffer[1] = 0;
+    }
+
   for (votp = &votstrs[0]; votp->name[0]; votp++)
     {
       register vax_opcodeT opcode = votp->detail.code;
@@ -209,11 +223,12 @@ print_insn_arg (d, p0, addr, info)
       return p - p0;
     }
 
-  return print_insn_mode (arg_len, p0, addr, info);
+  return print_insn_mode (d, arg_len, p0, addr, info);
 }
 
 static int
-print_insn_mode (size, p0, addr, info)
+print_insn_mode (d, size, p0, addr, info)
+     const char *d;
      int size;
      unsigned char *p0;
      bfd_vma addr;		/* PC for this arg to be relative to */
@@ -231,10 +246,13 @@ print_insn_mode (size, p0, addr, info)
     case 0x10:
     case 0x20:
     case 0x30: /* literal mode			$number */
-      (*info->fprintf_func) (info->stream, "$0x%x", mode);
+      if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h')
+	(*info->fprintf_func) (info->stream, "$0x%x [%c-float]", mode, d[1]);
+      else
+        (*info->fprintf_func) (info->stream, "$0x%x", mode);
       break;
     case 0x40: /* index:			base-addr[Rn] */
-      p += print_insn_mode (size, p0 + 1, addr + 1, info);
+      p += print_insn_mode (d, size, p0 + 1, addr + 1, info);
       (*info->fprintf_func) (info->stream, "[%s]", reg_names[reg]);
       break;
     case 0x50: /* register:			Rn */
@@ -253,8 +271,30 @@ print_insn_mode (size, p0, addr, info)
 
 	  FETCH_DATA (info, p + size);
 	  (*info->fprintf_func) (info->stream, "$0x");
-	  for (i = 0; i < size; i++)
-	    (*info->fprintf_func) (info->stream, "%02x", p[size - i - 1]);
+	  if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h')
+	    {
+	      int float_word;
+
+	      float_word = p[0] | (p[1] << 8);
+	      if ((d[1] == 'd' || d[1] == 'f')
+		  && (float_word & 0xff80) == 0x8000)
+		{
+		  (*info->fprintf_func) (info->stream, "[invalid %c-float]",
+					 d[1]);
+		}
+	      else
+		{
+	          for (i = 0; i < size; i++)
+		    (*info->fprintf_func) (info->stream, "%02x",
+		                           p[size - i - 1]);
+	          (*info->fprintf_func) (info->stream, " [%c-float]", d[1]);
+		}
+	    }
+	  else
+	    {
+	      for (i = 0; i < size; i++)
+	        (*info->fprintf_func) (info->stream, "%02x", p[size - i - 1]);
+	    }
 	  p += size;
 	}
       else